[xml/sgml-commit] r1228 - in /packages/libxml2: ./ trunk/debian/changelog trunk/nanohttp.c

[glandium at users.alioth.debian.org]

Author: glandium
Date: Sat Sep 13 07:34:12 2008
New Revision: 1228

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1228
Log:
 r1331 at jigen:  mh | 2008-03-05 21:26:51 +0100
 * nanohttp.c: Apply fix from svn revision 3685 to allocate enough memory
   for the Host HTTP header when containing a port number. Closes: #464173.

Modified:
    packages/libxml2/   (props changed)
    packages/libxml2/trunk/debian/changelog
    packages/libxml2/trunk/nanohttp.c

Propchange: packages/libxml2/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Sep 13 07:34:12 2008
@@ -1,2 +1,2 @@
 85a06573-1206-0410-a182-ce9117885d71:/local/libxml2:296
-a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1330
+a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1331

Modified: packages/libxml2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/debian/changelog?rev=1228&op=diff
==============================================================================
--- packages/libxml2/trunk/debian/changelog (original)
+++ packages/libxml2/trunk/debian/changelog Sat Sep 13 07:34:12 2008
@@ -1,8 +1,10 @@
-libxml2 (2.6.31.dfsg-2) unstable; urgency=low
+libxml2 (2.6.31.dfsg-2) UNRELEASED; urgency=low
 
   * debian/rules: Brown paper bag: uncomment $(MAKE) distclean.
     Closes: #442656.
   * xstc/Makefile.am, xstc/Makefile.in: Properly clean generated files.
+  * nanohttp.c: Apply fix from svn revision 3685 to allocate enough memory
+    for the Host HTTP header when containing a port number. Closes: #464173.
 
  -- Mike Hommey <glandium at debian.org>  Tue, 04 Mar 2008 22:36:28 +0100
 

Modified: packages/libxml2/trunk/nanohttp.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/nanohttp.c?rev=1228&op=diff
==============================================================================
--- packages/libxml2/trunk/nanohttp.c (original)
+++ packages/libxml2/trunk/nanohttp.c Sat Sep 13 07:34:12 2008
@@ -1332,13 +1332,23 @@
     if (headers != NULL)
 	blen += strlen(headers) + 2;
     if (contentType && *contentType)
+	/* reserve for string plus 'Content-Type: \r\n" */
 	blen += strlen(*contentType) + 16;
     if (ctxt->query != NULL)
+	/* 1 for '?' */
 	blen += strlen(ctxt->query) + 1;
     blen += strlen(method) + strlen(ctxt->path) + 24;
 #ifdef HAVE_ZLIB_H
+    /* reserve for possible 'Accept-Encoding: gzip' string */
     blen += 23;
 #endif
+    if (ctxt->port != 80) {
+	/* reserve space for ':xxxxx', incl. potential proxy */
+	if (proxy)
+	    blen += 12;
+	else
+	    blen += 6;
+    }
     bp = (char*)xmlMallocAtomic(blen);
     if ( bp == NULL ) {
         xmlNanoHTTPFreeCtxt( ctxt );