com php-src: fix patch for 5.4: ext/soap/soap.c
| From: | Stanislav Malyshev | Date: | Tue, 12 Feb 2013 20:24:52 +0000 |
| Subject: | com php-src: fix patch for 5.4: ext/soap/soap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71221@lists.php.net to get a copy of this message | ||
Commit: 24236fb4767711758008fd1b9a99ea583d2765a0
Author: Stanislav Malyshev <stas@php.net> Tue, 12 Feb 2013 12:24:52 -0800
Parents: 2cae43d1d6223a4028fdabb8dff26c76ce14c692
Branches: PHP-5.4.12
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24236fb4767711758008fd1b9a99ea583d2765a0
Log:
fix patch for 5.4
Changed paths:
M ext/soap/soap.c
Diff:
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 8c25b26..7df84e5 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -481,7 +481,7 @@ ZEND_INI_MH(OnUpdateCacheMode)
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;
@@ -500,10 +500,6 @@ static PHP_INI_MH(OnUpdateCacheDir)
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;
}