felipe                                   Tue, 01 Dec 2009 02:05:28 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=291533

Log:
- Fixed bug #49660 (libxml 2.7.3+ limits text nodes to 10MB). (Felipe)
- Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a
  single text node when using libxml2.7.3+. (Kalle)
[DOC]

Bug: http://bugs.php.net/49660 (Open) libxml 2.7.3+ limits text nodes to 10MB
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/libxml/libxml.c
    U   php/php-src/branches/PHP_5_2/ext/soap/php_xml.c
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/libxml/libxml.c
    U   php/php-src/branches/PHP_5_3/ext/soap/php_xml.c
    U   php/php-src/trunk/ext/libxml/libxml.c
    U   php/php-src/trunk/ext/soap/php_xml.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-01 00:38:02 UTC (rev 291532)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-01 02:05:28 UTC (rev 291533)
@@ -1,11 +1,15 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Dec 2009, PHP 5.2.12RC4
+- Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a
+  single text node when using libxml2.7.3+. (Kalle)
+
 - Improved fix for bug #50006 (Segfault caused by uksort()). (Stas)

 - Fixed bug #50266 (conflicting types for llabs). (Jani)
 - Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to
   non-existant file). (Dmitry)
+- Fixed bug #49660 (libxml 2.7.3+ limits text nodes to 10MB). (Felipe)

 27 Nov 2009, PHP 5.2.12RC3
 - Fixed break in the build chain introduced in 5.2.12RC2 (Jani)

Modified: php/php-src/branches/PHP_5_2/ext/libxml/libxml.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/libxml/libxml.c    2009-12-01 00:38:02 UTC 
(rev 291532)
+++ php/php-src/branches/PHP_5_2/ext/libxml/libxml.c    2009-12-01 02:05:28 UTC 
(rev 291533)
@@ -627,6 +627,9 @@
        REGISTER_LONG_CONSTANT("LIBXML_COMPACT",        XML_PARSE_COMPACT,      
        CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("LIBXML_NOXMLDECL",      XML_SAVE_NO_DECL,       
        CONST_CS | CONST_PERSISTENT);
 #endif
+#if LIBXML_VERSION >= 20703
+       REGISTER_LONG_CONSTANT("LIBXML_PARSEHUGE",      XML_PARSE_HUGE,         
        CONST_CS | CONST_PERSISTENT);
+#endif
        REGISTER_LONG_CONSTANT("LIBXML_NOEMPTYTAG",     LIBXML_SAVE_NOEMPTYTAG, 
CONST_CS | CONST_PERSISTENT);

        /* Error levels */

Modified: php/php-src/branches/PHP_5_2/ext/soap/php_xml.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/soap/php_xml.c     2009-12-01 00:38:02 UTC 
(rev 291532)
+++ php/php-src/branches/PHP_5_2/ext/soap/php_xml.c     2009-12-01 02:05:28 UTC 
(rev 291533)
@@ -138,6 +138,9 @@
                ctxt->sax->warning = NULL;
                ctxt->sax->error = NULL;
                /*ctxt->sax->fatalError = NULL;*/
+#if LIBXML_VERSION >= 20703
+               ctxt->options |= XML_PARSE_HUGE;
+#endif
                xmlParseDocument(ctxt);
                if (ctxt->wellFormed) {
                        ret = ctxt->myDoc;

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-01 00:38:02 UTC (rev 291532)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-01 02:05:28 UTC (rev 291533)
@@ -1,6 +1,9 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 20??, PHP 5.3.2
+- Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a
+  single text node when using libxml2.7.3+. (Kalle)
+
 - Upgraded bundled sqlite to version 3.6.20. (Ilia)
 - Upgraded bundled PCRE to version 8.00. (Scott)

@@ -81,6 +84,7 @@
   property in base class). (Felipe)
 - Fixed bug #49677 (ini parser crashes with apache2 and using ${something}
   ini variables). (Jani)
+- Fixed bug #49660 (libxml 2.7.3+ limits text nodes to 10MB). (Felipe)
 - Fixed bug #49647 (DOMUserData does not exist). (Rob)
 - Fixed bug #49521 (PDO fetchObject sets values before calling constructor).
   (Pierrick)

Modified: php/php-src/branches/PHP_5_3/ext/libxml/libxml.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/libxml/libxml.c    2009-12-01 00:38:02 UTC 
(rev 291532)
+++ php/php-src/branches/PHP_5_3/ext/libxml/libxml.c    2009-12-01 02:05:28 UTC 
(rev 291533)
@@ -622,6 +622,9 @@
        REGISTER_LONG_CONSTANT("LIBXML_COMPACT",        XML_PARSE_COMPACT,      
        CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("LIBXML_NOXMLDECL",      XML_SAVE_NO_DECL,       
        CONST_CS | CONST_PERSISTENT);
 #endif
+#if LIBXML_VERSION >= 20703
+       REGISTER_LONG_CONSTANT("LIBXML_PARSEHUGE",      XML_PARSE_HUGE,         
        CONST_CS | CONST_PERSISTENT);
+#endif
        REGISTER_LONG_CONSTANT("LIBXML_NOEMPTYTAG",     LIBXML_SAVE_NOEMPTYTAG, 
CONST_CS | CONST_PERSISTENT);

        /* Error levels */

Modified: php/php-src/branches/PHP_5_3/ext/soap/php_xml.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/soap/php_xml.c     2009-12-01 00:38:02 UTC 
(rev 291532)
+++ php/php-src/branches/PHP_5_3/ext/soap/php_xml.c     2009-12-01 02:05:28 UTC 
(rev 291533)
@@ -138,6 +138,9 @@
                ctxt->sax->warning = NULL;
                ctxt->sax->error = NULL;
                /*ctxt->sax->fatalError = NULL;*/
+#if LIBXML_VERSION >= 20703
+               ctxt->options |= XML_PARSE_HUGE;
+#endif
                xmlParseDocument(ctxt);
                if (ctxt->wellFormed) {
                        ret = ctxt->myDoc;

Modified: php/php-src/trunk/ext/libxml/libxml.c
===================================================================
--- php/php-src/trunk/ext/libxml/libxml.c       2009-12-01 00:38:02 UTC (rev 
291532)
+++ php/php-src/trunk/ext/libxml/libxml.c       2009-12-01 02:05:28 UTC (rev 
291533)
@@ -622,6 +622,9 @@
        REGISTER_LONG_CONSTANT("LIBXML_COMPACT",        XML_PARSE_COMPACT,      
        CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("LIBXML_NOXMLDECL",      XML_SAVE_NO_DECL,       
        CONST_CS | CONST_PERSISTENT);
 #endif
+#if LIBXML_VERSION >= 20703
+       REGISTER_LONG_CONSTANT("LIBXML_PARSEHUGE",      XML_PARSE_HUGE,         
        CONST_CS | CONST_PERSISTENT);
+#endif
        REGISTER_LONG_CONSTANT("LIBXML_NOEMPTYTAG",     LIBXML_SAVE_NOEMPTYTAG, 
CONST_CS | CONST_PERSISTENT);

        /* Error levels */

Modified: php/php-src/trunk/ext/soap/php_xml.c
===================================================================
--- php/php-src/trunk/ext/soap/php_xml.c        2009-12-01 00:38:02 UTC (rev 
291532)
+++ php/php-src/trunk/ext/soap/php_xml.c        2009-12-01 02:05:28 UTC (rev 
291533)
@@ -146,6 +146,9 @@
                ctxt->sax->warning = NULL;
                ctxt->sax->error = NULL;
                /*ctxt->sax->fatalError = NULL;*/
+#if LIBXML_VERSION >= 20703
+               ctxt->options |= XML_PARSE_HUGE;
+#endif
                xmlParseDocument(ctxt);
                if (ctxt->wellFormed) {
                        ret = ctxt->myDoc;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to