]> granicus.if.org Git - php/commitdiff
Merge branch 'slim-postdata-merge'
authorMichael Wallner <mike@php.net>
Tue, 17 Sep 2013 11:52:25 +0000 (13:52 +0200)
committerMichael Wallner <mike@php.net>
Tue, 17 Sep 2013 11:52:25 +0000 (13:52 +0200)
* 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

1  2 
ext/soap/soap.c
ext/standard/php_fopen_wrapper.c
main/SAPI.c

diff --cc ext/soap/soap.c
index d10c17e21818976067718873a8be4a27ca16af60,c5900dc645af4f815d22d0e8bac289c68cd94484..980c9248aa6751707a791b1ed0e9802fdfd8625a
@@@ -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;
Simple merge
diff --cc main/SAPI.c
index ccfb1e507d85f8edaf8889e109303e25e7f029b3,9c8bcb1420cabc87130d6609d684392755dee15a..8ee7649648d537f032d329c83c8aaedb56347575
@@@ -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) {