Permalink
Browse files

Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)

  • Loading branch information...
1 parent bf6fea6 commit 9e1d3cfdabf8665aec4d121bafa31cddd6ca7231 @dstogov dstogov committed Nov 29, 2012
Showing with 3 additions and 21 deletions.
  1. +3 −21 ext/soap/soap.c
View
@@ -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);

0 comments on commit 9e1d3cf

Please sign in to comment.