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 /main/SAPI.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 'main/SAPI.c')
| -rw-r--r-- | main/SAPI.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 03be1e6d76..b69143c587 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -279,7 +279,7 @@ SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data) } - SG(request_info).request_body = php_stream_temp_create(TEMP_STREAM_DEFAULT, SAPI_POST_BLOCK_SIZE); + SG(request_info).request_body = php_stream_temp_create_ex(TEMP_STREAM_DEFAULT, SAPI_POST_BLOCK_SIZE, PG(upload_tmp_dir)); if (sapi_module.read_post) { int read_bytes; |