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/exif | |
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/exif')
-rw-r--r-- | ext/exif/exif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 1f9789c272..6a4fcc4a77 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -3861,7 +3861,7 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t ImageInfo->motorola_intel = -1; /* flag as unknown */ - ImageInfo->infile = php_stream_open_wrapper(FileName, "rb", STREAM_MUST_SEEK|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL); + ImageInfo->infile = php_stream_open_wrapper(FileName, "rb", STREAM_MUST_SEEK|IGNORE_PATH, NULL); if (!ImageInfo->infile) { exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Unable to open file"); return FALSE; @@ -4166,7 +4166,7 @@ PHP_FUNCTION(exif_imagetype) return; } - stream = php_stream_open_wrapper(imagefile, "rb", IGNORE_PATH|ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL); + stream = php_stream_open_wrapper(imagefile, "rb", IGNORE_PATH|REPORT_ERRORS, NULL); if (stream == NULL) { RETURN_FALSE; |