Skip to content

Commit d6d0a2a

Browse files
authored
remove safe_mode leftovers (#19552)
1 parent f041c13 commit d6d0a2a

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

ext/gd/php_gd.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#if defined(HAVE_LIBGD) || defined(HAVE_GD_BUNDLED)
2525

26-
/* open_basedir and safe_mode checks */
2726
#define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg) \
2827
if (!filename || php_check_open_basedir(filename)) { \
2928
php_error_docref(NULL, E_WARNING, errormsg); \

ext/session/session.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ static PHP_INI_MH(OnUpdateSaveDir)
649649
SESSION_CHECK_ACTIVE_STATE;
650650
SESSION_CHECK_OUTPUT_STATE;
651651

652-
/* Only do the safemode/open_basedir check at runtime */
652+
/* Only do the open_basedir check at runtime */
653653
if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) {
654654
char *p;
655655

main/fopen_wrappers.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path
3333
/* OPENBASEDIR_CHECKPATH(filename) to ease merge between 6.x and 5.x */
3434
#define OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)
3535

36-
PHPAPI int php_check_safe_mode_include_dir(const char *path);
37-
3836
PHPAPI zend_string *php_resolve_path(const char *filename, size_t filename_len, const char *path);
3937

4038
PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const char *path, zend_string **opened_path);

main/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ static PHP_INI_MH(OnUpdateOutputEncoding)
730730
/* {{{ PHP_INI_MH */
731731
static PHP_INI_MH(OnUpdateErrorLog)
732732
{
733-
/* Only do the safemode/open_basedir check at runtime */
733+
/* Only do the open_basedir check at runtime */
734734
if ((stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) &&
735735
new_value && zend_string_equals_literal(new_value, "syslog")) {
736736
if (PG(open_basedir) && php_check_open_basedir(ZSTR_VAL(new_value))) {
@@ -745,7 +745,7 @@ static PHP_INI_MH(OnUpdateErrorLog)
745745
/* {{{ PHP_INI_MH */
746746
static PHP_INI_MH(OnUpdateMailLog)
747747
{
748-
/* Only do the safemode/open_basedir check at runtime */
748+
/* Only do the open_basedir check at runtime */
749749
if ((stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) && new_value) {
750750
if (PG(open_basedir) && php_check_open_basedir(ZSTR_VAL(new_value))) {
751751
return FAILURE;

0 commit comments

Comments
 (0)