com php-src: Merge branch 'PHP-5.6': main/SAPI.c
| From: | Michael Wallner | Date: | Thu, 03 Jul 2014 18:43:12 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': main/SAPI.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79226@lists.php.net to get a copy of this message | ||
Commit: f9fda21667cf6c93d75402bcd4cca224115ca195
Author: Michael Wallner <mike@php.net> Thu, 3 Jul 2014 20:43:12 +0200
Parents: a99e7eeab9bddbbd548660e53f129084a1650dea 88c1ce3203608d85a18db823729f3d7034b01660
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f9fda21667cf6c93d75402bcd4cca224115ca195
Log:
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
Bugs:
https://bugs.php.net/67551
Changed paths:
MM main/SAPI.c
Diff: