Commit: 423c70fb4d79b7831b1db41ea217c8e1afd5cf8e Author: Michael Wallner <m...@php.net> Tue, 17 Sep 2013 13:52:25 +0200 Parents: 0f78d8612a7b16f1bbe3fb80a99896d7163c0aa7 71bee63fad5418642c87c588cc9e22ca44186ce6 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=423c70fb4d79b7831b1db41ea217c8e1afd5cf8e Log: Merge branch 'slim-postdata-merge' * slim-postdata-merge: remove unused code tests make reading php://input JIT if enable_post_data_reading=0 revert stream cast fix ZTS build slim post data Conflicts: ext/soap/soap.c ext/standard/php_fopen_wrapper.c main/SAPI.c Changed paths: MM ext/soap/soap.c MM ext/standard/php_fopen_wrapper.c MM main/SAPI.c Diff: diff --cc ext/soap/soap.c index d10c17e,c5900dc..980c924 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@@ -1595,11 -1595,11 +1595,10 @@@ PHP_METHOD(SoapServer, handle } } - doc_request = soap_xmlParseFile("php://input"); + doc_request = soap_xmlParseFile("php://input" TSRMLS_CC); if (zf) { - php_stream_filter_remove(zf, 1); - } + php_stream_filter_remove(zf, 1 TSRMLS_CC); - } } else { zval_ptr_dtor(&retval); return; diff --cc main/SAPI.c index ccfb1e5,9c8bcb1..8ee7649 --- a/main/SAPI.c +++ b/main/SAPI.c @@@ -259,6 -274,7 +274,8 @@@ SAPI_API SAPI_POST_READER_FUNC(sapi_rea SG(request_info).content_length, SG(post_max_size)); return; } + ++ SG(request_info).request_body = php_stream_temp_create(TEMP_STREAM_DEFAULT, SAPI_POST_BLOCK_SIZE); if (sapi_module.read_post) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
