summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2005-05-23 21:51:00 +0000
committerIlia Alshanetsky <iliaa@php.net>2005-05-23 21:51:00 +0000
commit04d0a786499f211bf2474049da67cda1f2523c51 (patch)
tree2fd095ebfea8bf9cf3c02ff2057b7f446aecf3f7
parent64ddf44bd5e16a6573a694fdeaae84c3a1e1d5d0 (diff)
downloadphp-git-04d0a786499f211bf2474049da67cda1f2523c51.tar.gz
MFH: Fixed bug #32810 (temporary files not using plain file wrapper).
-rw-r--r--NEWS1
-rwxr-xr-xmain/streams.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 953fdfe789..16b0ae4f0c 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ PHP 4 NEWS
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
- Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly). (Ilia)
+- Fixed bug #32810 (temporary files not using plain file wrapper). (Ilia)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
- Fixed bug #32773 (GMP functions break when second parameter is 0). (Stas)
diff --git a/main/streams.c b/main/streams.c
index 8ce94463bb..775587f185 100755
--- a/main/streams.c
+++ b/main/streams.c
@@ -1371,6 +1371,7 @@ PHPAPI php_stream *_php_stream_fopen_tmpfile(int dummy STREAMS_DC TSRMLS_DC)
if (fd != -1) {
php_stream *stream = php_stream_fopen_from_fd_rel(fd, "r+b", NULL);
if (stream) {
+ stream->wrapper = &php_plain_files_wrapper;
php_stdio_stream_data *self = (php_stdio_stream_data*)stream->abstract;
self->temp_file_name = opened_path;