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 /ext/standard/link_win32.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 'ext/standard/link_win32.c')
| -rw-r--r-- | ext/standard/link_win32.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/standard/link_win32.c b/ext/standard/link_win32.c index 37575077ad..ff4e33f3b5 100644 --- a/ext/standard/link_win32.c +++ b/ext/standard/link_win32.c @@ -39,7 +39,6 @@ #include <errno.h> #include <ctype.h> -#include "safe_mode.h" #include "php_link.h" #include "php_string.h" @@ -91,7 +90,7 @@ PHP_FUNCTION(readlink) return; } - if (OPENBASEDIR_CHECKPATH(link)) { + if (php_check_open_basedir(link TSRMLS_CC)) { RETURN_FALSE; } if (!expand_filepath(link, path_resolved TSRMLS_CC)) { @@ -209,11 +208,11 @@ PHP_FUNCTION(symlink) RETURN_FALSE; } - if (OPENBASEDIR_CHECKPATH(dest_p)) { + if (php_check_open_basedir(dest_p TSRMLS_CC)) { RETURN_FALSE; } - if (OPENBASEDIR_CHECKPATH(source_p)) { + if (php_check_open_basedir(source_p TSRMLS_CC)) { RETURN_FALSE; } @@ -264,11 +263,11 @@ PHP_FUNCTION(link) RETURN_FALSE; } - if (OPENBASEDIR_CHECKPATH(source_p)) { + if (php_check_open_basedir(source_p TSRMLS_CC)) { RETURN_FALSE; } - if (OPENBASEDIR_CHECKPATH(dest_p)) { + if (php_check_open_basedir(dest_p TSRMLS_CC)) { RETURN_FALSE; } |