X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.c;h=df22d5a7134a29eceb4f43ca107a9d943a9203da;hp=311541d7102ee095f480c8108d1a8e3f33452add;hb=8000eca9bbf2cebb98a2dfd982d54e93aaa6a58f;hpb=1bef05c9e90799c57722bdb4865e6829373fee20 diff --git a/php_http_env.c b/php_http_env.c index 311541d..df22d5a 100644 --- a/php_http_env.c +++ b/php_http_env.c @@ -13,60 +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(¶ms); - if (php_http_params_parse(¶ms, &opts)) { - zend_string *key_str; - zend_ulong key_num; - - if (HASH_KEY_IS_STRING == zend_hash_get_current_key(¶ms, &key_str, &key_num)) { - sapi_post_entry *post_entry = NULL; - - if ((post_entry = zend_hash_find_ptr(&SG(known_post_content_types), key_str))) { - 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 - * FIXME: this leaks because php_auto_globals_create_files() - * as well as the rfc1867_handler call - * array_init(&PG(http_globals)[TRACK_VARS_FILES]) - */ - Z_TRY_ADDREF(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(¶ms); - } - } - - PTR_SET(SG(request_info).content_type_dup, NULL); - - return SUCCESS; -} PHP_RSHUTDOWN_FUNCTION(http_env) { @@ -87,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; @@ -485,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; } @@ -566,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) @@ -710,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) @@ -813,7 +672,7 @@ 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) { @@ -898,7 +757,7 @@ 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; } @@ -936,53 +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 tmp; - - ZVAL_NULL(&tmp); - php_json_decode(&tmp, json->val, json->len, 1, PG(max_input_nesting_level)); - - if (Z_TYPE(tmp) == IS_ARRAY) { - array_copy(Z_ARRVAL(tmp), Z_ARRVAL_P(zarg)); - } - zval_ptr_dtor(&tmp); - } - 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) @@ -992,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; }