X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.c;h=df22d5a7134a29eceb4f43ca107a9d943a9203da;hp=a2c3227ea94127d85a2b6b3dfc3bec3dcc8c8d3d;hb=7a1fef9608be28f02f5a5b07b33065372574d593;hpb=a41703eafb1f1bb7f2968e97d471499c986a471b

diff --git a/php_http_env.c b/php_http_env.c
index a2c3227..df22d5a 100644
--- a/php_http_env.c
+++ b/php_http_env.c
@@ -13,59 +13,6 @@
 #include "php_http_api.h"
 #include "php_variables.h"
 
-PHP_RINIT_FUNCTION(http_env)
-{
-	/* 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);
-		char *ct_str = estrndup(SG(request_info).content_type, ct_len);
-		php_http_params_opts_t opts;
-		HashTable params;
-
-		php_http_params_opts_default_get(&opts);
-		opts.input.str = ct_str;
-		opts.input.len = ct_len;
-
-		SG(request_info).content_type_dup = ct_str;
-
-		ZEND_INIT_SYMTABLE(&params);
-		if (php_http_params_parse(&params, &opts)) {
-			zend_string *key_str;
-			zend_ulong key_num;
-
-			if (HASH_KEY_IS_STRING == zend_hash_get_current_key(&params, &key_str, &key_num)) {
-				sapi_post_entry *post_entry = NULL;
-
-				if ((post_entry = zend_hash_find_ptr(&SG(known_post_content_types), key_str))) {
-					if (post_entry) {
-						SG(request_info).post_entry = post_entry;
-
-						if (post_entry->post_reader) {
-							post_entry->post_reader();
-						}
-					}
-
-					if (sapi_module.default_post_reader) {
-						sapi_module.default_post_reader();
-					}
-
-					sapi_handle_post(&PG(http_globals)[TRACK_VARS_POST]);
-
-					/*
-					 * the rfc1867 handler is an awkward buddy
-					 */
-					Z_TRY_ADDREF(PG(http_globals)[TRACK_VARS_FILES]);
-					zend_hash_str_update(&EG(symbol_table).ht, "_FILES", sizeof("_FILES"), &PG(http_globals)[TRACK_VARS_FILES]);
-				}
-			}
-			zend_hash_destroy(&params);
-		}
-	}
-
-	PTR_SET(SG(request_info).content_type_dup, NULL);
-
-	return SUCCESS;
-}
 
 PHP_RSHUTDOWN_FUNCTION(http_env)
 {
@@ -86,7 +33,7 @@ PHP_RSHUTDOWN_FUNCTION(http_env)
 	return SUCCESS;
 }
 
-void php_http_env_get_request_headers(HashTable *headers TSRMLS_DC)
+void php_http_env_get_request_headers(HashTable *headers)
 {
 	php_http_arrkey_t key;
 	zval *hsv, *header;
@@ -137,7 +84,7 @@ char *php_http_env_get_request_header(const char *name_str, size_t name_len, siz
 		request_headers = PHP_HTTP_G->env.request.headers;
 	}
 
-	if ((zvalue == zend_symtable_str_find(request_headers, key, name_len))) {
+	if ((zvalue = zend_symtable_str_find(request_headers, key, name_len))) {
 		zend_string *zs = zval_get_string(zvalue);
 
 		val = estrndup(zs->val, zs->len);
@@ -176,7 +123,7 @@ zval *php_http_env_get_superglobal(const char *key, size_t key_len)
 	zend_string *key_str = zend_string_init(key, key_len, 0);
 
 	zend_is_auto_global(key_str);
-	hsv = zend_hash_find(&EG(symbol_table).ht, key_str);
+	hsv = zend_hash_find(&EG(symbol_table), key_str);
 	zend_string_release(key_str);
 
 	if (Z_TYPE_P(hsv) != IS_ARRAY) {
@@ -414,6 +361,9 @@ static void grab_header(void *data, void *arg)
 	&& !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;
+		}
 	}
 }
 
@@ -481,6 +431,7 @@ ZEND_RESULT_CODE php_http_env_set_response_header(long http_code, const char *he
 {
 	sapi_header_line h = {estrndup(header_str, header_len), header_len, http_code};
 	ZEND_RESULT_CODE ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h);
+
 	efree(h.line);
 	return ret;
 }
@@ -526,7 +477,7 @@ ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const ch
 		zval *data_ptr;
 		HashTable *ht = HASH_OF(value);
 
-		ZEND_HASH_FOREACH_VAL(ht, data_ptr)
+		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;
@@ -562,100 +513,15 @@ ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const ch
 	}
 }
 
-static PHP_HTTP_STRLIST(php_http_env_response_status) =
-	PHP_HTTP_STRLIST_ITEM("Continue")
-	PHP_HTTP_STRLIST_ITEM("Switching Protocols")
-	PHP_HTTP_STRLIST_ITEM("Processing")
-	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_ITEM("Multi-Status")
-	PHP_HTTP_STRLIST_ITEM("Already Reported")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("IM Used")
-	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_ITEM("Permanent 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_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("Unprocessible Entity")
-	PHP_HTTP_STRLIST_ITEM("Locked")
-	PHP_HTTP_STRLIST_ITEM("Failed Dependency")
-	PHP_HTTP_STRLIST_ITEM("(Reserved)")
-	PHP_HTTP_STRLIST_ITEM("Upgrade Required")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("Precondition Required")
-	PHP_HTTP_STRLIST_ITEM("Too Many Requests")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("Request Header Fields Too Large")
-	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_ITEM("Variant Also Negotiates")
-	PHP_HTTP_STRLIST_ITEM("Insufficient Storage")
-	PHP_HTTP_STRLIST_ITEM("Loop Detected")
-	PHP_HTTP_STRLIST_ITEM("(Unused)")
-	PHP_HTTP_STRLIST_ITEM("Not Extended")
-	PHP_HTTP_STRLIST_ITEM("Network Authentication Required")
-	PHP_HTTP_STRLIST_STOP
-;
-
 const char *php_http_env_get_response_status_for_code(unsigned code)
 {
-	return php_http_strlist_find(php_http_env_response_status, 100, 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_BEGIN_ARG_INFO_EX(ai_HttpEnv_getRequestHeader, 0, 0, 0)
@@ -706,32 +572,29 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpEnv, getResponseStatusForCode)
 {
 	zend_long code;
+	const char *status;
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "l", &code)) {
 		return;
 	}
-	RETURN_STRING(php_http_env_get_response_status_for_code(code));
+
+	if ((status = php_http_env_get_response_status_for_code(code))) {
+		RETURN_STRING(status);
+	}
 }
 
 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;
 	}
 
 	array_init(return_value);
-	for (	php_http_strlist_iterator_init(&i, php_http_env_response_status, 100);
-			*(s = php_http_strlist_iterator_this(&i, &c));
-			php_http_strlist_iterator_next(&i)
-	) {
-		add_index_string(return_value, c, s);
-	}
+#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
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseHeader, 0, 0, 0)
@@ -776,15 +639,15 @@ 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(), "s|z!lb", &header_name_str, &header_name_len, &header_value, &code, &replace_header)) {
 		return;
 	}
-	RETURN_BOOL(SUCCESS == php_http_env_set_response_header_value(code, header_name_str, header_name_len, header_value, replace_header TSRMLS_CC));
+	RETURN_BOOL(SUCCESS == php_http_env_set_response_header_value(code, header_name_str, header_name_len, header_value, replace_header));
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_setResponseCode, 0, 0, 1)
@@ -809,10 +672,11 @@ 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 (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);
 	}
@@ -833,6 +697,7 @@ static PHP_METHOD(HttpEnv, negotiateCharset)
 		return;
 	}
 	if (rs_array) {
+		ZVAL_DEREF(rs_array);
 		zval_dtor(rs_array);
 		array_init(rs_array);
 	}
@@ -852,6 +717,7 @@ static PHP_METHOD(HttpEnv, negotiateEncoding)
 		return;
 	}
 	if (rs_array) {
+		ZVAL_DEREF(rs_array);
 		zval_dtor(rs_array);
 		array_init(rs_array);
 	}
@@ -871,6 +737,7 @@ static PHP_METHOD(HttpEnv, negotiateContentType)
 		return;
 	}
 	if (rs_array) {
+		ZVAL_DEREF(rs_array);
 		zval_dtor(rs_array);
 		array_init(rs_array);
 	}
@@ -890,12 +757,12 @@ static PHP_METHOD(HttpEnv, negotiate)
 	char *value_str, *sep_str = NULL;
 	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)) {
+	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_DEREF(rs_array);
 		zval_dtor(rs_array);
 		array_init(rs_array);
 	}
@@ -928,52 +795,6 @@ static zend_function_entry php_http_env_methods[] = {
 	EMPTY_FUNCTION_ENTRY
 };
 
-#ifdef PHP_HTTP_HAVE_JSON
-#include "ext/json/php_json.h"
-
-static SAPI_POST_HANDLER_FUNC(php_http_json_post_handler)
-{
-	zval *zarg = arg;
-	zend_string *json = NULL;
-
-	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 = php_stream_copy_to_mem(SG(request_info).request_body, PHP_STREAM_COPY_ALL, 0);
-	}
-
-	if (json) {
-		if (json->len) {
-			zval zjson;
-
-			ZVAL_NULL(&zjson);
-			php_json_decode(&zjson, json->val, json->len, 1, PG(max_input_nesting_level));
-			if (Z_TYPE(zjson) != IS_NULL) {
-				zval_dtor(zarg);
-				ZVAL_COPY_VALUE(zarg, (&zjson));
-			}
-		}
-		zend_string_release(json);
-	}
-}
-
-static void php_http_env_register_json_handler(void)
-{
-	sapi_post_entry entry = {NULL, 0, NULL, NULL};
-
-	entry.post_reader = sapi_read_standard_form_data;
-	entry.post_handler = php_http_json_post_handler;
-
-	entry.content_type = "text/json";
-	entry.content_type_len = lenof("text/json");
-	sapi_register_post_entry(&entry);
-
-	entry.content_type = "application/json";
-	entry.content_type_len = lenof("application/json");
-	sapi_register_post_entry(&entry);
-}
-#endif
-
 zend_class_entry *php_http_env_class_entry;
 
 PHP_MINIT_FUNCTION(http_env)
@@ -983,10 +804,6 @@ PHP_MINIT_FUNCTION(http_env)
 	INIT_NS_CLASS_ENTRY(ce, "http", "Env", php_http_env_methods);
 	php_http_env_class_entry = zend_register_internal_class(&ce);
 
-#ifdef PHP_HTTP_HAVE_JSON
-	php_http_env_register_json_handler();
-#endif
-
 	return SUCCESS;
 }