Commit: 702b436ef470cc02f8e2cc21f2fadeee42103c74 Author: Dmitry Stogov <dmi...@zend.com> Thu, 7 Feb 2013 13:10:04 +0400 Parents: e7ce002c01945438fc3d4e10356f7e3241240deb cc4c318b0c71e1a9c9cf803b5ee5d437344d64db Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=702b436ef470cc02f8e2cc21f2fadeee42103c74 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Check if soap.wsdl_cache_dir confirms to open_basedir Changed paths: MM ext/soap/soap.c Diff: diff --cc ext/soap/soap.c index 13f163a,6851a9b..7df84e5 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@@ -479,6 -568,40 +479,36 @@@ ZEND_INI_MH(OnUpdateCacheMode return SUCCESS; } + static PHP_INI_MH(OnUpdateCacheDir) + { - /* Only do the safemode/open_basedir check at runtime */ ++ /* 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(safe_mode) && *p && (!php_checkuid(p, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { - return FAILURE; - } - + 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) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
