X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.c;h=7a68f8a2c50166719eb979638507fbb3fa08ae53;hp=c8c3d2c974f845e37fbf93c822d9356350298a8c;hb=9886ab46dbb299c9d6cfef9d8a0258d91b90a8e6;hpb=b4920d7ad19ae6704e10cb29fca652b47e1bc61f

diff --git a/php_http_env.c b/php_http_env.c
index c8c3d2c..7a68f8a 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-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -229,36 +229,37 @@ PHP_HTTP_API zval *php_http_env_get_server_var(const char *key, size_t key_len,
 PHP_HTTP_API php_http_message_body_t *php_http_env_get_request_body(TSRMLS_D)
 {
 	if (!PHP_HTTP_G->env.request.body) {
-		php_stream *s = NULL;
-
+		php_stream *s = php_stream_temp_new();
+#if PHP_VERSION_ID >= 50600
+		php_stream *input = php_stream_open_wrapper("php://input", "r", 0, NULL);
+
+		/* php://input does not support stat */
+		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) {
-			if ((s = php_stream_temp_new())) {
-				/* php://input does not support seek() */
-				if (SG(request_info).raw_post_data) {
-					php_stream_write(s, SG(request_info).raw_post_data, SG(request_info).raw_post_data_length);
-				} else {
-					php_stream_write(s, SG(request_info).post_data, SG(request_info).post_data_length);
-				}
-				php_stream_rewind(s);
+			/* php://input does not support seek() in PHP <= 5.5 */
+			if (SG(request_info).raw_post_data) {
+				php_stream_write(s, SG(request_info).raw_post_data, SG(request_info).raw_post_data_length);
+			} else {
+				php_stream_write(s, SG(request_info).post_data, SG(request_info).post_data_length);
 			}
 		} else if (sapi_module.read_post && !SG(read_post_bytes)) {
-			if ((s = php_stream_temp_new())) {
-				char *buf = emalloc(4096);
-				int len;
+			char *buf = emalloc(4096);
+			int len;
 
-				while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
-					SG(read_post_bytes) += len;
-					php_stream_write(s, buf, len);
+			while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
+				SG(read_post_bytes) += len;
+				php_stream_write(s, buf, len);
 
-					if (len < 4096) {
-						break;
-					}
+				if (len < 4096) {
+					break;
 				}
-				efree(buf);
-
-				php_stream_rewind(s);
 			}
+			efree(buf);
 		}
+#endif
+		php_stream_rewind(s);
 		PHP_HTTP_G->env.request.body = php_http_message_body_init(NULL, s TSRMLS_CC);
 	}
 
@@ -581,7 +582,6 @@ PHP_HTTP_API STATUS php_http_env_set_response_header_value(long http_code, const
 	}
 }
 
-
 static PHP_HTTP_STRLIST(php_http_env_response_status) =
 	PHP_HTTP_STRLIST_ITEM("Continue")
 	PHP_HTTP_STRLIST_ITEM("Switching Protocols")
@@ -678,164 +678,72 @@ PHP_HTTP_API const char *php_http_env_get_response_status_for_code(unsigned code
 	return php_http_strlist_find(php_http_env_response_status, 100, code);
 }
 
-
-#define PHP_HTTP_BEGIN_ARGS(method, req_args) 	PHP_HTTP_BEGIN_ARGS_EX(HttpEnv, method, 0, req_args)
-#define PHP_HTTP_EMPTY_ARGS(method)				PHP_HTTP_EMPTY_ARGS_EX(HttpEnv, method, 0)
-#define PHP_HTTP_ENV_ME(method)					PHP_ME(HttpEnv, method, PHP_HTTP_ARGS(HttpEnv, method), ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-
-PHP_HTTP_BEGIN_ARGS(getRequestHeader, 0)
-	PHP_HTTP_ARG_VAL(header_name, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(getRequestBody, 0)
-	PHP_HTTP_ARG_VAL(body_class_name, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(getResponseStatusForCode, 1)
-	PHP_HTTP_ARG_VAL(code, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(getResponseStatusForAllCodes);
-
-PHP_HTTP_BEGIN_ARGS(getResponseHeader, 0)
-	PHP_HTTP_ARG_VAL(header_name, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(getResponseCode);
-
-PHP_HTTP_BEGIN_ARGS(setResponseHeader, 1)
-	PHP_HTTP_ARG_VAL(header_name, 0)
-	PHP_HTTP_ARG_VAL(header_value, 0)
-	PHP_HTTP_ARG_VAL(response_code, 0)
-	PHP_HTTP_ARG_VAL(replace_header, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(setResponseCode, 1)
-	PHP_HTTP_ARG_VAL(code, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(negotiateLanguage, 1)
-	PHP_HTTP_ARG_VAL(supported, 0)
-	PHP_HTTP_ARG_VAL(result_array, 1)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(negotiateContentType, 1)
-	PHP_HTTP_ARG_VAL(supported, 0)
-	PHP_HTTP_ARG_VAL(result_array, 1)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(negotiateCharset, 1)
-	PHP_HTTP_ARG_VAL(supported, 0)
-	PHP_HTTP_ARG_VAL(result_array, 1)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(negotiateEncoding, 1)
-	PHP_HTTP_ARG_VAL(supported, 0)
-	PHP_HTTP_ARG_VAL(result_array, 1)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(negotiate, 2)
-	PHP_HTTP_ARG_VAL(value, 0)
-	PHP_HTTP_ARG_VAL(supported, 0)
-	PHP_HTTP_ARG_VAL(primary_type_separator, 0)
-	PHP_HTTP_ARG_VAL(result_array, 1)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(statPersistentHandles);
-
-PHP_HTTP_BEGIN_ARGS(cleanPersistentHandles, 0)
-	PHP_HTTP_ARG_VAL(name, 0)
-	PHP_HTTP_ARG_VAL(ident, 0)
-PHP_HTTP_END_ARGS;
-
-static zend_class_entry *php_http_env_class_entry;
-
-zend_class_entry *php_http_env_get_class_entry(void)
-{
-	return php_http_env_class_entry;
-}
-
-static zend_function_entry php_http_env_method_entry[] = {
-	PHP_HTTP_ENV_ME(getRequestHeader)
-	PHP_HTTP_ENV_ME(getRequestBody)
-
-	PHP_HTTP_ENV_ME(getResponseStatusForCode)
-	PHP_HTTP_ENV_ME(getResponseStatusForAllCodes)
-
-	PHP_HTTP_ENV_ME(getResponseHeader)
-	PHP_HTTP_ENV_ME(getResponseCode)
-	PHP_HTTP_ENV_ME(setResponseHeader)
-	PHP_HTTP_ENV_ME(setResponseCode)
-
-	PHP_HTTP_ENV_ME(negotiateLanguage)
-	PHP_HTTP_ENV_ME(negotiateContentType)
-	PHP_HTTP_ENV_ME(negotiateEncoding)
-	PHP_HTTP_ENV_ME(negotiateCharset)
-	PHP_HTTP_ENV_ME(negotiate)
-
-	PHP_HTTP_ENV_ME(statPersistentHandles)
-	PHP_HTTP_ENV_ME(cleanPersistentHandles)
-
-	EMPTY_FUNCTION_ENTRY
-};
-
-PHP_METHOD(HttpEnv, getRequestHeader)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getRequestHeader, 0, 0, 0)
+	ZEND_ARG_INFO(0, header_name)
+ZEND_END_ARG_INFO();
+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;
 }
 
-PHP_METHOD(HttpEnv, getRequestBody)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getRequestBody, 0, 0, 0)
+	ZEND_ARG_INFO(0, body_class_name)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnv, getRequestBody)
 {
-	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
-		zend_class_entry *class_entry = php_http_message_body_get_class_entry();
+	with_error_handling(EH_THROW, php_http_exception_class_entry) {
+		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);
 
-			if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_body_object_new_ex, php_http_message_body_get_class_entry(), php_http_message_body_init(&body, NULL TSRMLS_CC), NULL TSRMLS_CC)) {
+			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();
 }
 
-PHP_METHOD(HttpEnv, getResponseStatusForCode)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseStatusForCode, 0, 0, 1)
+	ZEND_ARG_INFO(0, code)
+ZEND_END_ARG_INFO();
+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);
 }
 
-PHP_METHOD(HttpEnv, getResponseStatusForAllCodes)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseStatusForAllCodes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnv, getResponseStatusForAllCodes)
 {
 	const char *s;
 	unsigned c;
 	php_http_strlist_iterator_t i;
 
 	if (SUCCESS != zend_parse_parameters_none()) {
-		RETURN_FALSE;
+		return;
 	}
 
 	array_init(return_value);
@@ -847,37 +755,46 @@ PHP_METHOD(HttpEnv, getResponseStatusForAllCodes)
 	}
 }
 
-PHP_METHOD(HttpEnv, getResponseHeader)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseHeader, 0, 0, 0)
+	ZEND_ARG_INFO(0, header_name)
+ZEND_END_ARG_INFO();
+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;
 }
 
-PHP_METHOD(HttpEnv, getResponseCode)
+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));
 }
 
-PHP_METHOD(HttpEnv, setResponseHeader)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_setResponseHeader, 0, 0, 1)
+	ZEND_ARG_INFO(0, header_name)
+	ZEND_ARG_INFO(0, header_value)
+	ZEND_ARG_INFO(0, response_code)
+	ZEND_ARG_INFO(0, replace_header)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnv, setResponseHeader)
 {
 	char *header_name_str;
 	int header_name_len;
@@ -885,155 +802,187 @@ 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_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));
 }
 
-PHP_METHOD(HttpEnv, setResponseCode)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_setResponseCode, 0, 0, 1)
+	ZEND_ARG_INFO(0, code)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnv, setResponseCode)
 {
 	long code;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
-		RETURN_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));
 }
 
-PHP_METHOD(HttpEnv, negotiateLanguage)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateLanguage, 0, 0, 1)
+	ZEND_ARG_INFO(0, supported)
+	ZEND_ARG_INFO(1, result_array)
+ZEND_END_ARG_INFO();
+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);
 }
 
-PHP_METHOD(HttpEnv, negotiateCharset)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateCharset, 0, 0, 1)
+	ZEND_ARG_INFO(0, supported)
+	ZEND_ARG_INFO(1, result_array)
+ZEND_END_ARG_INFO();
+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);
 }
 
-PHP_METHOD(HttpEnv, negotiateEncoding)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateEncoding, 0, 0, 1)
+	ZEND_ARG_INFO(0, supported)
+	ZEND_ARG_INFO(1, result_array)
+ZEND_END_ARG_INFO();
+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);
 }
 
-PHP_METHOD(HttpEnv, negotiateContentType)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateContentType, 0, 0, 1)
+	ZEND_ARG_INFO(0, supported)
+	ZEND_ARG_INFO(1, result_array)
+ZEND_END_ARG_INFO();
+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);
 }
 
-PHP_METHOD(HttpEnv, negotiate)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiate, 0, 0, 2)
+	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);
-		}
-	} else {
-		RETURN_FALSE;
+	if (rs_array) {
+		zval_dtor(rs_array);
+		array_init(rs_array);
 	}
-}
 
-PHP_METHOD(HttpEnv, statPersistentHandles)
-{
-	if (SUCCESS == zend_parse_parameters_none()) {
-		object_init(return_value);
-		if (php_http_persistent_handle_statall(HASH_OF(return_value) TSRMLS_CC)) {
-			return;
-		}
-		zval_dtor(return_value);
+	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);
 	}
-	RETURN_FALSE;
 }
 
-PHP_METHOD(HttpEnv, cleanPersistentHandles)
-{
-	char *name_str = NULL, *ident_str = NULL;
-	int name_len = 0, ident_len = 0;
+static zend_function_entry php_http_env_methods[] = {
+	PHP_ME(HttpEnv, getRequestHeader,              ai_HttpEnv_getRequestHeader,              ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(HttpEnv, getRequestBody,                ai_HttpEnv_getRequestBody,                ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!", &name_str, &name_len, &ident_str, &ident_len)) {
-		php_http_persistent_handle_cleanup(name_str, name_len, ident_str, ident_len TSRMLS_CC);
-	}
-}
+	PHP_ME(HttpEnv, getResponseStatusForCode,      ai_HttpEnv_getResponseStatusForCode,      ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(HttpEnv, getResponseStatusForAllCodes,  ai_HttpEnv_getResponseStatusForAllCodes,  ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+
+	PHP_ME(HttpEnv, getResponseHeader,             ai_HttpEnv_getResponseHeader,             ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(HttpEnv, getResponseCode,               ai_HttpEnv_getResponseCode,               ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(HttpEnv, setResponseHeader,             ai_HttpEnv_setResponseHeader,             ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(HttpEnv, setResponseCode,               ai_HttpEnv_setResponseCode,               ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+
+	PHP_ME(HttpEnv, negotiateLanguage,             ai_HttpEnv_negotiateLanguage,             ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(HttpEnv, negotiateContentType,          ai_HttpEnv_negotiateContentType,          ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(HttpEnv, negotiateEncoding,             ai_HttpEnv_negotiateEncoding,             ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(HttpEnv, negotiateCharset,              ai_HttpEnv_negotiateCharset,              ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(HttpEnv, negotiate,                     ai_HttpEnv_negotiate,                     ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+
+	EMPTY_FUNCTION_ENTRY
+};
 
 #ifdef PHP_HTTP_HAVE_JSON
 #include "ext/json/php_json.h"
 
 static SAPI_POST_HANDLER_FUNC(php_http_json_post_handler)
 {
-	if (SG(request_info).raw_post_data) {
-		zval *zarg = arg;
+	zval *zarg = arg;
+	char *json_str = NULL;
+	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);
+#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, SG(request_info).raw_post_data, SG(request_info).raw_post_data_length, 1, PG(max_input_nesting_level) TSRMLS_CC);
-		if (Z_TYPE_P(zarg) == IS_NULL) {
-			array_init(zarg);
-		}
+		php_json_decode(zarg, json_str, json_len, 1, PG(max_input_nesting_level) TSRMLS_CC);
 	}
-}
-
+#if PHP_VERSION_ID >= 50600
+	STR_FREE(json_str);
 #endif
 
-PHP_MINIT_FUNCTION(http_env)
+	/* 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)
 {
-#ifdef PHP_HTTP_HAVE_JSON
 	sapi_post_entry entry = {NULL, 0, NULL, NULL};
 
 	entry.post_reader = sapi_read_standard_form_data;
@@ -1046,9 +995,21 @@ PHP_MINIT_FUNCTION(http_env)
 	entry.content_type = "application/json";
 	entry.content_type_len = lenof("application/json");
 	sapi_register_post_entry(&entry TSRMLS_CC);
+}
 #endif
 
-	PHP_HTTP_REGISTER_CLASS(http, Env, http_env, NULL, 0);
+zend_class_entry *php_http_env_class_entry;
+
+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);
+
+#ifdef PHP_HTTP_HAVE_JSON
+	php_http_env_register_json_handler(TSRMLS_C);
+#endif
 
 	return SUCCESS;
 }