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 /win32 | |
| 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 'win32')
| -rw-r--r-- | win32/build/config.w32 | 2 | ||||
| -rw-r--r-- | win32/build/config.w32.h.in | 1 | ||||
| -rw-r--r-- | win32/install.txt | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index d876566e14..0bc2e96425 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -331,7 +331,7 @@ if (VCVERS == 1200) { AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1); } -ADD_SOURCES("main", "main.c snprintf.c spprintf.c safe_mode.c getopt.c fopen_wrappers.c \ +ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \ php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c network.c \ php_open_temporary_file.c php_logos.c output.c internal_functions.c php_sprintf.c"); diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 119e1c1112..fffa87634b 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -33,7 +33,6 @@ /* PHP Runtime Configuration */ #define PHP_URL_FOPEN 1 -#define PHP_SAFE_MODE 0 #define MAGIC_QUOTES 0 #define USE_CONFIG_FILE 1 #define DEFAULT_SHORT_OPEN_TAG "1" diff --git a/win32/install.txt b/win32/install.txt index 0368e918c8..a97be80deb 100644 --- a/win32/install.txt +++ b/win32/install.txt @@ -1488,7 +1488,7 @@ Running PHP as an Apache module Example 5-2. Apache configuration example <IfModule mod_php5.c> php_value include_path ".:/usr/local/lib/php" - php_admin_flag safe_mode on + php_admin_flag engine on </IfModule> Caution |