diff options
| author | Michael Wallner <mike@php.net> | 2013-09-17 13:52:25 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-09-17 13:52:25 +0200 |
| commit | 423c70fb4d79b7831b1db41ea217c8e1afd5cf8e (patch) | |
| tree | 7c78b090a462749e567e29a668cf8c750aa60b20 /ext/soap | |
| parent | 0f78d8612a7b16f1bbe3fb80a99896d7163c0aa7 (diff) | |
| parent | 71bee63fad5418642c87c588cc9e22ca44186ce6 (diff) | |
| download | php-git-423c70fb4d79b7831b1db41ea217c8e1afd5cf8e.tar.gz | |
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
Diffstat (limited to 'ext/soap')
| -rw-r--r-- | ext/soap/soap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c index d10c17e218..980c9248aa 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -1580,7 +1580,7 @@ PHP_METHOD(SoapServer, handle) array_init_size(&filter_params, 1); add_assoc_long_ex(&filter_params, ZEND_STRS("window"), 0x2f); /* ANY WBITS */ - zf = php_stream_filter_create("zlib.inflate", &filter_params, 0); + zf = php_stream_filter_create("zlib.inflate", &filter_params, 0 TSRMLS_CC); zval_dtor(&filter_params); if (zf) { @@ -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; |