From: Michael Wallner <mike@php.net>
Date: Tue, 17 Sep 2013 11:52:25 +0000 (+0200)
Subject: Merge branch 'slim-postdata-merge'
X-Git-Tag: php-5.6.0alpha1~211^2~11^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=423c70fb4d79b7831b1db41ea217c8e1afd5cf8e;p=php

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
---

423c70fb4d79b7831b1db41ea217c8e1afd5cf8e
diff --cc ext/soap/soap.c
index d10c17e218,c5900dc645..980c9248aa
--- 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 ccfb1e507d,9c8bcb1420..8ee7649648
--- 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) {