Skip to content

Commit dd8e59d

Browse files
KalleZKalleZ
committed
Removed safe_mode
 * 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
1 parent 3c78ad7 commit dd8e59d

123 files changed

Lines changed: 418 additions & 1461 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎INSTALL‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,15 +1584,11 @@ Running PHP as an Apache module
15841584
Example 6-2. Apache configuration example
15851585
<IfModule mod_php5.c>
15861586
php_value include_path ".:/usr/local/lib/php"
1587-
php_admin_flag safe_mode on
1587+
php_admin_flag engine on
15881588
</IfModule>
15891589
<IfModule mod_php4.c>
15901590
php_value include_path ".:/usr/local/lib/php"
1591-
php_admin_flag safe_mode on
1592-
</IfModule>
1593-
<IfModule mod_php3.c>
1594-
php3_include_path ".:/usr/local/lib/php"
1595-
php3_safe_mode on
1591+
php_admin_flag engine on
15961592
</IfModule>
15971593

15981594
Caution

‎Makefile.gcov‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ lcov-test: all
1313
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
1414
TEST_PHP_SRCDIR=$(top_srcdir) \
1515
CC="$(CC)" \
16-
$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
16+
$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
1717
elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
1818
NO_INTERACTION=1 \
1919
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
2020
TEST_PHP_SRCDIR=$(top_srcdir) \
2121
CC="$(CC)" \
22-
$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
22+
$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
2323
else \
2424
echo "ERROR: Cannot run tests without CLI sapi."; \
2525
fi

‎Makefile.global‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ PHP_TEST_SHARED_EXTENSIONS = ` \
7979
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
8080
done; \
8181
fi`
82-
PHP_DEPRECATED_DIRECTIVES_REGEX = '^(safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
82+
PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
8383

8484
test: all
8585
-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \

‎NEWS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@
3535
is present at compile time. (Rasmus)
3636

3737
- Removed legacy features:
38+
. allow_call_time_pass_reference. (Pierrick)
3839
. define_syslog_variables ini option and its associated function. (Kalle)
3940
. highlight.bg ini option. (Kalle)
4041
. import_request_variables(). (Kalle)
4142
. register_globals. (Kalle)
42-
. allow_call_time_pass_reference. (Pierrick)
4343
. register_long_arrays ini option. (Kalle)
44+
. Safe mode. (Kalle)
4445
. Session bug compatibility mode (session.bug_compat42 and
4546
session.bug_compat_warn ini options). (Kalle)
4647
. session_is_registered(), session_register() and session_unregister()

‎configure.in‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -820,28 +820,6 @@ AC_MSG_RESULT([$PHP_CONFIG_FILE_SCAN_DIR])
820820

821821
test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
822822

823-
PHP_ARG_ENABLE(safe-mode, whether to enable safe mode by default,
824-
[ --enable-safe-mode Enable safe mode by default], no, no)
825-
826-
if test "$PHP_SAFE_MODE" = "yes"; then
827-
AC_DEFINE(PHP_SAFE_MODE,1,[ ])
828-
else
829-
AC_DEFINE(PHP_SAFE_MODE,0,[ ])
830-
fi
831-
832-
AC_MSG_CHECKING([for safe mode exec dir])
833-
PHP_ARG_WITH(exec-dir,,
834-
[ --with-exec-dir[=DIR] Only allow executables in DIR under safe-mode
835-
[/usr/local/php/bin]], no, no)
836-
837-
if test "$PHP_EXEC_DIR" != "no" && test "$PHP_EXEC_DIR" != "yes" ; then
838-
AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR, "$PHP_EXEC_DIR", [ ])
839-
AC_MSG_RESULT([$PHP_EXEC_DIR])
840-
else
841-
AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR, "/usr/local/php/bin", [ ])
842-
AC_MSG_RESULT([/usr/local/php/bin])
843-
fi
844-
845823
PHP_ARG_ENABLE(sigchild, whether to enable PHP's own SIGCHLD handler,
846824
[ --enable-sigchild Enable PHP's own SIGCHLD handler], no, no)
847825

@@ -1410,7 +1388,7 @@ PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
14101388
PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
14111389

14121390
PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \
1413-
safe_mode.c fopen_wrappers.c alloca.c php_scandir.c \
1391+
fopen_wrappers.c alloca.c php_scandir.c \
14141392
php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
14151393
strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
14161394
network.c php_open_temporary_file.c php_logos.c \

‎ext/bz2/bz2.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,
219219
path_copy = path;
220220
#endif
221221

222-
if ((PG(safe_mode) && (!php_checkuid(path_copy, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(path_copy TSRMLS_CC)) {
222+
if (php_check_open_basedir(path_copy TSRMLS_CC)) {
223223
return NULL;
224224
}
225225

@@ -233,7 +233,7 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,
233233

234234
if (bz_file == NULL) {
235235
/* that didn't work, so try and get something from the network/wrapper */
236-
stream = php_stream_open_wrapper(path, mode, options | STREAM_WILL_CAST | ENFORCE_SAFE_MODE, opened_path);
236+
stream = php_stream_open_wrapper(path, mode, options | STREAM_WILL_CAST, opened_path);
237237

238238
if (stream) {
239239
int fd;
@@ -386,7 +386,7 @@ static PHP_FUNCTION(bzopen)
386386
stream = php_stream_bz2open(NULL,
387387
Z_STRVAL_PP(file),
388388
mode,
389-
ENFORCE_SAFE_MODE | REPORT_ERRORS,
389+
REPORT_ERRORS,
390390
NULL);
391391
} else if (Z_TYPE_PP(file) == IS_RESOURCE) {
392392
/* If it is a resource, than its a stream resource */

‎ext/com_dotnet/com_persist.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,7 @@ CPH_METHOD(SaveToFile)
386386
RETURN_FALSE;
387387
}
388388

389-
if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
390-
php_check_open_basedir(fullpath TSRMLS_CC)) {
389+
if (php_check_open_basedir(fullpath TSRMLS_CC)) {
391390
efree(fullpath);
392391
RETURN_FALSE;
393392
}
@@ -449,8 +448,7 @@ CPH_METHOD(LoadFromFile)
449448
RETURN_FALSE;
450449
}
451450

452-
if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
453-
php_check_open_basedir(fullpath TSRMLS_CC)) {
451+
if (php_check_open_basedir(fullpath TSRMLS_CC)) {
454452
efree(fullpath);
455453
RETURN_FALSE;
456454
}

‎ext/curl/interface.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| http://www.php.net/license/3_01.txt |
1111
| If you did not receive a copy of the PHP license and are unable to |
1212
| obtain it through the world-wide-web, please send a note to |
13-
| license@php.net so we can mail you a copy immediately. |
13+
| license@php.net so we can mail you 6 copy immediately. |
1414
+----------------------------------------------------------------------+
1515
| Author: Sterling Hughes <sterling@php.net> |
1616
+----------------------------------------------------------------------+
@@ -169,8 +169,8 @@ static int php_curl_option_url(php_curl *ch, const char *url, const int len TSRM
169169
#if LIBCURL_VERSION_NUM < 0x071100
170170
char *copystr = NULL;
171171
#endif
172-
/* Disable file:// if open_basedir or safe_mode are used */
173-
if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) {
172+
/* Disable file:// if open_basedir are used */
173+
if (PG(open_basedir) && *PG(open_basedir)) {
174174
#if LIBCURL_VERSION_NUM >= 0x071304
175175
error = curl_easy_setopt(ch->cp, CURLOPT_PROTOCOLS, CURLPROTO_ALL & ~CURLPROTO_FILE);
176176
#else
@@ -1664,8 +1664,8 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
16641664
convert_to_long_ex(zvalue);
16651665
#if LIBCURL_VERSION_NUM >= 0x71304
16661666
if ((option == CURLOPT_PROTOCOLS || option == CURLOPT_REDIR_PROTOCOLS) &&
1667-
((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) && (Z_LVAL_PP(zvalue) & CURLPROTO_FILE)) {
1668-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLPROTO_FILE cannot be activated when in safe_mode or an open_basedir is set");
1667+
(PG(open_basedir) && *PG(open_basedir)) && (Z_LVAL_PP(zvalue) & CURLPROTO_FILE)) {
1668+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLPROTO_FILE cannot be activated when an open_basedir is set");
16691669
RETVAL_FALSE;
16701670
return 1;
16711671
}
@@ -1674,9 +1674,9 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
16741674
break;
16751675
case CURLOPT_FOLLOWLOCATION:
16761676
convert_to_long_ex(zvalue);
1677-
if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) {
1677+
if (PG(open_basedir) && *PG(open_basedir)) {
16781678
if (Z_LVAL_PP(zvalue) != 0) {
1679-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when safe_mode is enabled or an open_basedir is set");
1679+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when an open_basedir is set");
16801680
RETVAL_FALSE;
16811681
return 1;
16821682
}
@@ -1728,7 +1728,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
17281728
option == CURLOPT_SSH_PUBLIC_KEYFILE || option == CURLOPT_SSH_PRIVATE_KEYFILE
17291729

17301730
) {
1731-
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))) {
1731+
if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) {
17321732
RETVAL_FALSE;
17331733
return 1;
17341734
}
@@ -1938,8 +1938,8 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
19381938
if ((filename = php_memnstr(postval, ";filename=", sizeof(";filename=") - 1, postval + Z_STRLEN_PP(current)))) {
19391939
*filename = '\0';
19401940
}
1941-
/* safe_mode / open_basedir check */
1942-
if (php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(postval, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
1941+
/* open_basedir check */
1942+
if (php_check_open_basedir(postval TSRMLS_CC)) {
19431943
RETVAL_FALSE;
19441944
return 1;
19451945
}
@@ -2028,8 +2028,8 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
20282028

20292029
break;
20302030
}
2031-
/* the following options deal with files, therefor safe_mode & open_basedir checks
2032-
* are required.
2031+
/* the following options deal with files, therefore the open_basedir check
2032+
* is required.
20332033
*/
20342034
case CURLOPT_COOKIEJAR:
20352035
case CURLOPT_SSLCERT:
@@ -2041,7 +2041,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
20412041

20422042
convert_to_string_ex(zvalue);
20432043

2044-
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))) {
2044+
if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) {
20452045
RETVAL_FALSE;
20462046
return 1;
20472047
}

‎ext/curl/streams.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,15 +395,15 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename,
395395
}
396396
}
397397
if (mr > 1) {
398-
if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) {
398+
if (PG(open_basedir) && *PG(open_basedir)) {
399399
curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 0);
400400
} else {
401401
curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 1);
402402
}
403403
curl_easy_setopt(curlstream->curl, CURLOPT_MAXREDIRS, mr);
404404
}
405405
} else {
406-
if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) {
406+
if (PG(open_basedir) && *PG(open_basedir)) {
407407
curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 0);
408408
} else {
409409
curl_easy_setopt(curlstream->curl, CURLOPT_FOLLOWLOCATION, 1);

‎ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION_open_basedir.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
CURLOPT_FOLLOWLOCATION case check safe_mode and open_basedir
2+
CURLOPT_FOLLOWLOCATION case check open_basedir
33
--CREDITS--
44
WHITE new media architects - Dennis
55
--INI--
@@ -17,6 +17,6 @@ curl_close($ch);
1717
var_dump($succes);
1818
?>
1919
--EXPECTF--
20-
Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when %r(safe_mode is enabled or an )?%ropen_basedir is set in %s.php on line %d
20+
Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when an open_basedir is set in %s.php on line %d
2121
bool(false)
2222

0 commit comments

Comments
 (0)