diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-11-29 16:31:08 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-11-29 16:31:08 +0400 |
| commit | dc2192c08766939700260128684255772ba4296f (patch) | |
| tree | 156fdb5c0bd21598e27436fe555dfbfe51f3906d | |
| parent | 92e2f2938115d2cdae185848d535380fb7694598 (diff) | |
| download | php-git-dc2192c08766939700260128684255772ba4296f.tar.gz | |
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/soap/soap.c | 24 |
2 files changed, 6 insertions, 21 deletions
@@ -31,6 +31,9 @@ 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.3.19 diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 120f78071b..7576466c21 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -552,19 +552,6 @@ ZEND_GET_MODULE(soap) # define OnUpdateLong OnUpdateInt #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; @@ -578,16 +565,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) @@ -1220,7 +1202,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); @@ -2512,7 +2494,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); |