From 7b5a82f255a85fe2ef466b68e40d9eb1829c633a Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sun, 06 Jan 2008 23:00:18 +0000
Subject: 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>
---
diff --git a/include/opkele/expat.h b/include/opkele/expat.h
index 97ed61a..60c41ac 100644
--- a/include/opkele/expat.h
+++ b/include/opkele/expat.h
@@ -23,10 +23,8 @@ namespace opkele {
 
 		inline bool parse(const char *s,int len,bool final=false) {
 		    assert(_x);
-		    return XML_Parse(_x,s,len,final); }
-		enum XML_Status stop_parser(bool resumable=false) {
-		    assert(_x);
-		    return XML_StopParser(_x,resumable); }
+		    return XML_Parse(_x,s,len,final);
+		}
 
 		virtual void start_element(const XML_Char *n,const XML_Char **a) { }
 		virtual void end_element(const XML_Char *n) { }
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 {
 		    }else if(xmode&xmode_html) {
 			html_start_element(n,a);
 		    }else{
-			skipping = -1; stop_parser();
+			skipping = -1;
 		    }
 		}else{
 		    int pt_s = pt_stack.size();
@@ -368,15 +368,14 @@ namespace opkele {
 		    if(is_qelement(pt_stack.back().c_str(),n)) {
 			assert(cdata==&status_string);
 			pt_stack.pop_back();
-			if(status_code!=100) {
-			    skipping = -1; stop_parser();
-			}
+			if(status_code!=100)
+			    skipping = -1;
 		    }
 		}else if(is_qelement(n,NSURI_XRD "\tExpires")) {
 		    assert(xrd);
 		    xrd->expires = util::w3c_to_time(cdata_buf);
 		}else if((xmode&xmode_html) && is_element(n,"head")) {
-		    skipping = -1; stop_parser();
+		    skipping = -1;
 		}
 		cdata = 0;
 	    }
@@ -433,7 +432,7 @@ namespace opkele {
 			    html_openid2.local_ids.add(-1,href);
 		    }
 		}else if(is_element(n,"body")) {
-		    skipping = -1; stop_parser();
+		    skipping = -1;
 		}
 	    }
 
--
cgit v0.9.0.2