summaryrefslogtreecommitdiffabout
path: root/lib/discovery.cc
authorMichael Krelin <hacker@klever.net>2008-01-06 23:00:18 (UTC)
committer Michael Krelin <hacker@klever.net>2008-01-06 23:05:57 (UTC)
commit7b5a82f255a85fe2ef466b68e40d9eb1829c633a (patch) (unidiff)
treee466813db17bd974de0b0d277f35219c393c5796 /lib/discovery.cc
parent6a843bb112988976892058c56d5fe2f24e24300a (diff)
downloadlibopkele-7b5a82f255a85fe2ef466b68e40d9eb1829c633a.zip
libopkele-7b5a82f255a85fe2ef466b68e40d9eb1829c633a.tar.gz
libopkele-7b5a82f255a85fe2ef466b68e40d9eb1829c633a.tar.bz2
Revert "discovery: stop parser with XML_StopParser()" for now
This reverts commit 7bde7f66284b47a75bbceadc360e7f03550ace21. because some older expat version do not support this function I don't want to make it conditional for now. Conflicts: lib/discovery.cc Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'lib/discovery.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/discovery.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/discovery.cc b/lib/discovery.cc
index af9686a..d868308 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -283,7 +283,7 @@ namespace opkele {
283 }else if(xmode&xmode_html) { 283 }else if(xmode&xmode_html) {
284 html_start_element(n,a); 284 html_start_element(n,a);
285 }else{ 285 }else{
286 skipping = -1; stop_parser(); 286 skipping = -1;
287 } 287 }
288 }else{ 288 }else{
289 int pt_s = pt_stack.size(); 289 int pt_s = pt_stack.size();
@@ -368,15 +368,14 @@ namespace opkele {
368 if(is_qelement(pt_stack.back().c_str(),n)) { 368 if(is_qelement(pt_stack.back().c_str(),n)) {
369 assert(cdata==&status_string); 369 assert(cdata==&status_string);
370 pt_stack.pop_back(); 370 pt_stack.pop_back();
371 if(status_code!=100) { 371 if(status_code!=100)
372 skipping = -1; stop_parser(); 372 skipping = -1;
373 }
374 } 373 }
375 }else if(is_qelement(n,NSURI_XRD "\tExpires")) { 374 }else if(is_qelement(n,NSURI_XRD "\tExpires")) {
376 assert(xrd); 375 assert(xrd);
377 xrd->expires = util::w3c_to_time(cdata_buf); 376 xrd->expires = util::w3c_to_time(cdata_buf);
378 }else if((xmode&xmode_html) && is_element(n,"head")) { 377 }else if((xmode&xmode_html) && is_element(n,"head")) {
379 skipping = -1; stop_parser(); 378 skipping = -1;
380 } 379 }
381 cdata = 0; 380 cdata = 0;
382 } 381 }
@@ -433,7 +432,7 @@ namespace opkele {
433 html_openid2.local_ids.add(-1,href); 432 html_openid2.local_ids.add(-1,href);
434 } 433 }
435 }else if(is_element(n,"body")) { 434 }else if(is_element(n,"body")) {
436 skipping = -1; stop_parser(); 435 skipping = -1;
437 } 436 }
438 } 437 }
439 438