X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.c;h=df22d5a7134a29eceb4f43ca107a9d943a9203da;hp=d2fe620a75a6336e544fe8e0d4eb63ee8c431ea9;hb=8000eca9bbf2cebb98a2dfd982d54e93aaa6a58f;hpb=3aee7891076f2ced989ab589df41c4a1a070670d

diff --git a/php_http_env.c b/php_http_env.c
index d2fe620..df22d5a 100644
--- a/php_http_env.c
+++ b/php_http_env.c
@@ -4,20 +4,15 @@
     +--------------------------------------------------------------------+
     | Redistribution and use in source and binary forms, with or without |
     | modification, are permitted provided that the conditions mentioned |
-    | in the accomp395anying LICENSE file are met.                          |
+    | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 #include "php_http_api.h"
+#include "php_variables.h"
 
-PHP_RINIT_FUNCTION(http_env)
-{
-	PHP_HTTP_G->env.request.time = sapi_get_request_time(TSRMLS_C);
-
-	return SUCCESS;
-}
 
 PHP_RSHUTDOWN_FUNCTION(http_env)
 {
@@ -31,61 +26,72 @@ PHP_RSHUTDOWN_FUNCTION(http_env)
 	}
 
 	if (PHP_HTTP_G->env.server_var) {
-		zval_ptr_dtor(&PHP_HTTP_G->env.server_var);
+		zval_ptr_dtor(PHP_HTTP_G->env.server_var);
 		PHP_HTTP_G->env.server_var = NULL;
 	}
 
 	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)
 {
-	php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
-	zval **hsv, **header;
-	HashPosition pos;
+	php_http_arrkey_t key;
+	zval *hsv, *header;
 
 	if (!PHP_HTTP_G->env.request.headers) {
 		ALLOC_HASHTABLE(PHP_HTTP_G->env.request.headers);
-		zend_hash_init(PHP_HTTP_G->env.request.headers, 0, NULL, ZVAL_PTR_DTOR, 0);
+		ZEND_INIT_SYMTABLE(PHP_HTTP_G->env.request.headers);
 
-		zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
+		if ((hsv = php_http_env_get_superglobal(ZEND_STRL("_SERVER")))) {
+			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(hsv), key.h, key.key, header)
+			{
+				if (key.key && key.key->len > 5 && *key.key->val == 'H' && !strncmp(key.key->val, "HTTP_", 5)) {
+					size_t key_len = key.key->len - 5;
+					char *key_str = php_http_pretty_key(estrndup(&key.key->val[5], key_len), key_len, 1, 1);
 
-		if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv) && Z_TYPE_PP(hsv) == IS_ARRAY) {
-			FOREACH_KEY(pos, *hsv, key) {
-				if (key.type == HASH_KEY_IS_STRING && key.len > 6 && !strncmp(key.str, "HTTP_", 5)) {
-					key.len -= 5;
-					key.str = php_http_pretty_key(estrndup(key.str + 5, key.len - 1), key.len - 1, 1, 1);
+					Z_TRY_ADDREF_P(header);
+					zend_symtable_str_update(PHP_HTTP_G->env.request.headers, key_str, key_len, header);
 
-					zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos);
-					Z_ADDREF_P(*header);
-					zend_symtable_update(PHP_HTTP_G->env.request.headers, key.str, key.len, (void *) header, sizeof(zval *), NULL);
+					efree(key_str);
+				} else if (key.key && key.key->len > 8 && *key.key->val == 'C' && !strncmp(key.key->val, "CONTENT_", 8)) {
+					char *key_str = php_http_pretty_key(estrndup(key.key->val, key.key->len), key.key->len, 1, 1);
 
-					efree(key.str);
+					Z_TRY_ADDREF_P(header);
+					zend_symtable_str_update(PHP_HTTP_G->env.request.headers, key_str, key.key->len, header);
+
+					efree(key_str);
 				}
 			}
+			ZEND_HASH_FOREACH_END();
 		}
 	}
 
 	if (headers) {
-		zend_hash_copy(headers, PHP_HTTP_G->env.request.headers, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+		array_copy(PHP_HTTP_G->env.request.headers, headers);
 	}
 }
 
-PHP_HTTP_API char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *len 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)
 {
-	zval **zvalue;
+	HashTable *request_headers;
+	zval *zvalue = NULL;
 	char *val = NULL, *key = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
 
-	php_http_env_get_request_headers(NULL TSRMLS_CC);
+	if (request) {
+		request_headers = &request->hdrs;
+	} else {
+		php_http_env_get_request_headers(NULL);
+		request_headers = PHP_HTTP_G->env.request.headers;
+	}
 
-	if (SUCCESS == zend_symtable_find(PHP_HTTP_G->env.request.headers, key, name_len + 1, (void *) &zvalue)) {
-		zval *zcopy = php_http_ztyp(IS_STRING, *zvalue);
+	if ((zvalue = zend_symtable_str_find(request_headers, key, name_len))) {
+		zend_string *zs = zval_get_string(zvalue);
 
-		val = estrndup(Z_STRVAL_P(zcopy), Z_STRLEN_P(zcopy));
+		val = estrndup(zs->val, zs->len);
 		if (len) {
-			*len = Z_STRLEN_P(zcopy);
+			*len = zs->len;
 		}
-		zval_ptr_dtor(&zcopy);
+		zend_string_release(zs);
 	}
 
 	efree(key);
@@ -93,39 +99,49 @@ 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 TSRMLS_DC)
+zend_bool php_http_env_got_request_header(const char *name_str, size_t name_len, php_http_message_t *request)
 {
+	HashTable *request_headers;
 	char *key = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
-	int got;
+	zend_bool got;
 
-	php_http_env_get_request_headers(NULL TSRMLS_CC);
-	got = zend_symtable_exists(PHP_HTTP_G->env.request.headers, key, name_len + 1);
+	if (request) {
+		request_headers = &request->hdrs;
+	} else {
+		php_http_env_get_request_headers(NULL);
+		request_headers = PHP_HTTP_G->env.request.headers;
+	}
+	got = zend_symtable_str_exists(request_headers, key, name_len);
 	efree(key);
 
 	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)
 {
-	zval **hsv;
+	zval *hsv;
+	zend_string *key_str = zend_string_init(key, key_len, 0);
 
-	zend_is_auto_global(key, key_len TSRMLS_CC);
+	zend_is_auto_global(key_str);
+	hsv = zend_hash_find(&EG(symbol_table), key_str);
+	zend_string_release(key_str);
 
-	if ((SUCCESS != zend_hash_find(&EG(symbol_table), key, key_len + 1, (void *) &hsv)) || (Z_TYPE_PP(hsv) != IS_ARRAY)) {
+	if (Z_TYPE_P(hsv) != IS_ARRAY) {
 		return NULL;
 	}
 
-	return *hsv;
+	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)
 {
-	zval *hsv, **var;
-	char *env;
+	zval *hsv, *var;
 
-	/* if available, this is a lot faster than accessing $_SERVER */
+	/* if available, this is a lot faster than accessing $_SERVER * /
 	if (sapi_module.getenv) {
-		if ((!(env = sapi_module.getenv((char *) key, key_len TSRMLS_CC))) || (check && !*env)) {
+		char *env;
+
+		if ((!(env = sapi_module.getenv((char *) key, key_len))) || (check && !*env)) {
 			return NULL;
 		}
 		if (PHP_HTTP_G->env.server_var) {
@@ -135,69 +151,61 @@ PHP_HTTP_API zval *php_http_env_get_server_var(const char *key, size_t key_len,
 		ZVAL_STRING(PHP_HTTP_G->env.server_var, env, 1);
 		return PHP_HTTP_G->env.server_var;
 	}
+	/ * */
 
-	if (!(hsv = php_http_env_get_superglobal(ZEND_STRL("_SERVER") TSRMLS_CC))) {
+	if (!(hsv = php_http_env_get_superglobal(ZEND_STRL("_SERVER")))) {
 		return NULL;
 	}
-	if ((SUCCESS != zend_symtable_find(Z_ARRVAL_P(hsv), key, key_len + 1, (void *) &var))) {
+	if (!(var = zend_symtable_str_find(Z_ARRVAL_P(hsv), key, key_len))) {
 		return NULL;
 	}
-	if (check && !((Z_TYPE_PP(var) == IS_STRING) && Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {
+	if (check && !((Z_TYPE_P(var) == IS_STRING) && Z_STRVAL_P(var) && Z_STRLEN_P(var))) {
 		return NULL;
 	}
-	return *var;
+	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(void)
 {
 	if (!PHP_HTTP_G->env.request.body) {
-		php_stream *s = NULL;
+		php_stream *s = php_stream_temp_new();
+		php_stream *input = php_stream_open_wrapper("php://input", "r", 0, NULL);
 
-		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);
-			}
-		} else if (sapi_module.read_post && !SG(read_post_bytes)) {
-			if ((s = php_stream_temp_new())) {
-				char *buf = emalloc(4096);
-				int len;
+		/* php://input does not support stat */
+		php_stream_copy_to_stream_ex(input, s, -1, NULL);
+		php_stream_close(input);
+
+		php_stream_rewind(s);
+		PHP_HTTP_G->env.request.body = php_http_message_body_init(NULL, s);
+	}
 
-				while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
-					SG(read_post_bytes) += len;
-					php_stream_write(s, buf, len);
+	return PHP_HTTP_G->env.request.body;
+}
 
-					if (len < 4096) {
-						break;
-					}
-				}
-				efree(buf);
+const char *php_http_env_get_request_method(php_http_message_t *request)
+{
+	const char *m;
 
-				php_stream_rewind(s);
-			}
-		}
-		PHP_HTTP_G->env.request.body = php_http_message_body_init(NULL, s TSRMLS_CC);
+	if (PHP_HTTP_MESSAGE_TYPE(REQUEST, request)) {
+		m = request->http.info.request.method;
+	} else {
+		m = SG(request_info).request_method;
 	}
 
-	return PHP_HTTP_G->env.request.body;
+	return m ? m : "GET";
 }
 
-PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t length TSRMLS_DC)
+php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t length, php_http_message_t *request)
 {
-	zval *zentry;
+	zval zentry;
 	char *range, *rp, c;
 	long begin = -1, end = -1, *ptr;
 
-	if (!(range = php_http_env_get_request_header(ZEND_STRL("Range"), NULL TSRMLS_CC))) {
+	if (!(range = php_http_env_get_request_header(ZEND_STRL("Range"), NULL, request))) {
 		return PHP_HTTP_RANGE_NO;
 	}
 	if (strncmp(range, "bytes=", lenof("bytes="))) {
-		STR_FREE(range);
+		PTR_FREE(range);
 		return PHP_HTTP_RANGE_NO;
 	}
 
@@ -253,7 +261,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" */
@@ -274,7 +282,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;
@@ -284,13 +292,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-" */
@@ -303,7 +311,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;
@@ -312,11 +320,10 @@ PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *
 					}
 				}
 
-				MAKE_STD_ZVAL(zentry);
-				array_init(zentry);
-				add_index_long(zentry, 0, begin);
-				add_index_long(zentry, 1, end);
-				zend_hash_next_index_insert(ranges, &zentry, sizeof(zval *), NULL);
+				array_init(&zentry);
+				add_index_long(&zentry, 0, begin);
+				add_index_long(&zentry, 1, end);
+				zend_hash_next_index_insert(ranges, &zentry);
 
 				begin = -1;
 				end = -1;
@@ -325,527 +332,477 @@ 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;
 }
 
-static void grab_headers(void *data, void *arg TSRMLS_DC)
+static void grab_headers(void *data, void *arg)
 {
 	php_http_buffer_appendl(PHP_HTTP_BUFFER(arg), ((sapi_header_struct *)data)->header);
 	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)
+static void grab_header(void *data, void *arg)
+{
+	struct {
+		char *name_str;
+		size_t name_len;
+		char *value_ptr;
+	} *args = arg;
+	sapi_header_struct *header = data;
+
+	if (	header->header_len > args->name_len
+	&& header->header[args->name_len] == ':'
+	&& !strncmp(header->header, args->name_str, args->name_len)
+	) {
+		args->value_ptr = &header->header[args->name_len + 1];
+		while (PHP_HTTP_IS_CTYPE(space, *args->value_ptr)) {
+			++args->value_ptr;
+		}
+	}
+}
+
+ZEND_RESULT_CODE php_http_env_get_response_headers(HashTable *headers_ht)
 {
-	STATUS status;
+	ZEND_RESULT_CODE status;
 	php_http_buffer_t headers;
 
 	php_http_buffer_init(&headers);
-	zend_llist_apply_with_argument(&SG(sapi_headers).headers, grab_headers, &headers TSRMLS_CC);
+	zend_llist_apply_with_argument(&SG(sapi_headers).headers, grab_headers, &headers);
 	php_http_buffer_fix(&headers);
 
-	status = php_http_headers_parse(PHP_HTTP_BUFFER_VAL(&headers), PHP_HTTP_BUFFER_LEN(&headers), headers_ht, NULL, NULL TSRMLS_CC);
+	status = php_http_header_parse(headers.data, headers.used, headers_ht, NULL, NULL);
 	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)
 {
-	char *val = NULL;
-	HashTable headers;
-
-	zend_hash_init(&headers, 0, NULL, NULL, 0);
-	if (SUCCESS == php_http_env_get_response_headers(&headers TSRMLS_CC)) {
-		zval **zvalue;
-		char *key = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
-
-		if (SUCCESS == zend_symtable_find(&headers, key, name_len + 1, (void *) &zvalue)) {
-			zval *zcopy = php_http_ztyp(IS_STRING, *zvalue);
+	struct {
+		char *name_str;
+		size_t name_len;
+		char *value_ptr;
+	} args;
 
-			val = estrndup(Z_STRVAL_P(zcopy), Z_STRLEN_P(zcopy));
-			zval_ptr_dtor(&zcopy);
-		}
-
-		efree(key);
-	}
-	zend_hash_destroy(&headers);
+	args.name_str = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
+	args.name_len = name_len;
+	args.value_ptr = NULL;
+	zend_llist_apply_with_argument(&SG(sapi_headers).headers, grab_header, &args);
+	efree(args.name_str);
 
-	return val;
+	return args.value_ptr ? estrdup(args.value_ptr) : NULL;
 }
 
-PHP_HTTP_API long php_http_env_get_response_code(TSRMLS_D)
+long php_http_env_get_response_code(void)
 {
 	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)
+ZEND_RESULT_CODE php_http_env_set_response_code(long http_code)
 {
-	return sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) http_code TSRMLS_CC);
+	return sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) (zend_intptr_t) http_code);
 }
 
-PHP_HTTP_API STATUS php_http_env_set_response_status_line(long code, php_http_version_t *v TSRMLS_DC)
+ZEND_RESULT_CODE php_http_env_set_response_status_line(long code, php_http_version_t *v)
 {
 	sapi_header_line h = {NULL, 0, 0};
-	STATUS ret;
+	ZEND_RESULT_CODE ret;
 
 	h.line_len = spprintf(&h.line, 0, "HTTP/%u.%u %ld %s", v->major, v->minor, code, php_http_env_get_response_status_for_code(code));
-	ret = sapi_header_op(SAPI_HEADER_REPLACE, (void *) &h TSRMLS_CC);
+	ret = sapi_header_op(SAPI_HEADER_REPLACE, (void *) &h);
 	efree(h.line);
 
 	return ret;
 }
 
-PHP_HTTP_API STATUS php_http_env_set_response_protocol_version(php_http_version_t *v TSRMLS_DC)
+ZEND_RESULT_CODE php_http_env_set_response_protocol_version(php_http_version_t *v)
 {
-	return php_http_env_set_response_status_line(php_http_env_get_response_code(TSRMLS_C), v TSRMLS_CC);
+	return php_http_env_set_response_status_line(php_http_env_get_response_code(), v);
 }
 
-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)
+ZEND_RESULT_CODE php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace)
 {
 	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);
+	ZEND_RESULT_CODE ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h);
+
 	efree(h.line);
 	return ret;
 }
 
-PHP_HTTP_API STATUS php_http_env_set_response_header_format(long http_code, zend_bool replace TSRMLS_DC, const char *fmt, ...)
+ZEND_RESULT_CODE php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv)
 {
-	va_list args;
-	STATUS ret = FAILURE;
+	ZEND_RESULT_CODE ret = FAILURE;
 	sapi_header_line h = {NULL, 0, http_code};
 
-	va_start(args, fmt);
-	h.line_len = vspprintf(&h.line, 0, fmt, args);
-	va_end(args);
+	h.line_len = vspprintf(&h.line, 0, fmt, argv);
 
 	if (h.line) {
 		if (h.line_len) {
-			ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC);
+			ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h);
 		}
 		efree(h.line);
 	}
 	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)
+ZEND_RESULT_CODE php_http_env_set_response_header_format(long http_code, zend_bool replace, const char *fmt, ...)
+{
+	ZEND_RESULT_CODE ret;
+	va_list args;
+
+	va_start(args, fmt);
+	ret = php_http_env_set_response_header_va(http_code, replace, fmt, args);
+	va_end(args);
+
+	return ret;
+}
+
+ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace)
 {
 	if (!value) {
 		sapi_header_line h = {(char *) name_str, name_len, http_code};
 
-		return sapi_header_op(SAPI_HEADER_DELETE, (void *) &h TSRMLS_CC);
+		return sapi_header_op(SAPI_HEADER_DELETE, (void *) &h);
 	}
 
-	if(Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) {
-		HashPosition pos;
+	if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) {
 		int first = replace;
-		zval **data_ptr;
+		zval *data_ptr;
+		HashTable *ht = HASH_OF(value);
 
-		FOREACH_HASH_VAL(pos, HASH_OF(value), data_ptr) {
-			if (SUCCESS != php_http_env_set_response_header_value(http_code, name_str, name_len, *data_ptr, first TSRMLS_CC)) {
+		ZEND_HASH_FOREACH_VAL_IND(ht, data_ptr)
+		{
+			if (SUCCESS != php_http_env_set_response_header_value(http_code, name_str, name_len, data_ptr, first)) {
 				return FAILURE;
 			}
 			first = 0;
 		}
+		ZEND_HASH_FOREACH_END();
 
 		return SUCCESS;
 	} else {
-		zval *data = php_http_ztyp(IS_STRING, value);
+		zend_string *data = zval_get_string(value);
 
-		if (!Z_STRLEN_P(data)) {
-			zval_ptr_dtor(&data);
-			return php_http_env_set_response_header_value(http_code, name_str, name_len, NULL, replace TSRMLS_CC);
+		if (!data->len) {
+			zend_string_release(data);
+			return php_http_env_set_response_header_value(http_code, name_str, name_len, NULL, replace);
 		} else {
 			sapi_header_line h;
-			STATUS ret;
+			ZEND_RESULT_CODE ret;
 
 			if (name_len > INT_MAX) {
-				name_len = INT_MAX;
+				return FAILURE;
 			}
 			h.response_code = http_code;
-			h.line_len = spprintf(&h.line, 0, "%.*s: %.*s", (int) name_len, name_str, Z_STRLEN_P(data), Z_STRVAL_P(data));
+			h.line_len = spprintf(&h.line, 0, "%.*s: %.*s", (int) name_len, name_str, data->len, data->val);
 
-			ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC);
+			ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h);
 
-			zval_ptr_dtor(&data);
-			STR_FREE(h.line);
+			zend_string_release(data);
+			PTR_FREE(h.line);
 
 			return ret;
 		}
 	}
 }
 
-
-static PHP_HTTP_STRLIST(php_http_env_response_status) =
-	PHP_HTTP_STRLIST_ITEM("Continue")
-	PHP_HTTP_STRLIST_ITEM("Switching Protocols")
-	PHP_HTTP_STRLIST_NEXT
-	PHP_HTTP_STRLIST_ITEM("OK")
-	PHP_HTTP_STRLIST_ITEM("Created")
-	PHP_HTTP_STRLIST_ITEM("Accepted")
-	PHP_HTTP_STRLIST_ITEM("Non-Authoritative Information")
-	PHP_HTTP_STRLIST_ITEM("No Content")
-	PHP_HTTP_STRLIST_ITEM("Reset Content")
-	PHP_HTTP_STRLIST_ITEM("Partial Content")
-	PHP_HTTP_STRLIST_NEXT
-	PHP_HTTP_STRLIST_ITEM("Multiple Choices")
-	PHP_HTTP_STRLIST_ITEM("Moved Permanently")
-	PHP_HTTP_STRLIST_ITEM("Found")
-	PHP_HTTP_STRLIST_ITEM("See Other")
-	PHP_HTTP_STRLIST_ITEM("Not Modified")
-	PHP_HTTP_STRLIST_ITEM("Use Proxy")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("Temporary Redirect")
-	PHP_HTTP_STRLIST_NEXT
-	PHP_HTTP_STRLIST_ITEM("Bad Request")
-	PHP_HTTP_STRLIST_ITEM("Unauthorized")
-	PHP_HTTP_STRLIST_ITEM("Payment Required")
-	PHP_HTTP_STRLIST_ITEM("Forbidden")
-	PHP_HTTP_STRLIST_ITEM("Not Found")
-	PHP_HTTP_STRLIST_ITEM("Method Not Allowed")
-	PHP_HTTP_STRLIST_ITEM("Not Acceptable")
-	PHP_HTTP_STRLIST_ITEM("Proxy Authentication Required")
-	PHP_HTTP_STRLIST_ITEM("Request Timeout")
-	PHP_HTTP_STRLIST_ITEM("Conflict")
-	PHP_HTTP_STRLIST_ITEM("Gone")
-	PHP_HTTP_STRLIST_ITEM("Length Required")
-	PHP_HTTP_STRLIST_ITEM("Precondition Failed")
-	PHP_HTTP_STRLIST_ITEM("Request Entity Too Large")
-	PHP_HTTP_STRLIST_ITEM("Request URI Too Long")
-	PHP_HTTP_STRLIST_ITEM("Unsupported Media Type")
-	PHP_HTTP_STRLIST_ITEM("Requested Range Not Satisfiable")
-	PHP_HTTP_STRLIST_ITEM("Expectation Failed")
-	PHP_HTTP_STRLIST_NEXT
-	PHP_HTTP_STRLIST_ITEM("Internal Server Error")
-	PHP_HTTP_STRLIST_ITEM("Not Implemented")
-	PHP_HTTP_STRLIST_ITEM("Bad Gateway")
-	PHP_HTTP_STRLIST_ITEM("Service Unavailable")
-	PHP_HTTP_STRLIST_ITEM("Gateway Timeout")
-	PHP_HTTP_STRLIST_ITEM("HTTP Version Not Supported")
-	PHP_HTTP_STRLIST_STOP
-;
-
-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);
+const char *php_http_env_get_response_status_for_code(unsigned code)
+{
+	switch (code) {
+#define PHP_HTTP_RESPONSE_CODE(c, s) case c: return s;
+#include "php_http_response_codes.h"
+#undef PHP_HTTP_RESPONSE_CODE
+	default:
+		return NULL;
+	}
 }
 
-zend_class_entry *php_http_env_class_entry;
-
-#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_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;
-
-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(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;
+	size_t 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 TSRMLS_CC);
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|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);
 
-			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_STR(php_http_cs2zs(header_value, header_length));
 		}
+	} else {
+		array_init(return_value);
+		php_http_env_get_request_headers(Z_ARRVAL_P(return_value));
 	}
-	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_class_entry) {
-		zend_class_entry *class_entry = php_http_message_body_class_entry;
+	php_http_message_body_t *body;
+	php_http_message_body_object_t *body_obj;
+	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(), "|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_copy(body, NULL, 0), NULL TSRMLS_CC)) {
-				RETURN_OBJVAL(ov, 0);
-			}
-		}
-	} end_error_handling();
+	body = php_http_env_get_request_body();
+	if (SUCCESS == php_http_new((void *) &body_obj, class_entry, (php_http_new_t) php_http_message_body_object_new_ex, php_http_message_body_class_entry, body)) {
+		php_http_message_body_addref(body);
+		RETVAL_OBJ(&body_obj->zo);
+	}
 }
 
-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;
+	zend_long code;
+	const char *status;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "l", &code)) {
+		return;
+	}
+
+	if ((status = php_http_env_get_response_status_for_code(code))) {
+		RETURN_STRING(status);
+	}
+}
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
-		RETURN_STRING(php_http_env_get_response_status_for_code(code), 1);
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseStatusForAllCodes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnv, getResponseStatusForAllCodes)
+{
+	if (SUCCESS != zend_parse_parameters_none()) {
+		return;
 	}
-	RETURN_FALSE;
+
+	array_init(return_value);
+#define PHP_HTTP_RESPONSE_CODE(code, status) add_index_string(return_value, code, status);
+#include "php_http_response_codes.h"
+#undef PHP_HTTP_RESPONSE_CODE
 }
 
-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;
+	size_t 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(), "|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);
 
-			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_STR(php_http_cs2zs(header_value, strlen(header_value)));
 		}
+	} else {
+		array_init(return_value);
+		php_http_env_get_response_headers(Z_ARRVAL_P(return_value));
 	}
-	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());
 }
 
-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;
+	size_t header_name_len;
 	zval *header_value = NULL;
-	long code = 0;
+	zend_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(), "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));
 }
 
-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;
+	zend_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(), "l", &code)) {
+		return;
 	}
-	RETURN_FALSE;
+	RETURN_BOOL(SUCCESS == php_http_env_set_response_code(code));
 }
 
-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(), "H|z", &supported, &rs_array)) {
+		return;
 	}
+	if (rs_array) {
+		ZVAL_DEREF(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(), "H|z", &supported, &rs_array)) {
+		return;
+	}
+	if (rs_array) {
+		ZVAL_DEREF(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(), "H|z", &supported, &rs_array)) {
+		return;
 	}
+	if (rs_array) {
+		ZVAL_DEREF(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(), "H|z", &supported, &rs_array)) {
+		return;
 	}
+	if (rs_array) {
+		ZVAL_DEREF(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;
+	size_t 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(), "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_array) {
+		ZVAL_DEREF(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 = php_http_negotiate(value_str, value_len, supported, sep_str, sep_len))) {
+		PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array);
 	} else {
-		RETURN_FALSE;
+		PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, 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);
-	}
-	RETURN_FALSE;
-}
+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)
 
-PHP_METHOD(HttpEnv, cleanPersistentHandles)
-{
-	char *name_str = NULL, *ident_str = NULL;
-	int name_len = 0, ident_len = 0;
+	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)
 
-	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, 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
+};
+
+zend_class_entry *php_http_env_class_entry;
 
 PHP_MINIT_FUNCTION(http_env)
 {
-	PHP_HTTP_REGISTER_CLASS(http, Env, http_env, NULL, 0);
+	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(&ce);
 
 	return SUCCESS;
 }