diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-11-29 16:41:09 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-11-29 16:41:09 +0400 |
| commit | 7f7cff0bbbdda0626839e7f1aee40bcf9d6c9df5 (patch) | |
| tree | 2cf053af32a35e7d07c8b8980bbf8978106c6fa6 | |
| parent | 1a09bf8023356c65a461076c6525749bdd005b58 (diff) | |
| parent | dc2192c08766939700260128684255772ba4296f (diff) | |
| download | php-git-7f7cff0bbbdda0626839e7f1aee40bcf9d6c9df5.tar.gz | |
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
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/soap/soap.c | 24 |
2 files changed, 7 insertions, 21 deletions
@@ -38,6 +38,10 @@ PHP NEWS - 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.4.9 - Core: diff --git a/ext/soap/soap.c b/ext/soap/soap.c index abeab53b9e..cd45ec6853 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -463,19 +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; -} - ZEND_INI_MH(OnUpdateCacheMode) { char *p; @@ -489,16 +476,11 @@ ZEND_INI_MH(OnUpdateCacheMode) *p = (char)atoi(new_value); - if (SOAP_GLOBAL(cache_enabled)) { - SOAP_GLOBAL(cache) = SOAP_GLOBAL(cache_mode); - } else { - SOAP_GLOBAL(cache) = 0; - } return SUCCESS; } PHP_INI_BEGIN() -STD_PHP_INI_ENTRY("soap.wsdl_cache_enabled", "1", PHP_INI_ALL, OnUpdateCacheEnabled, +STD_PHP_INI_ENTRY("soap.wsdl_cache_enabled", "1", PHP_INI_ALL, OnUpdateBool, cache_enabled, zend_soap_globals, soap_globals) STD_PHP_INI_ENTRY("soap.wsdl_cache_dir", "/tmp", PHP_INI_ALL, OnUpdateString, cache_dir, zend_soap_globals, soap_globals) @@ -1102,7 +1084,7 @@ PHP_METHOD(SoapServer, SoapServer) memset(service, 0, sizeof(soapService)); service->send_errors = 1; - cache_wsdl = SOAP_GLOBAL(cache); + cache_wsdl = SOAP_GLOBAL(cache_enabled) ? SOAP_GLOBAL(cache_mode) : 0; if (options != NULL) { HashTable *ht = Z_ARRVAL_P(options); @@ -2318,7 +2300,7 @@ PHP_METHOD(SoapClient, SoapClient) php_error_docref(NULL TSRMLS_CC, E_ERROR, "$wsdl must be string or null"); } - cache_wsdl = SOAP_GLOBAL(cache); + cache_wsdl = SOAP_GLOBAL(cache_enabled) ? SOAP_GLOBAL(cache_mode) : 0; if (options != NULL) { HashTable *ht = Z_ARRVAL_P(options); |