X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.c;h=30ee32d7c68b3341aeaeb24c909b102537caccdf;hp=c98701b253ae71f0aa6bd22cb3460ee62032f385;hb=4f87b202b31968d3afc037f260e4281d91e8ff13;hpb=87db9817d428282792c8146d9c2ae9748ebf6f1e

diff --git a/php_http_env.c b/php_http_env.c
index c98701b..30ee32d 100644
--- a/php_http_env.c
+++ b/php_http_env.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -957,8 +957,11 @@ static SAPI_POST_HANDLER_FUNC(php_http_json_post_handler)
 	size_t json_len = 0;
 
 #if PHP_VERSION_ID >= 50600
-	php_http_message_body_to_string(php_http_env_get_request_body(TSRMLS_C),
-			&json_str, &json_len, 0, -1);
+	if (SG(request_info).request_body) {
+		/* FG(stream_wrappers) not initialized yet, so we cannot use php://input */
+		php_stream_rewind(SG(request_info).request_body);
+		json_len = php_stream_copy_to_mem(SG(request_info).request_body, &json_str, PHP_STREAM_COPY_ALL, 0);
+	}
 #else
 	json_str = SG(request_info).raw_post_data;
 	json_len = SG(request_info).raw_post_data_length;