fix the xrds_location being cleared before it gets used.

The xrds_location should not be cleared when doing pure xrd discovery.
Otherwise it may get overwritten before curl actually uses it. Previously it
was cleared twice, which is a waste of cpu cycles, anyway.

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/discovery.cc b/lib/discovery.cc
index 9503b5d..ea53786 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -51,193 +51,193 @@ namespace opkele {
 	    };
 	    int xmode;
 
 	    string xrds_location;
 	    string http_content_type;
 	    service_t html_openid1;
 	    service_t html_openid2;
 	    string cdata_buf;
 	    long status_code;
 	    string status_string;
 
 	    typedef list<string> pt_stack_t;
 	    pt_stack_t pt_stack;
 	    int skipping;
 
 	    XRD_t *xrd;
 	    service_t *xrd_service;
 	    string* cdata;
 
 	    idigger_t()
 		: util::curl_t(easy_init()),
 		util::expat_t(0),
 		xri_proxy(XRI_PROXY_URL) {
 		    CURLcode r;
 		    (r=misc_sets())
 			|| (r=set_write())
 			|| (r=set_header())
 			;
 		    if(r)
 			throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
 		}
 	    ~idigger_t() throw() { }
 
 	    void discover(idiscovery_t& result,const string& identity) {
 		result.clear();
 		string::size_type fsc = identity.find_first_not_of(whitespace);
 		if(fsc==string::npos)
 		    throw bad_input(OPKELE_CP_ "whtiespace-only identity");
 		string::size_type lsc = identity.find_last_not_of(whitespace);
 		assert(lsc!=string::npos);
 		if(!strncasecmp(identity.c_str()+fsc,"xri://",sizeof("xri://")-1))
 		    fsc += sizeof("xri://")-1;
 		if((fsc+1)>=lsc)
 		    throw bad_input(OPKELE_CP_ "not a character of importance in identity");
 		string id(identity,fsc,lsc-fsc+1);
 		if(strchr(i_leaders,id[0])) {
 		    result.normalized_id = id;
 		    result.xri_identity = true;
 		    /* TODO: further canonicalize xri identity? Like folding case  or whatever... */
 		    discover_at(
 			    result,
 			    xri_proxy + util::url_encode(id)+
 			    "?_xrd_r=application/xrd+xml;sep=false", xmode_xrd);
 		    if(status_code!=100)
 			throw failed_xri_resolution(OPKELE_CP_
 				"XRI resolution failed with '"+status_string+"' message",status_code);
 		    if(result.xrd.canonical_ids.empty())
 			throw opkele::failed_discovery(OPKELE_CP_ "No CanonicalID for XRI identity found");
 		}else{
 		    result.xri_identity = false;
 		    if(id.find("://")==string::npos)
 			id.insert(0,"http://");
 		    string::size_type fp = id.find('#');
 		    if(fp!=string::npos) {
 			string::size_type qp = id.find('?');
 			if(qp==string::npos || qp<fp)
 			    id.erase(fp);
 			else if(qp>fp)
 			    id.erase(fp,qp-fp);
 		    }
 		    result.normalized_id = util::rfc_3986_normalize_uri(id);
 		    discover_at(result,id,xmode_html|xmode_xrd);
 		    const char * eu = 0;
 		    CURLcode r = easy_getinfo(CURLINFO_EFFECTIVE_URL,&eu);
 		    if(r)
 			throw exception_curl(OPKELE_CP_ "failed to get CURLINFO_EFFECTIVE_URL",r);
 		    result.canonicalized_id = util::rfc_3986_normalize_uri(eu); /* XXX: strip fragment part? */
 		    if(xrds_location.empty()) {
 			html2xrd(result.xrd);
 		    }else{
 			discover_at(result,xrds_location,xmode_xrd);
 			if(result.xrd.empty())
 			    html2xrd(result.xrd);
 		    }
 		}
 	    }
 
 	    void discover_at(idiscovery_t& result,const string& url,int xm) {
 		CURLcode r = easy_setopt(CURLOPT_URL,url.c_str());
 		if(r)
 		    throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r);
 
 		(*(expat_t*)this) = parser_create_ns();
 		set_user_data(); set_element_handler();
 		set_character_data_handler();
 
-		xrds_location.clear(); http_content_type.clear();
+		http_content_type.clear();
 		xmode = xm;
 		if(xmode&xmode_html) {
 		    xrds_location.clear();
 		    html_openid1.clear(); html_openid2.clear();
 		}
 		xrd = &result.xrd;
 		cdata = 0; xrd_service = 0; skipping = 0;
 		status_code = 100; status_string.clear();
 
 		r = easy_perform();
 		if(r && r!=CURLE_WRITE_ERROR)
 		    throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
 
 		parse(0,0,true);
 	    }
 
 	    void html2xrd(XRD_t& x) {
 		if(!html_openid1.uris.empty()) {
 		    html_openid1.types.insert(STURI_OPENID11);
 		    x.services.add(-1,html_openid1);
 		}
 		if(!html_openid2.uris.empty()) {
 		    html_openid2.types.insert(STURI_OPENID20);
 		    x.services.add(-1,html_openid2);
 		}
 	    }
 
 	    size_t write(void *p,size_t s,size_t nm) {
 		if(skipping<0) return 0;
 		/* TODO: limit total size */
 		size_t bytes = s*nm;
 		parse((const char *)p,bytes,false);
 		return bytes;
 	    }
 	    size_t header(void *p,size_t s,size_t nm) {
 		size_t bytes = s*nm;
 		const char *h = (const char*)p;
 		const char *colon = (const char*)memchr(p,':',bytes);
 		const char *space = (const char*)memchr(p,' ',bytes);
 		if(space && ( (!colon) || space<colon ) ) {
 		    xrds_location.clear(); http_content_type.clear();
 		}else if(colon) {
 		    const char *hv = ++colon;
 		    int hnl = colon-h;
 		    int rb;
 		    for(rb = bytes-hnl-1;rb>0 && isspace(*hv);++hv,--rb);
 		    while(rb>0 && isspace(hv[rb-1])) --rb;
 		    if(rb) {
 			if( (hnl>=sizeof(XRDS_HEADER))
 				&& !strncasecmp(h,XRDS_HEADER":",
 				    sizeof(XRDS_HEADER)) ) {
 			    xrds_location.assign(hv,rb);
 			}else if( (hnl>=sizeof(CT_HEADER))
 				&& !strncasecmp(h,CT_HEADER":",
 				    sizeof(CT_HEADER)) ) {
 			    const char *sc = (const char*)memchr(
 				    hv,';',rb);
 			    http_content_type.assign(hv,sc?(sc-hv):rb);
 			}
 		    }
 		}
 		return curl_t::header(p,s,nm);
 	    }
 
 	    void start_element(const XML_Char *n,const XML_Char **a) {
 		if(skipping<0) return;
 		if(skipping) {
 		    if(xmode&xmode_html)
 			html_start_element(n,a);
 		    ++skipping; return;
 		}
 		if(pt_stack.empty()) {
 		    if(is_qelement(n,NSURI_XRDS "\tXRDS"))
 			return;
 		    if(is_qelement(n,NSURI_XRD "\tXRD")) {
 			assert(xrd);
 			xrd->clear();
 			pt_stack.push_back(n);
 		    }else if(xmode&xmode_html) {
 			html_start_element(n,a);
 		    }else{
 			skipping = -1;
 		    }
 		}else{
 		    int pt_s = pt_stack.size();
 		    if(pt_s==1) {
 			/* TODO: xrd:XRD/xrd:Expires */
 			if(is_qelement(n,NSURI_XRD "\tCanonicalID")) {
 			    assert(xrd);
 			    cdata = &(xrd->canonical_ids.add(element_priority(a),string()));
 			}else if(is_qelement(n,NSURI_XRD "\tLocalID")) {
 			    assert(xrd);
 			    cdata = &(xrd->local_ids.add(element_priority(a),string()));
 			}else if(is_qelement(n,NSURI_XRD "\tService")) {
 			    assert(xrd);
 			    xrd_service = &(xrd->services.add(element_priority(a),