Load /tmp/tmp.DIvcnD/libxml2-2.6.11 intoupstream/2.6.11

packages/libxml2/branches/upstream/current.

1 files changed, 7 insertions, 1 deletions

diff --git a/xpath.c b/xpath.c
index c964e37..9bbfdce 100644
--- a/xpath.c
+++ b/xpath.c
@@ -7593,6 +7593,8 @@ xmlXPathStringEvalNumber(const xmlChar *str) {
       if (*cur == '-') {
 	is_exponent_negative = 1;
 	cur++;
+      } else if (*cur == '+') {
+        cur++;
       }
       while ((*cur >= '0') && (*cur <= '9')) {
 	exponent = exponent * 10 + (*cur - '0');
@@ -7673,7 +7675,9 @@ xmlXPathCompNumber(xmlXPathParserContextPtr ctxt)
         if (CUR == '-') {
             is_exponent_negative = 1;
             NEXT;
-        }
+        } else if (CUR == '+') {
+	    NEXT;
+	}
         while ((CUR >= '0') && (CUR <= '9')) {
             exponent = exponent * 10 + (CUR - '0');
             NEXT;
@@ -10588,6 +10592,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
                 if ((oldset == NULL) || (oldset->nodeNr == 0)) {
                     ctxt->context->contextSize = 0;
                     ctxt->context->proximityPosition = 0;
+/*
                     if (op->ch2 != -1)
                         total +=
                             xmlXPathCompOpEval(ctxt,
@@ -10596,6 +10601,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
                     res = valuePop(ctxt);
                     if (res != NULL)
                         xmlXPathFreeObject(res);
+*/
                     valuePush(ctxt, obj);
                     ctxt->context->node = oldnode;
                     CHECK_ERROR0;