diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-26 23:53:30 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-26 23:53:30 +0000 |
| commit | dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f (patch) | |
| tree | 6c3e808cb0300c72f869478fbbc9dea69e5cf697 /main/php_ini.c | |
| parent | 3c78ad763ebb0e09ad5524ba08fa6e83feffe102 (diff) | |
| download | php-git-dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f.tar.gz | |
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
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index e6c71a14d4..40cd7efe06 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -365,7 +365,6 @@ int php_init_config(TSRMLS_D) char *php_ini_file_name = NULL; char *php_ini_search_path = NULL; int php_ini_scanned_path_len; - int safe_mode_state; char *open_basedir; int free_ini_search_path = 0; zend_file_handle fh; @@ -381,7 +380,6 @@ int php_init_config(TSRMLS_D) zend_llist_init(&extension_lists.engine, sizeof(char *), (llist_dtor_func_t) free_estring, 1); zend_llist_init(&extension_lists.functions, sizeof(char *), (llist_dtor_func_t) free_estring, 1); - safe_mode_state = PG(safe_mode); open_basedir = PG(open_basedir); if (sapi_module.php_ini_path_override) { @@ -528,7 +526,6 @@ int php_init_config(TSRMLS_D) #endif } - PG(safe_mode) = 0; PG(open_basedir) = NULL; /* @@ -581,7 +578,6 @@ int php_init_config(TSRMLS_D) efree(php_ini_search_path); } - PG(safe_mode) = safe_mode_state; PG(open_basedir) = open_basedir; if (fh.handle.fp) { |