summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-12-26 21:55:00 (UTC)
committer Michael Krelin <hacker@klever.net>2008-01-04 18:16:31 (UTC)
commite63de16a9885641b5070ec834225cb562bc2042f (patch) (unidiff)
treeb50a7c202aaa6953dd47402fc60f53ac4a57cf62
parentac9e3ddb4277e5696d789ad6b3ea7aa820a5e76a (diff)
downloadlibopkele-e63de16a9885641b5070ec834225cb562bc2042f.zip
libopkele-e63de16a9885641b5070ec834225cb562bc2042f.tar.gz
libopkele-e63de16a9885641b5070ec834225cb562bc2042f.tar.bz2
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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/discovery.cc2
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
@@ -135,25 +135,25 @@ namespace opkele {
135 } 135 }
136 } 136 }
137 137
138 void discover_at(idiscovery_t& result,const string& url,int xm) { 138 void discover_at(idiscovery_t& result,const string& url,int xm) {
139 CURLcode r = easy_setopt(CURLOPT_URL,url.c_str()); 139 CURLcode r = easy_setopt(CURLOPT_URL,url.c_str());
140 if(r) 140 if(r)
141 throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r); 141 throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r);
142 142
143 (*(expat_t*)this) = parser_create_ns(); 143 (*(expat_t*)this) = parser_create_ns();
144 set_user_data(); set_element_handler(); 144 set_user_data(); set_element_handler();
145 set_character_data_handler(); 145 set_character_data_handler();
146 146
147 xrds_location.clear(); http_content_type.clear(); 147 http_content_type.clear();
148 xmode = xm; 148 xmode = xm;
149 if(xmode&xmode_html) { 149 if(xmode&xmode_html) {
150 xrds_location.clear(); 150 xrds_location.clear();
151 html_openid1.clear(); html_openid2.clear(); 151 html_openid1.clear(); html_openid2.clear();
152 } 152 }
153 xrd = &result.xrd; 153 xrd = &result.xrd;
154 cdata = 0; xrd_service = 0; skipping = 0; 154 cdata = 0; xrd_service = 0; skipping = 0;
155 status_code = 100; status_string.clear(); 155 status_code = 100; status_string.clear();
156 156
157 r = easy_perform(); 157 r = easy_perform();
158 if(r && r!=CURLE_WRITE_ERROR) 158 if(r && r!=CURLE_WRITE_ERROR)
159 throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); 159 throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);