[PHP-CVS] cvs: php-src /ext/soap php_encoding.c
dmitry Fri Apr 23 08:22:41 2004 EDT
Modified files:
/php-src/ext/soap php_encoding.c
Log:
Support for ![CDATA[ ]] for string/hexbinary/base64binary data
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.69r2=1.70ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.69 php-src/ext/soap/php_encoding.c:1.70
--- php-src/ext/soap/php_encoding.c:1.69Wed Apr 21 12:57:18 2004
+++ php-src/ext/soap/php_encoding.c Fri Apr 23 08:22:41 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.69 2004/04/21 16:57:18 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.70 2004/04/23 12:22:41 dmitry Exp $ */
#include time.h
@@ -461,6 +461,8 @@
if (data data-children) {
if (data-children-type == XML_TEXT_NODE data-children-next ==
NULL) {
ZVAL_STRING(ret, data-children-content, 1);
+ } else if (data-children-type == XML_CDATA_SECTION_NODE
data-children-next == NULL) {
+ ZVAL_STRING(ret, data-children-content, 1);
} else {
php_error(E_ERROR,SOAP-ERROR: Encoding: Violation of encoding
rules);
}
@@ -479,6 +481,8 @@
if (data-children-type == XML_TEXT_NODE data-children-next ==
NULL) {
whiteSpace_replace(data-children-content);
ZVAL_STRING(ret, data-children-content, 1);
+ } else if (data-children-type == XML_CDATA_SECTION_NODE
data-children-next == NULL) {
+ ZVAL_STRING(ret, data-children-content, 1);
} else {
php_error(E_ERROR,SOAP-ERROR: Encoding: Violation of encoding
rules);
}
@@ -497,6 +501,8 @@
if (data-children-type == XML_TEXT_NODE data-children-next ==
NULL) {
whiteSpace_collapse(data-children-content);
ZVAL_STRING(ret, data-children-content, 1);
+ } else if (data-children-type == XML_CDATA_SECTION_NODE
data-children-next == NULL) {
+ ZVAL_STRING(ret, data-children-content, 1);
} else {
php_error(E_ERROR,SOAP-ERROR: Encoding: Violation of encoding
rules);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
wez Fri Apr 23 09:28:05 2004 EDT Modified files: /php-srcNEWS Log: Another one bites the dust http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1691r2=1.1692ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1691 php-src/NEWS:1.1692 --- php-src/NEWS:1.1691 Wed Apr 21 19:02:56 2004 +++ php-src/NEWSFri Apr 23 09:28:05 2004 @@ -23,6 +23,7 @@ fails). (Frank) - Fixed bug #27997 (SPL: Crash with getInnerIterator()). (Marcus) - Fixed bug #27928 (sqlite incorrectly handles invalid filenames). (Ilia) +- Fixed bug #27974 (COM doesn't pass array parameters). (Wez) - Fixed bug #27865 (STDIN, STDOUT, STDERR are dup()d under CLI). (Wez) - Fixed bug #27821 (xml_parse() segfaults when xml_set_object() is called from class method). (Andi, Rob) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard info.c
derick Fri Apr 23 09:28:25 2004 EDT
Modified files:
/php-src/ext/standard info.c
Log:
- Fixed buffer overflow in phpinfo() for Zend Extension Api NO.
http://cvs.php.net/diff.php/php-src/ext/standard/info.c?r1=1.243r2=1.244ty=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.243 php-src/ext/standard/info.c:1.244
--- php-src/ext/standard/info.c:1.243 Mon Mar 15 02:45:25 2004
+++ php-src/ext/standard/info.c Fri Apr 23 09:28:25 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.243 2004/03/15 07:45:25 jon Exp $ */
+/* $Id: info.c,v 1.244 2004/04/23 13:28:25 derick Exp $ */
#include php.h
#include php_ini.h
@@ -394,7 +394,7 @@
if (flag PHP_INFO_GENERAL) {
char *zend_version = get_zend_version();
- char temp_api[9];
+ char temp_api[10];
char *logo_guid;
php_uname = php_get_uname('a');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c
iliaa Fri Apr 23 13:03:53 2004 EDT Modified files: /php-src/ext/mysql php_mysql.c Log: Fixed bug #28087 (Do not force mysql.trace_mode to 0 on every request). http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.206r2=1.207ty=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.206 php-src/ext/mysql/php_mysql.c:1.207 --- php-src/ext/mysql/php_mysql.c:1.206 Thu Feb 12 05:43:21 2004 +++ php-src/ext/mysql/php_mysql.c Fri Apr 23 13:03:52 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.206 2004/02/12 10:43:21 zeev Exp $ */ +/* $Id: php_mysql.c,v 1.207 2004/04/23 17:03:52 iliaa Exp $ */ /* TODO: * @@ -414,7 +414,6 @@ /* Reset connect error/errno on every request */ MySG(connect_error) = NULL; MySG(connect_errno) =0; - MySG(trace_mode) = 0; MySG(result_allocated) = 0; return SUCCESS; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/mysql php_mysql.c
iliaa Fri Apr 23 13:04:37 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/mysql php_mysql.c Log: MFH: Fixed bug #28087 (Do not force mysql.trace_mode to 0 on every request) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.645r2=1.1247.2.646ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.645 php-src/NEWS:1.1247.2.646 --- php-src/NEWS:1.1247.2.645 Thu Apr 22 18:53:18 2004 +++ php-src/NEWSFri Apr 23 13:04:36 2004 @@ -9,6 +9,8 @@ Marcus) - Fixed bug #28055 (timeout duration too long in feof()/pfsockopen() liveness checks). (Wez) +- Fixed bug #28087 (Do not force mysql.trace_mode to 0 on every request). + (Ilia) - Fixed bug #28042 (greek letters in html to entitity mapping not correct). (Derick) - Fixed bug #28007 (compile mssql extension with old versions of FreeTDS http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.174.2.24r2=1.174.2.25ty=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.174.2.24 php-src/ext/mysql/php_mysql.c:1.174.2.25 --- php-src/ext/mysql/php_mysql.c:1.174.2.24Mon Jan 5 09:42:26 2004 +++ php-src/ext/mysql/php_mysql.c Fri Apr 23 13:04:36 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.174.2.24 2004/01/05 14:42:26 georg Exp $ */ +/* $Id: php_mysql.c,v 1.174.2.25 2004/04/23 17:04:36 iliaa Exp $ */ /* TODO: * @@ -425,7 +425,6 @@ /* Reset connect error/errno on every request */ MySG(connect_error) = NULL; MySG(connect_errno) =0; - MySG(trace_mode) = 0; MySG(result_allocated) = 0; return SUCCESS; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
rrichards Fri Apr 23 13:31:45 2004 EDT
Modified files:
/php-src/ext/libxml libxml.c
Log:
move libxml error handler ro rinit/rshutdown to keep it local to php
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.16r2=1.17ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.16 php-src/ext/libxml/libxml.c:1.17
--- php-src/ext/libxml/libxml.c:1.16Mon Mar 1 07:09:22 2004
+++ php-src/ext/libxml/libxml.c Fri Apr 23 13:31:44 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.16 2004/03/01 12:09:22 rrichards Exp $ */
+/* $Id: libxml.c,v 1.17 2004/04/23 17:31:44 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -400,9 +400,6 @@
php_libxml_streams_IO_write,
php_libxml_streams_IO_close);
- /* report errors via handler rather than stderr */
- xmlSetGenericErrorFunc(NULL, php_libxml_error_handler);
-
zend_hash_init(php_libxml_exports, 0, NULL, NULL, 1);
_php_libxml_initialized = 1;
@@ -411,8 +408,6 @@
PHP_LIBXML_API void php_libxml_shutdown() {
if (_php_libxml_initialized) {
- /* reset libxml generic error handling */
- xmlSetGenericErrorFunc(NULL, NULL);
xmlCleanupParser();
zend_hash_destroy(php_libxml_exports);
_php_libxml_initialized = 0;
@@ -436,6 +431,9 @@
PHP_RINIT_FUNCTION(libxml)
{
+ /* report errors via handler rather than stderr */
+ xmlSetGenericErrorFunc(NULL, php_libxml_error_handler);
+
return SUCCESS;
}
@@ -450,6 +448,9 @@
PHP_RSHUTDOWN_FUNCTION(libxml)
{
+ /* reset libxml generic error handling */
+ xmlSetGenericErrorFunc(NULL, NULL);
+
smart_str_free(LIBXML(error_buffer));
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/pcre php_pcre.c
rasmus Fri Apr 23 13:51:40 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/pcre php_pcre.c
Log:
bug #27810 from Joe Orton
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.646r2=1.1247.2.647ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.646 php-src/NEWS:1.1247.2.647
--- php-src/NEWS:1.1247.2.646 Fri Apr 23 13:04:36 2004
+++ php-src/NEWSFri Apr 23 13:51:38 2004
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||
?? ??? 2004, Version 4.3.7
+- Fixed bug #27810 (don't use php's pemalloc in ext/pcre). (Joe Orton)
- Fixed possible crash inside pg_copy_(to|from) function if delimiter is more
then 1 character long. (Ilia)
- Fixed handling of return values from storred procedures in mssql_execute()
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.132.2.16r2=1.132.2.17ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.132.2.16 php-src/ext/pcre/php_pcre.c:1.132.2.17
--- php-src/ext/pcre/php_pcre.c:1.132.2.16 Sun Feb 1 14:56:16 2004
+++ php-src/ext/pcre/php_pcre.c Fri Apr 23 13:51:39 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.132.2.16 2004/02/01 19:56:16 moriyoshi Exp $ */
+/* $Id: php_pcre.c,v 1.132.2.17 2004/04/23 17:51:39 rasmus Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -47,20 +47,6 @@
ZEND_DECLARE_MODULE_GLOBALS(pcre)
-
-static void *php_pcre_malloc(size_t size)
-{
- return pemalloc(size, 1);
-}
-
-
-static void php_pcre_free(void *ptr)
-{
- if (ptr)
- pefree(ptr, 1);
-}
-
-
static void php_free_pcre_cache(void *data)
{
pcre_cache_entry *pce = (pcre_cache_entry *) data;
@@ -107,14 +93,6 @@
REGISTER_LONG_CONSTANT(PREG_SPLIT_OFFSET_CAPTURE, PREG_SPLIT_OFFSET_CAPTURE,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(PREG_GREP_INVERT, PREG_GREP_INVERT, CONST_CS |
CONST_PERSISTENT);
- pcre_malloc = php_pcre_malloc;
- pcre_free = php_pcre_free;
-
-#ifdef NO_RECURSE
- pcre_stack_malloc = php_pcre_malloc;
- pcre_stack_free = php_pcre_free;
-#endif
-
return SUCCESS;
}
/* }}} */
@@ -548,7 +526,7 @@
}
}
- php_pcre_free((void *) stringlist);
+ pcre_free((void *) stringlist);
}
}
else { /* Failed to match */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/pcre php_pcre.c
rasmus Fri Apr 23 14:08:58 2004 EDT
Modified files:
/php-srcNEWS
/php-src/ext/pcre php_pcre.c
Log:
MFB: Fix for bug #27810
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1692r2=1.1693ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1692 php-src/NEWS:1.1693
--- php-src/NEWS:1.1692 Fri Apr 23 09:28:05 2004
+++ php-src/NEWSFri Apr 23 14:08:57 2004
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ? 2004, PHP 5 Release Candidate 2
+- Fix for bug #27810 (Joe Orton)
- Reimplemented zend.ze1_compatibility_mode to have better PHP 4 compliance.
(Dmitry, Andi)
- Moved yaz extension to PECL. (Wez)
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.155r2=1.156ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.155 php-src/ext/pcre/php_pcre.c:1.156
--- php-src/ext/pcre/php_pcre.c:1.155 Sun Feb 1 03:34:47 2004
+++ php-src/ext/pcre/php_pcre.c Fri Apr 23 14:08:58 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.155 2004/02/01 08:34:47 sebastian Exp $ */
+/* $Id: php_pcre.c,v 1.156 2004/04/23 18:08:58 rasmus Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -47,20 +47,6 @@
ZEND_DECLARE_MODULE_GLOBALS(pcre)
-
-static void *php_pcre_malloc(size_t size)
-{
- return pemalloc(size, 1);
-}
-
-
-static void php_pcre_free(void *ptr)
-{
- if (ptr)
- pefree(ptr, 1);
-}
-
-
static void php_free_pcre_cache(void *data)
{
pcre_cache_entry *pce = (pcre_cache_entry *) data;
@@ -107,14 +93,6 @@
REGISTER_LONG_CONSTANT(PREG_SPLIT_OFFSET_CAPTURE, PREG_SPLIT_OFFSET_CAPTURE,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(PREG_GREP_INVERT, PREG_GREP_INVERT, CONST_CS |
CONST_PERSISTENT);
- pcre_malloc = php_pcre_malloc;
- pcre_free = php_pcre_free;
-
-#ifdef NO_RECURSE
- pcre_stack_malloc = php_pcre_malloc;
- pcre_stack_free = php_pcre_free;
-#endif
-
return SUCCESS;
}
/* }}} */
@@ -560,7 +538,7 @@
}
}
- php_pcre_free((void *) stringlist);
+ pcre_free((void *) stringlist);
}
}
else { /* Failed to match */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
derick Fri Apr 23 14:19:04 2004 EDT Modified files: /php-srcNEWS Log: Cleanup NEWS http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1693r2=1.1694ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1693 php-src/NEWS:1.1694 --- php-src/NEWS:1.1693 Fri Apr 23 14:08:57 2004 +++ php-src/NEWSFri Apr 23 14:19:03 2004 @@ -1,7 +1,6 @@ PHPNEWS ||| ?? ? 2004, PHP 5 Release Candidate 2 -- Fix for bug #27810 (Joe Orton) - Reimplemented zend.ze1_compatibility_mode to have better PHP 4 compliance. (Dmitry, Andi) - Moved yaz extension to PECL. (Wez) @@ -28,6 +27,7 @@ - Fixed bug #27865 (STDIN, STDOUT, STDERR are dup()d under CLI). (Wez) - Fixed bug #27821 (xml_parse() segfaults when xml_set_object() is called from class method). (Andi, Rob) +- Fixed bug #27810 (Apache-2.0.49 crashes on graceful/restart). (Joe Orton) - Fixed bug #27742 (WDSL SOAP Parsing Schema bug). (Dmitry) - Fixed bug #27722 (Segfault on schema without targetNamespace). (Dmitry) - Fixed bug #27719 (mktime issues on and around DST changeover). (Rasmus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
derick Fri Apr 23 14:20:20 2004 EDT Modified files: /php-srcNEWS Log: This was already in NEWS for the branch, removing http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1694r2=1.1695ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1694 php-src/NEWS:1.1695 --- php-src/NEWS:1.1694 Fri Apr 23 14:19:03 2004 +++ php-src/NEWSFri Apr 23 14:20:20 2004 @@ -27,7 +27,6 @@ - Fixed bug #27865 (STDIN, STDOUT, STDERR are dup()d under CLI). (Wez) - Fixed bug #27821 (xml_parse() segfaults when xml_set_object() is called from class method). (Andi, Rob) -- Fixed bug #27810 (Apache-2.0.49 crashes on graceful/restart). (Joe Orton) - Fixed bug #27742 (WDSL SOAP Parsing Schema bug). (Dmitry) - Fixed bug #27722 (Segfault on schema without targetNamespace). (Dmitry) - Fixed bug #27719 (mktime issues on and around DST changeover). (Rasmus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
derick Fri Apr 23 14:20:40 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: Reorder NEWS http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.647r2=1.1247.2.648ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.647 php-src/NEWS:1.1247.2.648 --- php-src/NEWS:1.1247.2.647 Fri Apr 23 13:51:38 2004 +++ php-src/NEWSFri Apr 23 14:20:39 2004 @@ -1,7 +1,6 @@ PHP 4 NEWS ||| ?? ??? 2004, Version 4.3.7 -- Fixed bug #27810 (don't use php's pemalloc in ext/pcre). (Joe Orton) - Fixed possible crash inside pg_copy_(to|from) function if delimiter is more then 1 character long. (Ilia) - Fixed handling of return values from storred procedures in mssql_execute() @@ -18,6 +17,7 @@ fails). (Frank) - Fixed bug #27995 (imagefilltoborder() stops the fill process prematurely). (Ilia) +- Fixed bug #27810 (don't use php's pemalloc in ext/pcre). (Joe Orton) 15 Apr 2004, Version 4.3.6 - Updated bundled PDFLib library to version 5.0.3p1 in Windows distribution. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
andiFri Apr 23 17:51:45 2004 EDT Modified files: /php-srcNEWS Log: NEWS http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1695r2=1.1696ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1695 php-src/NEWS:1.1696 --- php-src/NEWS:1.1695 Fri Apr 23 14:20:20 2004 +++ php-src/NEWSFri Apr 23 17:51:39 2004 @@ -22,8 +22,10 @@ - Fixed bug #28007 (compile mssql extension with old versions of FreeTDS fails). (Frank) - Fixed bug #27997 (SPL: Crash with getInnerIterator()). (Marcus) -- Fixed bug #27928 (sqlite incorrectly handles invalid filenames). (Ilia) - Fixed bug #27974 (COM doesn't pass array parameters). (Wez) +- Fixed bug #27928 (sqlite incorrectly handles invalid filenames). (Ilia) +- Fixed bug $27923 (in some cases using foreach() to iterate over values + led to a false error message about the key being a reference). (Adam) - Fixed bug #27865 (STDIN, STDOUT, STDERR are dup()d under CLI). (Wez) - Fixed bug #27821 (xml_parse() segfaults when xml_set_object() is called from class method). (Andi, Rob) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
