X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.c;h=c60d4c0b41d42787a682854a70e168700ed62e3f;hp=10d54fe4019a5a0472ffc95b1c6bfe1758964279;hb=refs%2Fheads%2Fv2.4.x;hpb=0ffd2bb506547576df92a3b5392125691dbeaee6 diff --git a/php_http_env.c b/php_http_env.c index 10d54fe..c60d4c0 100644 --- a/php_http_env.c +++ b/php_http_env.c @@ -13,70 +13,6 @@ #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); - - /* 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 TSRMLS_CC)) { - char *key_str; - uint key_len; - ulong key_num; - - if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(¶ms, &key_str, &key_len, &key_num, 0, NULL)) { - sapi_post_entry *post_entry = NULL; - - if (SUCCESS == zend_hash_find(&SG(known_post_content_types), key_str, key_len, (void *) &post_entry)) { - zval *files = PG(http_globals)[TRACK_VARS_FILES]; - - if (post_entry) { - SG(request_info).post_entry = post_entry; - - if (post_entry->post_reader) { - post_entry->post_reader(TSRMLS_C); - } - } - - if (sapi_module.default_post_reader) { - sapi_module.default_post_reader(TSRMLS_C); - } - - sapi_handle_post(PG(http_globals)[TRACK_VARS_POST] TSRMLS_CC); - - /* - * the rfc1867 handler is an awkward buddy - */ - if (files != PG(http_globals)[TRACK_VARS_FILES] && PG(http_globals)[TRACK_VARS_FILES]) { - Z_ADDREF_P(PG(http_globals)[TRACK_VARS_FILES]); - zend_hash_update(&EG(symbol_table), "_FILES", sizeof("_FILES"), &PG(http_globals)[TRACK_VARS_FILES], sizeof(zval *), NULL); - if (files) { - zval_ptr_dtor(&files); - } - } - } - } - zend_hash_destroy(¶ms); - } - } - - STR_SET(SG(request_info).content_type_dup, NULL); - - return SUCCESS; -} - PHP_RSHUTDOWN_FUNCTION(http_env) { if (PHP_HTTP_G->env.request.headers) { @@ -289,7 +225,7 @@ php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_ return PHP_HTTP_RANGE_NO; } if (strncmp(range, "bytes=", lenof("bytes="))) { - STR_FREE(range); + PTR_FREE(range); return PHP_HTTP_RANGE_NO; } @@ -345,7 +281,7 @@ php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_ switch (end) { /* "0-" */ case -1: - STR_FREE(range); + PTR_FREE(range); return PHP_HTTP_RANGE_NO; /* "0-0" */ @@ -366,7 +302,7 @@ php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_ case -1: /* "-", "-0" */ if (end == -1 || end == -10) { - STR_FREE(range); + PTR_FREE(range); return PHP_HTTP_RANGE_ERR; } begin = length - end; @@ -376,13 +312,13 @@ php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_ /* "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-" */ @@ -395,7 +331,7 @@ php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_ if (length <= (size_t) end) { end = length - 1; } else if (end < begin) { - STR_FREE(range); + PTR_FREE(range); return PHP_HTTP_RANGE_ERR; } break; @@ -417,12 +353,12 @@ php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_ 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; } @@ -432,9 +368,9 @@ static void grab_headers(void *data, void *arg TSRMLS_DC) php_http_buffer_appends(PHP_HTTP_BUFFER(arg), PHP_HTTP_CRLF); } -STATUS php_http_env_get_response_headers(HashTable *headers_ht TSRMLS_DC) +ZEND_RESULT_CODE php_http_env_get_response_headers(HashTable *headers_ht TSRMLS_DC) { - STATUS status; + ZEND_RESULT_CODE status; php_http_buffer_t headers; php_http_buffer_init(&headers); @@ -477,15 +413,15 @@ long php_http_env_get_response_code(TSRMLS_D) return code ? code : 200; } -STATUS php_http_env_set_response_code(long http_code TSRMLS_DC) +ZEND_RESULT_CODE php_http_env_set_response_code(long http_code TSRMLS_DC) { return sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) http_code TSRMLS_CC); } -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 TSRMLS_DC) { 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); @@ -494,22 +430,22 @@ STATUS php_http_env_set_response_status_line(long code, php_http_version_t *v TS return ret; } -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 TSRMLS_DC) { return php_http_env_set_response_status_line(php_http_env_get_response_code(TSRMLS_C), v TSRMLS_CC); } -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 TSRMLS_DC) { 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 TSRMLS_CC); efree(h.line); return ret; } -STATUS php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv TSRMLS_DC) +ZEND_RESULT_CODE php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv TSRMLS_DC) { - STATUS ret = FAILURE; + ZEND_RESULT_CODE ret = FAILURE; sapi_header_line h = {NULL, 0, http_code}; h.line_len = vspprintf(&h.line, 0, fmt, argv); @@ -523,9 +459,9 @@ STATUS php_http_env_set_response_header_va(long http_code, zend_bool replace, co return ret; } -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_format(long http_code, zend_bool replace TSRMLS_DC, const char *fmt, ...) { - STATUS ret; + ZEND_RESULT_CODE ret; va_list args; va_start(args, fmt); @@ -535,7 +471,7 @@ STATUS php_http_env_set_response_header_format(long http_code, zend_bool replace return ret; } -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_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace TSRMLS_DC) { if (!value) { sapi_header_line h = {(char *) name_str, name_len, http_code}; @@ -564,7 +500,7 @@ STATUS php_http_env_set_response_header_value(long http_code, const char *name_s return php_http_env_set_response_header_value(http_code, name_str, name_len, NULL, replace TSRMLS_CC); } else { sapi_header_line h; - STATUS ret; + ZEND_RESULT_CODE ret; if (name_len > INT_MAX) { name_len = INT_MAX; @@ -575,107 +511,22 @@ STATUS php_http_env_set_response_header_value(long http_code, const char *name_s ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC); zval_ptr_dtor(&data); - STR_FREE(h.line); + 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_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) @@ -726,32 +577,29 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnv, getResponseStatusForCode) { 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), 1); + + if ((status = php_http_env_get_response_status_for_code(code))) { + RETURN_STRING(status, 1); + } } 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, 1); - } +#define PHP_HTTP_RESPONSE_CODE(code, status) add_index_string(return_value, code, status, 1); +#include "php_http_response_codes.h" +#undef PHP_HTTP_RESPONSE_CODE } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseHeader, 0, 0, 0) @@ -948,58 +796,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; - char *json_str = NULL; - size_t json_len = 0; - -#if PHP_VERSION_ID >= 50600 - 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_len = php_stream_copy_to_mem(SG(request_info).request_body, &json_str, PHP_STREAM_COPY_ALL, 0); - } -#else - json_str = SG(request_info).raw_post_data; - json_len = SG(request_info).raw_post_data_length; -#endif - - if (json_len) { - zval zjson; - - INIT_ZVAL(zjson); - php_json_decode(&zjson, json_str, json_len, 1, PG(max_input_nesting_level) TSRMLS_CC); - if (Z_TYPE(zjson) != IS_NULL) { - zval_dtor(zarg); - ZVAL_COPY_VALUE(zarg, (&zjson)); - } - } -#if PHP_VERSION_ID >= 50600 - STR_FREE(json_str); -#endif -} - -static void php_http_env_register_json_handler(TSRMLS_D) -{ - 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 TSRMLS_CC); - - entry.content_type = "application/json"; - entry.content_type_len = lenof("application/json"); - sapi_register_post_entry(&entry TSRMLS_CC); -} -#endif - zend_class_entry *php_http_env_class_entry; PHP_MINIT_FUNCTION(http_env) @@ -1009,10 +805,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 TSRMLS_CC); -#ifdef PHP_HTTP_HAVE_JSON - php_http_env_register_json_handler(TSRMLS_C); -#endif - return SUCCESS; }