X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.c;h=25759a65e83c5da71bd866a876471d8ecc9c5de6;hp=c6b5c2bad6d6909d84952bca0e234616625adb73;hb=046973e332c1475f9bf7717af9d33a75283deb37;hpb=92a430bc613226e2fb1badd624933eeb6c8cb3ce

diff --git a/php_http_env.c b/php_http_env.c
index c6b5c2b..25759a6 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -15,8 +15,6 @@
 
 PHP_RINIT_FUNCTION(http_env)
 {
-	PHP_HTTP_G->env.request.time = sapi_get_request_time(TSRMLS_C);
-
 	/* populate form data on non-POST requests */
 	if (SG(request_info).request_method && strcasecmp(SG(request_info).request_method, "POST") && SG(request_info).content_type && *SG(request_info).content_type) {
 		uint ct_len = strlen(SG(request_info).content_type);
@@ -72,7 +70,7 @@ PHP_RINIT_FUNCTION(http_env)
 		}
 	}
 
-	STR_SET(SG(request_info).content_type_dup, NULL);
+	PTR_SET(SG(request_info).content_type_dup, NULL);
 
 	return SUCCESS;
 }
@@ -96,7 +94,7 @@ PHP_RSHUTDOWN_FUNCTION(http_env)
 	return SUCCESS;
 }
 
-PHP_HTTP_API void php_http_env_get_request_headers(HashTable *headers TSRMLS_DC)
+void php_http_env_get_request_headers(HashTable *headers TSRMLS_DC)
 {
 	php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
 	zval **hsv, **header;
@@ -137,7 +135,7 @@ PHP_HTTP_API void php_http_env_get_request_headers(HashTable *headers TSRMLS_DC)
 	}
 }
 
-PHP_HTTP_API char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *len, php_http_message_t *request TSRMLS_DC)
+char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *len, php_http_message_t *request TSRMLS_DC)
 {
 	HashTable *request_headers;
 	zval **zvalue = NULL;
@@ -165,7 +163,7 @@ PHP_HTTP_API char *php_http_env_get_request_header(const char *name_str, size_t
 	return val;
 }
 
-PHP_HTTP_API int php_http_env_got_request_header(const char *name_str, size_t name_len, php_http_message_t *request TSRMLS_DC)
+int php_http_env_got_request_header(const char *name_str, size_t name_len, php_http_message_t *request TSRMLS_DC)
 {
 	HashTable *request_headers;
 	char *key = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
@@ -183,7 +181,7 @@ PHP_HTTP_API int php_http_env_got_request_header(const char *name_str, size_t na
 	return got;
 }
 
-PHP_HTTP_API zval *php_http_env_get_superglobal(const char *key, size_t key_len TSRMLS_DC)
+zval *php_http_env_get_superglobal(const char *key, size_t key_len TSRMLS_DC)
 {
 	zval **hsv;
 
@@ -196,7 +194,7 @@ PHP_HTTP_API zval *php_http_env_get_superglobal(const char *key, size_t key_len
 	return *hsv;
 }
 
-PHP_HTTP_API zval *php_http_env_get_server_var(const char *key, size_t key_len, zend_bool check TSRMLS_DC)
+zval *php_http_env_get_server_var(const char *key, size_t key_len, zend_bool check TSRMLS_DC)
 {
 	zval *hsv, **var;
 	char *env;
@@ -226,7 +224,7 @@ PHP_HTTP_API zval *php_http_env_get_server_var(const char *key, size_t key_len,
 	return *var;
 }
 
-PHP_HTTP_API php_http_message_body_t *php_http_env_get_request_body(TSRMLS_D)
+php_http_message_body_t *php_http_env_get_request_body(TSRMLS_D)
 {
 	if (!PHP_HTTP_G->env.request.body) {
 		php_stream *s = php_stream_temp_new();
@@ -234,7 +232,7 @@ PHP_HTTP_API php_http_message_body_t *php_http_env_get_request_body(TSRMLS_D)
 		php_stream *input = php_stream_open_wrapper("php://input", "r", 0, NULL);
 
 		/* php://input does not support stat */
-		php_stream_copy_to_stream(input, s, -1);
+		php_stream_copy_to_stream_ex(input, s, -1, NULL);
 		php_stream_close(input);
 #else
 		if (SG(request_info).post_data || SG(request_info).raw_post_data) {
@@ -266,7 +264,7 @@ PHP_HTTP_API php_http_message_body_t *php_http_env_get_request_body(TSRMLS_D)
 	return PHP_HTTP_G->env.request.body;
 }
 
-PHP_HTTP_API const char *php_http_env_get_request_method(php_http_message_t *request TSRMLS_DC)
+const char *php_http_env_get_request_method(php_http_message_t *request TSRMLS_DC)
 {
 	const char *m;
 
@@ -279,7 +277,7 @@ PHP_HTTP_API const char *php_http_env_get_request_method(php_http_message_t *req
 	return m ? m : "GET";
 }
 
-PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t length, php_http_message_t *request TSRMLS_DC)
+php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t length, php_http_message_t *request TSRMLS_DC)
 {
 	zval *zentry;
 	char *range, *rp, c;
@@ -289,7 +287,7 @@ PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *
 		return PHP_HTTP_RANGE_NO;
 	}
 	if (strncmp(range, "bytes=", lenof("bytes="))) {
-		STR_FREE(range);
+		PTR_FREE(range);
 		return PHP_HTTP_RANGE_NO;
 	}
 
@@ -345,7 +343,7 @@ PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *
 							switch (end) {
 								/* "0-" */
 								case -1:
-									STR_FREE(range);
+									PTR_FREE(range);
 									return PHP_HTTP_RANGE_NO;
 
 								/* "0-0" */
@@ -366,7 +364,7 @@ PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *
 						case -1:
 							/* "-", "-0" */
 							if (end == -1 || end == -10) {
-								STR_FREE(range);
+								PTR_FREE(range);
 								return PHP_HTTP_RANGE_ERR;
 							}
 							begin = length - end;
@@ -376,13 +374,13 @@ PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *
 						/* "12345-(NNN)" */
 						default:
 							if (length <= (size_t) begin) {
-								STR_FREE(range);
+								PTR_FREE(range);
 								return PHP_HTTP_RANGE_ERR;
 							}
 							switch (end) {
 								/* "12345-0" */
 								case -10:
-									STR_FREE(range);
+									PTR_FREE(range);
 									return PHP_HTTP_RANGE_ERR;
 
 								/* "12345-" */
@@ -395,7 +393,7 @@ PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *
 									if (length <= (size_t) end) {
 										end = length - 1;
 									} else if (end <  begin) {
-										STR_FREE(range);
+										PTR_FREE(range);
 										return PHP_HTTP_RANGE_ERR;
 									}
 									break;
@@ -417,12 +415,12 @@ PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *
 				break;
 
 			default:
-				STR_FREE(range);
+				PTR_FREE(range);
 				return PHP_HTTP_RANGE_NO;
 		}
 	} while (c != 0);
 
-	STR_FREE(range);
+	PTR_FREE(range);
 	return PHP_HTTP_RANGE_OK;
 }
 
@@ -432,7 +430,7 @@ static void grab_headers(void *data, void *arg TSRMLS_DC)
 	php_http_buffer_appends(PHP_HTTP_BUFFER(arg), PHP_HTTP_CRLF);
 }
 
-PHP_HTTP_API STATUS php_http_env_get_response_headers(HashTable *headers_ht TSRMLS_DC)
+STATUS php_http_env_get_response_headers(HashTable *headers_ht TSRMLS_DC)
 {
 	STATUS status;
 	php_http_buffer_t headers;
@@ -441,13 +439,13 @@ PHP_HTTP_API STATUS php_http_env_get_response_headers(HashTable *headers_ht TSRM
 	zend_llist_apply_with_argument(&SG(sapi_headers).headers, grab_headers, &headers TSRMLS_CC);
 	php_http_buffer_fix(&headers);
 
-	status = php_http_headers_parse(headers.data, headers.used, headers_ht, NULL, NULL TSRMLS_CC);
+	status = php_http_header_parse(headers.data, headers.used, headers_ht, NULL, NULL TSRMLS_CC);
 	php_http_buffer_dtor(&headers);
 
 	return status;
 }
 
-PHP_HTTP_API char *php_http_env_get_response_header(const char *name_str, size_t name_len TSRMLS_DC)
+char *php_http_env_get_response_header(const char *name_str, size_t name_len TSRMLS_DC)
 {
 	char *val = NULL;
 	HashTable headers;
@@ -471,18 +469,18 @@ PHP_HTTP_API char *php_http_env_get_response_header(const char *name_str, size_t
 	return val;
 }
 
-PHP_HTTP_API long php_http_env_get_response_code(TSRMLS_D)
+long php_http_env_get_response_code(TSRMLS_D)
 {
 	long code = SG(sapi_headers).http_response_code;
 	return code ? code : 200;
 }
 
-PHP_HTTP_API STATUS php_http_env_set_response_code(long http_code TSRMLS_DC)
+STATUS php_http_env_set_response_code(long http_code TSRMLS_DC)
 {
 	return sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) http_code TSRMLS_CC);
 }
 
-PHP_HTTP_API STATUS php_http_env_set_response_status_line(long code, php_http_version_t *v TSRMLS_DC)
+STATUS php_http_env_set_response_status_line(long code, php_http_version_t *v TSRMLS_DC)
 {
 	sapi_header_line h = {NULL, 0, 0};
 	STATUS ret;
@@ -494,12 +492,12 @@ PHP_HTTP_API STATUS php_http_env_set_response_status_line(long code, php_http_ve
 	return ret;
 }
 
-PHP_HTTP_API STATUS php_http_env_set_response_protocol_version(php_http_version_t *v TSRMLS_DC)
+STATUS php_http_env_set_response_protocol_version(php_http_version_t *v TSRMLS_DC)
 {
 	return php_http_env_set_response_status_line(php_http_env_get_response_code(TSRMLS_C), v TSRMLS_CC);
 }
 
-PHP_HTTP_API STATUS php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace TSRMLS_DC)
+STATUS php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace TSRMLS_DC)
 {
 	sapi_header_line h = {estrndup(header_str, header_len), header_len, http_code};
 	STATUS ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC);
@@ -507,7 +505,7 @@ PHP_HTTP_API STATUS php_http_env_set_response_header(long http_code, const char
 	return ret;
 }
 
-PHP_HTTP_API STATUS php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv TSRMLS_DC)
+STATUS php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv TSRMLS_DC)
 {
 	STATUS ret = FAILURE;
 	sapi_header_line h = {NULL, 0, http_code};
@@ -523,7 +521,7 @@ PHP_HTTP_API STATUS php_http_env_set_response_header_va(long http_code, zend_boo
 	return ret;
 }
 
-PHP_HTTP_API STATUS php_http_env_set_response_header_format(long http_code, zend_bool replace TSRMLS_DC, const char *fmt, ...)
+STATUS php_http_env_set_response_header_format(long http_code, zend_bool replace TSRMLS_DC, const char *fmt, ...)
 {
 	STATUS ret;
 	va_list args;
@@ -535,7 +533,7 @@ PHP_HTTP_API STATUS php_http_env_set_response_header_format(long http_code, zend
 	return ret;
 }
 
-PHP_HTTP_API STATUS php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace TSRMLS_DC)
+STATUS php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace TSRMLS_DC)
 {
 	if (!value) {
 		sapi_header_line h = {(char *) name_str, name_len, http_code};
@@ -575,7 +573,7 @@ PHP_HTTP_API STATUS php_http_env_set_response_header_value(long http_code, const
 			ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC);
 
 			zval_ptr_dtor(&data);
-			STR_FREE(h.line);
+			PTR_FREE(h.line);
 
 			return ret;
 		}
@@ -673,7 +671,7 @@ static PHP_HTTP_STRLIST(php_http_env_response_status) =
 	PHP_HTTP_STRLIST_STOP
 ;
 
-PHP_HTTP_API const char *php_http_env_get_response_status_for_code(unsigned code)
+const char *php_http_env_get_response_status_for_code(unsigned code)
 {
 	return php_http_strlist_find(php_http_env_response_status, 100, code);
 }
@@ -686,22 +684,20 @@ static PHP_METHOD(HttpEnv, getRequestHeader)
 	char *header_name_str = NULL;
 	int header_name_len = 0;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
-		if (header_name_str && header_name_len) {
-			size_t header_length;
-			char *header_value = php_http_env_get_request_header(header_name_str, header_name_len, &header_length, NULL TSRMLS_CC);
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
+		return;
+	}
+	if (header_name_str && header_name_len) {
+		size_t header_length;
+		char *header_value = php_http_env_get_request_header(header_name_str, header_name_len, &header_length, NULL TSRMLS_CC);
 
-			if (header_value) {
-				RETURN_STRINGL(header_value, header_length, 0);
-			}
-			RETURN_NULL();
-		} else {
-			array_init(return_value);
-			php_http_env_get_request_headers(Z_ARRVAL_P(return_value) TSRMLS_CC);
-			return;
+		if (header_value) {
+			RETURN_STRINGL(header_value, header_length, 0);
 		}
+	} else {
+		array_init(return_value);
+		php_http_env_get_request_headers(Z_ARRVAL_P(return_value) TSRMLS_CC);
 	}
-	RETURN_FALSE;
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getRequestBody, 0, 0, 0)
@@ -709,18 +705,17 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getRequestBody, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpEnv, getRequestBody)
 {
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
-		zend_class_entry *class_entry = php_http_message_body_class_entry;
+	zend_object_value ov;
+	php_http_message_body_t *body;
+	zend_class_entry *class_entry = php_http_message_body_class_entry;
 
-		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &class_entry)) {
-			zend_object_value ov;
-			php_http_message_body_t *body = php_http_env_get_request_body(TSRMLS_C);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &class_entry), invalid_arg, return);
 
-			if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_body_object_new_ex, php_http_message_body_class_entry, php_http_message_body_init(&body, NULL TSRMLS_CC), NULL TSRMLS_CC)) {
-				RETVAL_OBJVAL(ov, 0);
-			}
-		}
-	} end_error_handling();
+	body = php_http_env_get_request_body(TSRMLS_C);
+	if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_body_object_new_ex, php_http_message_body_class_entry, body, NULL TSRMLS_CC)) {
+		php_http_message_body_addref(body);
+		RETVAL_OBJVAL(ov, 0);
+	}
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseStatusForCode, 0, 0, 1)
@@ -730,10 +725,10 @@ static PHP_METHOD(HttpEnv, getResponseStatusForCode)
 {
 	long code;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
-		RETURN_STRING(php_http_env_get_response_status_for_code(code), 1);
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
+		return;
 	}
-	RETURN_FALSE;
+	RETURN_STRING(php_http_env_get_response_status_for_code(code), 1);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseStatusForAllCodes, 0, 0, 0)
@@ -745,7 +740,7 @@ static PHP_METHOD(HttpEnv, getResponseStatusForAllCodes)
 	php_http_strlist_iterator_t i;
 
 	if (SUCCESS != zend_parse_parameters_none()) {
-		RETURN_FALSE;
+		return;
 	}
 
 	array_init(return_value);
@@ -765,31 +760,29 @@ static PHP_METHOD(HttpEnv, getResponseHeader)
 	char *header_name_str = NULL;
 	int header_name_len = 0;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
-		if (header_name_str && header_name_len) {
-			char *header_value = php_http_env_get_response_header(header_name_str, header_name_len TSRMLS_CC);
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
+		return;
+	}
+	if (header_name_str && header_name_len) {
+		char *header_value = php_http_env_get_response_header(header_name_str, header_name_len TSRMLS_CC);
 
-			if (header_value) {
-				RETURN_STRING(header_value, 0);
-			}
-			RETURN_NULL();
-		} else {
-			array_init(return_value);
-			php_http_env_get_response_headers(Z_ARRVAL_P(return_value) TSRMLS_CC);
-			return;
+		if (header_value) {
+			RETURN_STRING(header_value, 0);
 		}
+	} else {
+		array_init(return_value);
+		php_http_env_get_response_headers(Z_ARRVAL_P(return_value) TSRMLS_CC);
 	}
-	RETURN_FALSE;
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseCode, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpEnv, getResponseCode)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
-		RETURN_LONG(php_http_env_get_response_code(TSRMLS_C));
+	if (SUCCESS != zend_parse_parameters_none()) {
+		return;
 	}
-	RETURN_FALSE;
+	RETURN_LONG(php_http_env_get_response_code(TSRMLS_C));
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_setResponseHeader, 0, 0, 1)
@@ -806,10 +799,10 @@ static PHP_METHOD(HttpEnv, setResponseHeader)
 	long code = 0;
 	zend_bool replace_header = 1;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z!lb", &header_name_str, &header_name_len, &header_value, &code, &replace_header)) {
-		RETURN_BOOL(SUCCESS == php_http_env_set_response_header_value(code, header_name_str, header_name_len, header_value, replace_header TSRMLS_CC));
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z!lb", &header_name_str, &header_name_len, &header_value, &code, &replace_header)) {
+		return;
 	}
-	RETURN_FALSE;
+	RETURN_BOOL(SUCCESS == php_http_env_set_response_header_value(code, header_name_str, header_name_len, header_value, replace_header TSRMLS_CC));
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_setResponseCode, 0, 0, 1)
@@ -819,10 +812,10 @@ static PHP_METHOD(HttpEnv, setResponseCode)
 {
 	long code;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
-		RETURN_BOOL(SUCCESS == php_http_env_set_response_code(code TSRMLS_CC));
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
+		return;
 	}
-	RETURN_FALSE;
+	RETURN_BOOL(SUCCESS == php_http_env_set_response_code(code TSRMLS_CC));
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateLanguage, 0, 0, 1)
@@ -834,16 +827,15 @@ static PHP_METHOD(HttpEnv, negotiateLanguage)
 	HashTable *supported;
 	zval *rs_array = NULL;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
-		if (rs_array) {
-			zval_dtor(rs_array);
-			array_init(rs_array);
-		}
-
-		PHP_HTTP_DO_NEGOTIATE(language, supported, rs_array);
-	} else {
-		RETURN_FALSE;
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
+		return;
+	}
+	if (rs_array) {
+		zval_dtor(rs_array);
+		array_init(rs_array);
 	}
+
+	PHP_HTTP_DO_NEGOTIATE(language, supported, rs_array);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateCharset, 0, 0, 1)
@@ -855,15 +847,14 @@ static PHP_METHOD(HttpEnv, negotiateCharset)
 	HashTable *supported;
 	zval *rs_array = NULL;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
-		if (rs_array) {
-			zval_dtor(rs_array);
-			array_init(rs_array);
-		}
-		PHP_HTTP_DO_NEGOTIATE(charset, supported, rs_array);
-	} else {
-		RETURN_FALSE;
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
+		return;
 	}
+	if (rs_array) {
+		zval_dtor(rs_array);
+		array_init(rs_array);
+	}
+	PHP_HTTP_DO_NEGOTIATE(charset, supported, rs_array);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateEncoding, 0, 0, 1)
@@ -875,15 +866,14 @@ static PHP_METHOD(HttpEnv, negotiateEncoding)
 	HashTable *supported;
 	zval *rs_array = NULL;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
-		if (rs_array) {
-			zval_dtor(rs_array);
-			array_init(rs_array);
-		}
-		PHP_HTTP_DO_NEGOTIATE(encoding, supported, rs_array);
-	} else {
-		RETURN_FALSE;
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
+		return;
 	}
+	if (rs_array) {
+		zval_dtor(rs_array);
+		array_init(rs_array);
+	}
+	PHP_HTTP_DO_NEGOTIATE(encoding, supported, rs_array);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateContentType, 0, 0, 1)
@@ -895,45 +885,43 @@ static PHP_METHOD(HttpEnv, negotiateContentType)
 	HashTable *supported;
 	zval *rs_array = NULL;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
-		if (rs_array) {
-			zval_dtor(rs_array);
-			array_init(rs_array);
-		}
-		PHP_HTTP_DO_NEGOTIATE(content_type, supported, rs_array);
-	} else {
-		RETURN_FALSE;
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
+		return;
+	}
+	if (rs_array) {
+		zval_dtor(rs_array);
+		array_init(rs_array);
 	}
+	PHP_HTTP_DO_NEGOTIATE(content_type, supported, rs_array);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiate, 0, 0, 2)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_INFO(0, params)
 	ZEND_ARG_INFO(0, supported)
 	ZEND_ARG_INFO(0, primary_type_separator)
 	ZEND_ARG_INFO(1, result_array)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpEnv, negotiate)
 {
-	HashTable *supported;
+	HashTable *supported, *rs;
 	zval *rs_array = NULL;
 	char *value_str, *sep_str = NULL;
 	int value_len, sep_len = 0;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sH|s!z", &value_str, &value_len, &supported, &sep_str, &sep_len, &rs_array)) {
-		HashTable *rs;
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sH|s!z", &value_str, &value_len, &supported, &sep_str, &sep_len, &rs_array)) {
+		return;
+	}
 
-		if (rs_array) {
-			zval_dtor(rs_array);
-			array_init(rs_array);
-		}
 
-		if ((rs = php_http_negotiate(value_str, value_len, supported, sep_str, sep_len TSRMLS_CC))) {
-			PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array);
-		} else {
-			PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array);
-		}
+	if (rs_array) {
+		zval_dtor(rs_array);
+		array_init(rs_array);
+	}
+
+	if ((rs = php_http_negotiate(value_str, value_len, supported, sep_str, sep_len TSRMLS_CC))) {
+		PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array);
 	} else {
-		RETURN_FALSE;
+		PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array);
 	}
 }
 
@@ -968,26 +956,29 @@ 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 TSRMLS_CC);
+	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;
 #endif
 
 	if (json_len) {
-		zval_dtor(zarg);
-		ZVAL_NULL(zarg);
-		php_json_decode(zarg, json_str, json_len, 1, PG(max_input_nesting_level) TSRMLS_CC);
+		zval zjson;
+
+		INIT_ZVAL(zjson);
+		php_json_decode(&zjson, json_str, json_len, 1, PG(max_input_nesting_level) TSRMLS_CC);
+		if (Z_TYPE(zjson) != IS_NULL) {
+			zval_dtor(zarg);
+			ZVAL_COPY_VALUE(zarg, (&zjson));
+		}
 	}
 #if PHP_VERSION_ID >= 50600
-	STR_FREE(json_str);
+	PTR_FREE(json_str);
 #endif
-
-	/* always let $_POST be array() */
-	if (Z_TYPE_P(zarg) == IS_NULL) {
-		array_init(zarg);
-	}
 }
 
 static void php_http_env_register_json_handler(TSRMLS_D)
@@ -1014,7 +1005,7 @@ PHP_MINIT_FUNCTION(http_env)
 	zend_class_entry ce = {0};
 
 	INIT_NS_CLASS_ENTRY(ce, "http", "Env", php_http_env_methods);
-	php_http_env_class_entry = zend_register_internal_class_ex(&ce, php_http_object_class_entry, NULL TSRMLS_CC);
+	php_http_env_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
 
 #ifdef PHP_HTTP_HAVE_JSON
 	php_http_env_register_json_handler(TSRMLS_C);