cvs: php-src(PHP_5_1) / NEWS /ext/soap php_sdl.c /ext/soap/tests/bugs bug37083.phpt bug37083.wsdl

dmitry Tue Apr 18 13:07:59 2006 UTC Added files: (Branch: PHP_5_1) /php-src/ext/soap/tests/bugs bug37083.phpt bug37083.wsdl Modified files: /php-src NEWS /php-src/ext/soap php_sdl.c Log: Fixed bug #37083 (Frequent crashs in SOAP extension with new WSDL caching code in multithread WS). (Andrei, Dmitry) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.518&r2=1.2027.2.519&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.518 php-src/NEWS:1.2027.2.519 --- php-src/NEWS:1.2027.2.518 Mon Apr 17 23:28:02 2006 +++ php-src/NEWS Tue Apr 18 13:07:59 2006 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Apr 2006, PHP 5.1.3 - Fixed bug #37103 (libmbfl headers not installed). (Jani) +- Fixed bug #37083 (Frequent crashs in SOAP extension with new WSDL caching + code in multithread WS). (Andrei, Dmitry) - Fixed bug #37062 (compile failure on ARM architecture). (Tony) - Fixed bug #37061 (curl_exec() doesn't zero-terminate binary strings). (Tony) - Fixed bug #37060 (Type of retval of Countable::count() is not checked). http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.10&r2=1.88.2.11&diff_format=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.88.2.10 php-src/ext/soap/php_sdl.c:1.88.2.11 --- php-src/ext/soap/php_sdl.c:1.88.2.10 Mon Apr 17 16:08:08 2006 +++ php-src/ext/soap/php_sdl.c Tue Apr 18 13:07:59 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_sdl.c,v 1.88.2.10 2006/04/17 16:08:08 andrei Exp $ */ +/* $Id: php_sdl.c,v 1.88.2.11 2006/04/18 13:07:59 dmitry Exp $ */ #include "php_soap.h" #include "ext/libxml/php_libxml.h" @@ -143,13 +143,18 @@ enc = get_encoder_ex(NULL, enc_nscat, enc_len); efree(enc_nscat); if (enc && sdl) { - encodePtr new_enc = emalloc(sizeof(encode)); + encodePtr new_enc = pemalloc(sizeof(encode), sdl->is_persistent); memcpy(new_enc, enc, sizeof(encode)); - new_enc->details.ns = estrndup(ns, ns_len); - new_enc->details.type_str = estrdup(new_enc->details.type_str); + if (sdl->is_persistent) { + new_enc->details.ns = zend_strndup(ns, ns_len); + new_enc->details.type_str = strdup(new_enc->details.type_str); + } else { + new_enc->details.ns = estrndup(ns, ns_len); + new_enc->details.type_str = estrdup(new_enc->details.type_str); + } if (sdl->encoders == NULL) { - sdl->encoders = emalloc(sizeof(HashTable)); - zend_hash_init(sdl->encoders, 0, NULL, delete_encoder, 0); + sdl->encoders = pemalloc(sizeof(HashTable), sdl->is_persistent); + zend_hash_init(sdl->encoders, 0, NULL, delete_encoder, sdl->is_persistent); } zend_hash_update(sdl->encoders, nscat, len + 1, &new_enc, sizeof(encodePtr), NULL); enc = new_enc; http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug37083.phpt?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/bug37083.phpt +++ php-src/ext/soap/tests/bugs/bug37083.phpt http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug37083.wsdl?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/bug37083.wsdl +++ php-src/ext/soap/tests/bugs/bug37083.wsdl