Commit: 7f7cff0bbbdda0626839e7f1aee40bcf9d6c9df5 Author: Dmitry Stogov <dmi...@zend.com> Thu, 29 Nov 2012 16:41:09 +0400 Parents: 1a09bf8023356c65a461076c6525749bdd005b58 dc2192c08766939700260128684255772ba4296f Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7f7cff0bbbdda0626839e7f1aee40bcf9d6c9df5 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests) Conflicts: NEWS ext/soap/soap.c Bugs: https://bugs.php.net/63271 Changed paths: MM NEWS MM ext/soap/soap.c Diff: diff --cc NEWS index e8ad77a,53f0112..2a4b66e --- a/NEWS +++ b/NEWS @@@ -38,12 -31,13 +38,16 @@@ PH - Reflection: . Fixed Bug #63614 (Fatal error on Reflection). (Laruence) + - SOAP + . Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests). + (John Jawed, Dmitry) + -22 Nov 2012, PHP 5.3.19 +22 Nov 2012, PHP 5.4.9 -- Core +- Core: + . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence) + . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes). + (Tony, Andrew Sitnikov) . Fixed bug #63241 (PHP fails to open Windows deduplicated files). (daniel dot stelter-gliese at innogames dot de) . Fixed bug #62444 (Handle leak in is_readable on windows). diff --cc ext/soap/soap.c index abeab53,7576466..cd45ec6 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@@ -463,19 -548,10 +463,6 @@@ zend_module_entry soap_module_entry = ZEND_GET_MODULE(soap) #endif - ZEND_INI_MH(OnUpdateCacheEnabled) - { - if (OnUpdateBool(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC) == FAILURE) { - return FAILURE; - } - if (SOAP_GLOBAL(cache_enabled)) { - SOAP_GLOBAL(cache) = SOAP_GLOBAL(cache_mode); - } else { - SOAP_GLOBAL(cache) = 0; - } - return SUCCESS; - } - -#ifndef ZEND_ENGINE_2 -# define OnUpdateLong OnUpdateInt -#endif - ZEND_INI_MH(OnUpdateCacheMode) { char *p; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
