diff options
| author | Andi Gutmans <andi@php.net> | 2006-02-19 01:19:37 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2006-02-19 01:19:37 +0000 |
| commit | d3f7bee047551e86c1fe0785b442ab0b3bc2475e (patch) | |
| tree | fb59c5077b8fc56a629f537b3aced3dcc95bb046 /main/streams/plain_wrapper.c | |
| parent | e3b1e8c5ddf56369d6eba69692c71b7d8be19dcd (diff) | |
| download | php-git-d3f7bee047551e86c1fe0785b442ab0b3bc2475e.tar.gz | |
Nuke php_check_safe_mode_include_dir
Diffstat (limited to 'main/streams/plain_wrapper.c')
| -rw-r--r-- | main/streams/plain_wrapper.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 12c708f11b..beb65d5ca1 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -1210,10 +1210,6 @@ not_relative_path: return NULL; } - if ((php_check_safe_mode_include_dir(filename TSRMLS_CC)) == 0) - /* filename is in safe_mode_include_dir (or subdir) */ - return php_stream_fopen_rel(filename, mode, opened_path, options); - return php_stream_fopen_rel(filename, mode, opened_path, options); } @@ -1232,9 +1228,6 @@ not_relative_path: if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(trypath TSRMLS_CC)) { return NULL; } - if ((php_check_safe_mode_include_dir(trypath TSRMLS_CC)) == 0) { - return php_stream_fopen_rel(trypath, mode, opened_path, options); - } return php_stream_fopen_rel(trypath, mode, opened_path, options); } @@ -1289,19 +1282,6 @@ not_relative_path: continue; } - if (PG(safe_mode)) { - if (VCWD_STAT(trypath, &sb) == 0) { - /* file exists ... check permission */ - if ((php_check_safe_mode_include_dir(trypath TSRMLS_CC) == 0) || - php_checkuid_ex(trypath, mode, CHECKUID_CHECK_MODE_PARAM, CHECKUID_NO_ERRORS)) { - /* UID ok, or trypath is in safe_mode_include_dir */ - stream = php_stream_fopen_rel(trypath, mode, opened_path, options); - goto stream_done; - } - } - ptr = end; - continue; - } stream = php_stream_fopen_rel(trypath, mode, opened_path, options); if (stream) { stream_done: |