diff options
| author | Michael Wallner <mike@php.net> | 2014-07-03 20:43:12 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-07-03 20:43:12 +0200 |
| commit | f9fda21667cf6c93d75402bcd4cca224115ca195 (patch) | |
| tree | cf37d352927fceccfeedda3db3a0507ea10e9d40 /ext/standard/php_fopen_wrapper.c | |
| parent | a99e7eeab9bddbbd548660e53f129084a1650dea (diff) | |
| parent | 88c1ce3203608d85a18db823729f3d7034b01660 (diff) | |
| download | php-git-f9fda21667cf6c93d75402bcd4cca224115ca195.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
reorder
restore API compatibility
finish
refactor php_stream_temp_create{,_ex} and use it for the php://input stream
refactor _php_stream_fopen_{temporary_,tmp}file()
fix length overflow of HTTP_RAW_POST_DATA
Conflicts:
main/php_content_types.c
Diffstat (limited to 'ext/standard/php_fopen_wrapper.c')
| -rw-r--r-- | ext/standard/php_fopen_wrapper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index 7e21e95d18..9628c0d69d 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -231,7 +231,7 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *pa if ((input->body = SG(request_info).request_body)) { php_stream_rewind(input->body); } else { - input->body = php_stream_temp_create(TEMP_STREAM_DEFAULT, SAPI_POST_BLOCK_SIZE); + input->body = php_stream_temp_create_ex(TEMP_STREAM_DEFAULT, SAPI_POST_BLOCK_SIZE, PG(upload_tmp_dir)); SG(request_info).request_body = input->body; } |