X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.c;h=0ede201e875a349a850f9b443225119c0d248938;hp=af0039473eeb02e0e0b96da14857eabee55b3090;hb=95c6c900d04096d332c422e3f597186b7184c5ab;hpb=b2773ab559878238bd024c4bbebe5825cc38ad85

diff --git a/php_http_env.c b/php_http_env.c
index af00394..0ede201 100644
--- a/php_http_env.c
+++ b/php_http_env.c
@@ -56,7 +56,7 @@ PHP_RINIT_FUNCTION(http_env)
 					 * array_init(&PG(http_globals)[TRACK_VARS_FILES])
 					 */
 					Z_TRY_ADDREF(PG(http_globals)[TRACK_VARS_FILES]);
-					zend_hash_str_update(&EG(symbol_table).ht, "_FILES", lenof("_FILES"), &PG(http_globals)[TRACK_VARS_FILES]);
+					zend_hash_str_update(&EG(symbol_table), "_FILES", lenof("_FILES"), &PG(http_globals)[TRACK_VARS_FILES]);
 				}
 			}
 			zend_hash_destroy(&params);
@@ -177,7 +177,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) {
@@ -566,100 +566,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)
@@ -710,32 +625,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)) {
 		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)