Commit d2f682a4 authored by William M. Brack's avatar William M. Brack

fixed problem on gzip streams (bug #438045) fixed minor spot of redundant

* nanohttp.c: fixed problem on gzip streams (bug #438045)
* xpath.c: fixed minor spot of redundant code - no logic change.

svn path=/trunk/; revision=3616
parent ca79788e
Tue May 15 12:38:38 PDT 2007 William Brack <wbrack@mmm.com.hk>
* nanohttp.c: fixed problem on gzip streams (bug #438045)
* xpath.c: fixed minor spot of redundant code - no logic change.
Fri May 11 22:45:18 HKT 2007 William Brack <wbrack@mmm.com.hk>
* xpath.c: enhanced the coding for xmlXPathCastNumberToString
......
......@@ -1204,17 +1204,19 @@ xmlNanoHTTPRead(void *ctx, void *dest, int len) {
ctxt->strm->next_out = dest;
ctxt->strm->avail_out = len;
do {
orig_avail_in = ctxt->strm->avail_in = ctxt->inptr - ctxt->inrptr - bytes_read;
while (ctxt->strm->avail_out > 0 && xmlNanoHTTPRecv(ctxt) > 0) {
orig_avail_in = ctxt->strm->avail_in =
ctxt->inptr - ctxt->inrptr - bytes_read;
ctxt->strm->next_in = BAD_CAST (ctxt->inrptr + bytes_read);
z_ret = inflate(ctxt->strm, Z_NO_FLUSH);
bytes_read += orig_avail_in - ctxt->strm->avail_in;
if (z_ret != Z_OK) break;
} while (ctxt->strm->avail_out > 0 && xmlNanoHTTPRecv(ctxt) > 0);
}
ctxt->inrptr += bytes_read;
ctxt->strm->avail_in = ctxt->inptr - ctxt->inrptr;
return(len - ctxt->strm->avail_out);
}
#endif
......
......@@ -14688,8 +14688,7 @@ xmlXPathCompiledEvalInternal(xmlXPathCompExprPtr comp,
do {
tmp = valuePop(pctxt);
if (tmp != NULL) {
if (tmp != NULL)
stack++;
stack++;
xmlXPathReleaseObject(ctxt, tmp);
}
} while (tmp != NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment