domxml patch
| From: | Rob Richards | Date: | Tue, 04 Jun 2002 13:15:36 +0000 |
| Subject: | domxml patch | ||
| References: | 1 | Groups: | php.dev |
| Request: | Send a blank email to php-dev+get-84851@lists.php.net to get a copy of this message | ||
can someone apply this patch to cvs for me. it fixes the problem reported in
bug # 17560
i think i have solved the attachment problems, let me know if people still
cant get my attachments.
xmlKeepBlanksDefault default is 1 if not set. once set it remains at the new
value until changed.
the patch just resets it to its previous value before the formatting.
bug is only reproduceable when running php as a mod.
thanks
rob
Index: php_domxml.c =================================================================== RCS file: /repository/php4/ext/domxml/php_domxml.c,v retrieving revision 1.161 diff -u -r1.161 php_domxml.c --- php_domxml.c 31 May 2002 06:14:29 -0000 1.161 +++ php_domxml.c 4 Jun 2002 12:55:47 -0000 @@ -3238,19 +3238,20 @@ xmlDoc *docp; xmlChar *mem; int format = 0; - int size; + int size, keepblanks; int encoding_len = 0; char *encoding; DOMXML_PARAM_THREE(docp, id, le_domxmldocp, "|ls", &format, &encoding, &encoding_len); if (format) { - xmlKeepBlanksDefault(0); + keepblanks = xmlKeepBlanksDefault(0); if (encoding_len) { xmlDocDumpFormatMemoryEnc(docp, &mem, &size, encoding, format); } else { xmlDocDumpFormatMemory(docp, &mem, &size, format); } + xmlKeepBlanksDefault(keepblanks); } else { if (encoding_len) { xmlDocDumpMemoryEnc(docp, &mem, &size, encoding);
Index: php_domxml.c =================================================================== RCS file: /repository/php4/ext/domxml/php_domxml.c,v retrieving revision 1.161 diff -u -r1.161 php_domxml.c --- php_domxml.c 31 May 2002 06:14:29 -0000 1.161 +++ php_domxml.c 4 Jun 2002 12:55:47 -0000 @@ -3238,19 +3238,20 @@ xmlDoc *docp; xmlChar *mem; int format = 0; - int size; + int size, keepblanks; int encoding_len = 0; char *encoding; DOMXML_PARAM_THREE(docp, id, le_domxmldocp, "|ls", &format, &encoding, &encoding_len); if (format) { - xmlKeepBlanksDefault(0); + keepblanks = xmlKeepBlanksDefault(0); if (encoding_len) { xmlDocDumpFormatMemoryEnc(docp, &mem, &size, encoding, format); } else { xmlDocDumpFormatMemory(docp, &mem, &size, format); } + xmlKeepBlanksDefault(keepblanks); } else { if (encoding_len) { xmlDocDumpMemoryEnc(docp, &mem, &size, encoding);