Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Check if soap.wsdl_cache_dir confirms to open_basedir

diff --cc ext/soap/soap.c
index 13f163ab3d6a9e6c84bc0e1c81ae9fbf6432b75e,6851a9b19c5683ce90d4cf825a88fffc4b62dff5..7df84e5b2a6c960d3e044f83d55b4e02411468cf
--- 1/ext/soap/soap.c
--- 2/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@@ -479,6 -568,40 +479,36 @@@ ZEND_INI_MH(OnUpdateCacheMode
        return SUCCESS;
  }
  
 -      /* Only do the safemode/open_basedir check at runtime */
+ static PHP_INI_MH(OnUpdateCacheDir)
+ {
 -              if (PG(safe_mode) && *p && (!php_checkuid(p, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
 -                      return FAILURE;
 -              }
 -
++      /* Only do the open_basedir check at runtime */
+       if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) {
+               char *p;
+ 
+               if (memchr(new_value, '\0', new_value_length) != NULL) {
+                       return FAILURE;
+               }
+ 
+               /* we do not use zend_memrchr() since path can contain ; itself */
+               if ((p = strchr(new_value, ';'))) {
+                       char *p2;
+                       p++;
+                       if ((p2 = strchr(p, ';'))) {
+                               p = p2 + 1;
+                       }
+               } else {
+                       p = new_value;
+               }
+ 
+               if (PG(open_basedir) && *p && php_check_open_basedir(p TSRMLS_CC)) {
+                       return FAILURE;
+               }
+       }
+ 
+       OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+       return SUCCESS;
+ }
+ 
  PHP_INI_BEGIN()
  STD_PHP_INI_ENTRY("soap.wsdl_cache_enabled",     "1", PHP_INI_ALL, OnUpdateBool,
                    cache_enabled, zend_soap_globals, soap_globals)