forked from php/php-src
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Removed ini options, safe_mode* * Removed --enable-safe-mode --with-exec-dir configure options on Unix * Updated extensions, SAPI's and core * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
- php-7.1.0
- php-7.1.0beta3
- php-7.1.0beta2
- php-7.1.0beta1
- php-7.1.0alpha3
- php-7.1.0alpha2
- php-7.1.0alpha1
- php-7.1.0RC6
- php-7.1.0RC5
- php-7.1.0RC4
- php-7.1.0RC3
- php-7.1.0RC2
- php-7.1.0RC1
- php-7.0.14
- php-7.0.14RC1
- php-7.0.13
- php-7.0.13RC1
- php-7.0.12
- php-7.0.12RC1
- php-7.0.11
- php-7.0.11RC1
- php-7.0.10
- php-7.0.10RC1
- php-7.0.9
- php-7.0.9RC1
- php-7.0.8
- php-7.0.8RC1
- php-7.0.7
- php-7.0.7RC1
- php-7.0.6
- php-7.0.6RC1
- php-7.0.5
- php-7.0.5RC1
- php-7.0.4
- php-7.0.4RC1
- php-7.0.3
- php-7.0.3RC1
- php-7.0.2
- php-7.0.2RC1
- php-7.0.1
- php-7.0.1RC1
- php-7.0.0
- php-7.0.0beta3
- php-7.0.0beta2
- php-7.0.0beta1
- php-7.0.0alpha2
- php-7.0.0alpha1
- php-7.0.0RC8
- php-7.0.0RC7
- php-7.0.0RC6
- php-7.0.0RC5
- php-7.0.0RC4
- php-7.0.0RC3
- php-7.0.0RC2
- php-7.0.0RC1
- php-5.6.29
- php-5.6.29RC1
- php-5.6.28
- php-5.6.28RC1
- php-5.6.27
- php-5.6.27RC1
- php-5.6.26
- php-5.6.26RC1
- php-5.6.25
- php-5.6.25RC1
- php-5.6.24
- php-5.6.24RC1
- php-5.6.23
- php-5.6.23RC1
- php-5.6.22
- php-5.6.22RC1
- php-5.6.21
- php-5.6.21RC1
- php-5.6.20
- php-5.6.20RC1
- php-5.6.19
- php-5.6.19RC1
- php-5.6.18
- php-5.6.18RC1
- php-5.6.17
- php-5.6.17RC1
- php-5.6.16
- php-5.6.16RC1
- php-5.6.15
- php-5.6.15RC1
- php-5.6.14
- php-5.6.14RC1
- php-5.6.13
- php-5.6.13RC1
- php-5.6.12
- php-5.6.12RC1
- php-5.6.11
- php-5.6.11RC1
- php-5.6.10
- php-5.6.10RC1
- php-5.6.9
- php-5.6.9RC1
- php-5.6.8
- php-5.6.8RC1
- php-5.6.7
- php-5.6.7RC1
- php-5.6.6
- php-5.6.6RC1
- php-5.6.5
- php-5.6.5RC1
- php-5.6.4
- php-5.6.4RC1
- php-5.6.3
- php-5.6.3RC1
- php-5.6.2
- php-5.6.1
- php-5.6.1RC1
- php-5.6.0
- php-5.6.0beta4
- php-5.6.0beta3
- php-5.6.0beta2
- php-5.6.0beta1
- php-5.6.0alpha3
- php-5.6.0alpha2
- php-5.6.0alpha1
- php-5.6.0RC4
- php-5.6.0RC3
- php-5.6.0RC2
- php-5.6.0RC1
- php-5.5.38
- php-5.5.37
- php-5.5.36
- php-5.5.35
- php-5.5.34
- php-5.5.33
- php-5.5.32
- php-5.5.31
- php-5.5.30
- php-5.5.29
- php-5.5.28
- php-5.5.27
- php-5.5.27RC1
- php-5.5.26
- php-5.5.26RC1
- php-5.5.25
- php-5.5.25RC1
- php-5.5.24
- php-5.5.24RC1
- php-5.5.23
- php-5.5.23RC1
- php-5.5.22
- php-5.5.22RC1
- php-5.5.21
- php-5.5.21RC1
- php-5.5.20
- php-5.5.20RC1
- php-5.5.19
- php-5.5.19RC1
- php-5.5.18
- php-5.5.18RC1
- php-5.5.17
- php-5.5.17RC1
- php-5.5.16
- php-5.5.16RC1
- php-5.5.15
- php-5.5.15RC1
- php-5.5.14
- php-5.5.14RC1
- php-5.5.13
- php-5.5.13RC1
- php-5.5.12
- php-5.5.12RC1
- php-5.5.11
- php-5.5.11RC1
- php-5.5.10
- php-5.5.10RC1
- php-5.5.9
- php-5.5.9RC1
- php-5.5.8
- php-5.5.8RC1
- php-5.5.7
- php-5.5.7RC1
- php-5.5.6
- php-5.5.6RC1
- php-5.5.5
- php-5.5.5RC1
- php-5.5.4
- php-5.5.4RC1
- php-5.5.3
- php-5.5.2
- php-5.5.2RC1
- php-5.5.1
- php-5.5.0
- php-5.5.0beta4
- php-5.5.0beta3
- php-5.5.0beta2
- php-5.5.0beta1
- php-5.5.0alpha6
- php-5.5.0alpha5
- php-5.5.0alpha4
- php-5.5.0alpha3
- php-5.5.0alpha2
- php-5.5.0alpha1
- php-5.5.0RC3
- php-5.5.0RC2
- php-5.5.0RC1
- php-5.4.45
- php-5.4.44
- php-5.4.43
- php-5.4.42
- php-5.4.41
- php-5.4.40
- php-5.4.39
- php-5.4.38
- php-5.4.37
- php-5.4.36
- php-5.4.35
- php-5.4.34
- php-5.4.33
- php-5.4.33RC1
- php-5.4.32
- php-5.4.32RC1
- php-5.4.31
- php-5.4.31RC1
- php-5.4.30
- php-5.4.30RC1
- php-5.4.29
- php-5.4.29RC1
- php-5.4.28
- php-5.4.28RC1
- php-5.4.27
- php-5.4.27RC1
- php-5.4.26
- php-5.4.26RC1
- php-5.4.25
- php-5.4.25RC1
- php-5.4.24
- php-5.4.24RC1
- php-5.4.23
- php-5.4.23RC1
- php-5.4.22
- php-5.4.22RC1
- php-5.4.21
- php-5.4.21RC1
- php-5.4.20
- php-5.4.20RC1
- php-5.4.19
- php-5.4.18
- php-5.4.18RC2
- php-5.4.18RC1
- php-5.4.17
- php-5.4.17RC1
- php-5.4.16
- php-5.4.16RC1
- php-5.4.15
- php-5.4.15RC1
- php-5.4.14
- php-5.4.14RC1
- php-5.4.13
- php-5.4.13RC1
- php-5.4.12
- php-5.4.12RC2
- php-5.4.12RC1
- php-5.4.11
- php-5.4.11RC1
- php-5.4.10
- php-5.4.10RC1
- php-5.4.9
- php-5.4.9RC1
- php-5.4.8
- php-5.4.8RC1
- php-5.4.7
- php-5.4.7RC1
- php-5.4.6
- php-5.4.6RC1
- php-5.4.5
- php-5.4.5RC1
- php-5.4.4
- php-5.4.4RC2
- php-5.4.4RC1
- php-5.4.3
- php-5.4.2
- php-5.4.1
- php-5.4.1RC2
- php-5.4.1RC1
- php-5.4.0
- php-5.4.0beta2
- php-5.4.0beta1
- php-5.4.0alpha3
- php-5.4.0alpha2
- php-5.4.0alpha1
- php-5.4.0RC8
- php-5.4.0RC7
- php-5.4.0RC6
- php-5.4.0RC5
- php-5.4.0RC4
- php-5.4.0RC3
- php-5.4.0RC2
- php-5.4.0RC1
- PRE_64BIT_BRANCH_MERGE
- PRE_PHPNG_MERGE
- PRE_PHP7_REMOVALS
- PRE_PHP7_NSAPI_REMOVAL
- PRE_PHP7_EREG_MYSQL_REMOVALS
- PRE_NATIVE_TLS_MERGE
- PRE_AST_MERGE
- POST_64BIT_BRANCH_MERGE
- POST_PHPNG_MERGE
- POST_PHP7_REMOVALS
- POST_PHP7_NSAPI_REMOVAL
- POST_PHP7_EREG_MYSQL_REMOVALS
- POST_NATIVE_TLS_MERGE
- POST_AST_MERGE
- PHP-5.4.1-RC1
Showing
123 changed files
with
418 additions
and
1,461 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ | |
| http://www.php.net/license/3_01.txt | | ||
| If you did not receive a copy of the PHP license and are unable to | | ||
| obtain it through the world-wide-web, please send a note to | | ||
| [email protected] so we can mail you a copy immediately. | | ||
| [email protected] so we can mail you 6 copy immediately. | | ||
+----------------------------------------------------------------------+ | ||
| Author: Sterling Hughes <[email protected]> | | ||
+----------------------------------------------------------------------+ | ||
|
@@ -169,8 +169,8 @@ static int php_curl_option_url(php_curl *ch, const char *url, const int len TSRM | |
#if LIBCURL_VERSION_NUM < 0x071100 | ||
char *copystr = NULL; | ||
#endif | ||
/* Disable file:// if open_basedir or safe_mode are used */ | ||
if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) { | ||
/* Disable file:// if open_basedir are used */ | ||
if (PG(open_basedir) && *PG(open_basedir)) { | ||
#if LIBCURL_VERSION_NUM >= 0x071304 | ||
error = curl_easy_setopt(ch->cp, CURLOPT_PROTOCOLS, CURLPROTO_ALL & ~CURLPROTO_FILE); | ||
#else | ||
|
@@ -1664,8 +1664,8 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu | |
convert_to_long_ex(zvalue); | ||
#if LIBCURL_VERSION_NUM >= 0x71304 | ||
if ((option == CURLOPT_PROTOCOLS || option == CURLOPT_REDIR_PROTOCOLS) && | ||
((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) && (Z_LVAL_PP(zvalue) & CURLPROTO_FILE)) { | ||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLPROTO_FILE cannot be activated when in safe_mode or an open_basedir is set"); | ||
(PG(open_basedir) && *PG(open_basedir)) && (Z_LVAL_PP(zvalue) & CURLPROTO_FILE)) { | ||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLPROTO_FILE cannot be activated when an open_basedir is set"); | ||
RETVAL_FALSE; | ||
return 1; | ||
} | ||
|
@@ -1674,9 +1674,9 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu | |
break; | ||
case CURLOPT_FOLLOWLOCATION: | ||
convert_to_long_ex(zvalue); | ||
if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) { | ||
if (PG(open_basedir) && *PG(open_basedir)) { | ||
if (Z_LVAL_PP(zvalue) != 0) { | ||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when safe_mode is enabled or an open_basedir is set"); | ||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when an open_basedir is set"); | ||
RETVAL_FALSE; | ||
return 1; | ||
} | ||
|
@@ -1728,7 +1728,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu | |
option == CURLOPT_SSH_PUBLIC_KEYFILE || option == CURLOPT_SSH_PRIVATE_KEYFILE | ||
|
||
) { | ||
if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(zvalue), "rb+", CHECKUID_CHECK_MODE_PARAM))) { | ||
if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) { | ||
RETVAL_FALSE; | ||
return 1; | ||
} | ||
|
@@ -1938,8 +1938,8 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu | |
if ((filename = php_memnstr(postval, ";filename=", sizeof(";filename=") - 1, postval + Z_STRLEN_PP(current)))) { | ||
*filename = '\0'; | ||
} | ||
/* safe_mode / open_basedir check */ | ||
if (php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(postval, "rb+", CHECKUID_CHECK_MODE_PARAM))) { | ||
/* open_basedir check */ | ||
if (php_check_open_basedir(postval TSRMLS_CC)) { | ||
RETVAL_FALSE; | ||
return 1; | ||
} | ||
|
@@ -2028,8 +2028,8 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu | |
|
||
break; | ||
} | ||
/* the following options deal with files, therefor safe_mode & open_basedir checks | ||
* are required. | ||
/* the following options deal with files, therefore the open_basedir check | ||
* is required. | ||
*/ | ||
case CURLOPT_COOKIEJAR: | ||
case CURLOPT_SSLCERT: | ||
|
@@ -2041,7 +2041,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu | |
|
||
convert_to_string_ex(zvalue); | ||
|
||
if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(zvalue), "rb+", CHECKUID_CHECK_MODE_PARAM))) { | ||
if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) { | ||
RETVAL_FALSE; | ||
return 1; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.