X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=9eb59b99e600625eb57946d109e65f6d699dd8aa;hp=831040916bf2eef7a72ff7e082ddf55644d75d18;hb=dbc4ec02cd319000b5c8589910047cfe6d5738be;hpb=1a0dbb96fbe46a2edec1c813798cef7b0898eebe diff --git a/http.c b/http.c index 8310409..9eb59b9 100644 --- a/http.c +++ b/http.c @@ -24,6 +24,7 @@ #include "php_http_api.h" #include "php_http_send_api.h" +#include "php_http_cookie_api.h" #include "php_http_cache_api.h" #include "php_http_send_api.h" #include "php_http_message_api.h" @@ -70,7 +71,7 @@ zend_function_entry http_functions[] = { PHP_FE(http_build_url, http_arg_pass_ref_4) PHP_FE(http_build_str, NULL) #ifndef ZEND_ENGINE_2 - PHP_FALIAS(http_build_query, http_build_str) + PHP_FALIAS(http_build_query, http_build_str, NULL) #endif PHP_FE(http_negotiate_language, http_arg_pass_ref_2) PHP_FE(http_negotiate_charset, http_arg_pass_ref_2) @@ -92,6 +93,7 @@ zend_function_entry http_functions[] = { PHP_FE(http_parse_message, NULL) PHP_FE(http_parse_headers, NULL) PHP_FE(http_parse_cookie, NULL) + PHP_FE(http_parse_params, NULL) PHP_FE(http_get_request_headers, NULL) PHP_FE(http_get_request_body, NULL) PHP_FE(http_get_request_body_stream, NULL) @@ -101,8 +103,11 @@ zend_function_entry http_functions[] = { PHP_FE(http_head, http_arg_pass_ref_3) PHP_FE(http_post_data, http_arg_pass_ref_4) PHP_FE(http_post_fields, http_arg_pass_ref_5) + PHP_FE(http_put_data, http_arg_pass_ref_4) PHP_FE(http_put_file, http_arg_pass_ref_4) PHP_FE(http_put_stream, http_arg_pass_ref_4) + PHP_FE(http_request, http_arg_pass_ref_5) + PHP_FE(http_request_body_encode, NULL) #endif PHP_FE(http_request_method_register, NULL) PHP_FE(http_request_method_unregister, NULL) @@ -121,9 +126,15 @@ zend_function_entry http_functions[] = { }; /* }}} */ +PHP_MINIT_FUNCTION(http); +PHP_MSHUTDOWN_FUNCTION(http); +PHP_RINIT_FUNCTION(http); +PHP_RSHUTDOWN_FUNCTION(http); +PHP_MINFO_FUNCTION(http); + /* {{{ http_module_dep */ #if ZEND_EXTENSION_API_NO >= 220050617 -static zend_module_dep http_module_dep[] = { +static zend_module_dep http_module_deps[] = { # ifdef HAVE_SPL ZEND_MOD_REQUIRED("spl") # endif @@ -132,6 +143,9 @@ static zend_module_dep http_module_dep[] = { # endif # ifdef HAVE_PHP_SESSION ZEND_MOD_REQUIRED("session") +# endif +# ifdef HAVE_ICONV + ZEND_MOD_REQUIRED("iconv") # endif {NULL, NULL, NULL, 0} }; @@ -142,7 +156,7 @@ static zend_module_dep http_module_dep[] = { zend_module_entry http_module_entry = { #if ZEND_EXTENSION_API_NO >= 220050617 STANDARD_MODULE_HEADER_EX, NULL, - http_module_dep, + http_module_deps, #else STANDARD_MODULE_HEADER, #endif @@ -210,22 +224,23 @@ PHP_INI_MH(http_update_allowed_methods) #endif PHP_INI_BEGIN() - HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed) - HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache) - HTTP_PHP_INI_ENTRY("http.redirect_log", "", PHP_INI_ALL, OnUpdateString, log.redirect) - HTTP_PHP_INI_ENTRY("http.allowed_methods_log", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods) - HTTP_PHP_INI_ENTRY("http.composite_log", "", PHP_INI_ALL, OnUpdateString, log.composite) - HTTP_PHP_INI_ENTRY("http.etag_mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode) + HTTP_PHP_INI_ENTRY("http.etag.mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode) + HTTP_PHP_INI_ENTRY("http.log.cache", "", PHP_INI_ALL, OnUpdateString, log.cache) + HTTP_PHP_INI_ENTRY("http.log.redirect", "", PHP_INI_ALL, OnUpdateString, log.redirect) + HTTP_PHP_INI_ENTRY("http.log.allowed_methods", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods) + HTTP_PHP_INI_ENTRY("http.log.composite", "", PHP_INI_ALL, OnUpdateString, log.composite) + HTTP_PHP_INI_ENTRY("http.request.methods.allowed", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed) + HTTP_PHP_INI_ENTRY("http.request.methods.custom", "", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateString, request.methods.custom.ini) +#ifdef HTTP_HAVE_ZLIB + HTTP_PHP_INI_ENTRY("http.send.inflate.start_auto", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, send.inflate.start_auto) + HTTP_PHP_INI_ENTRY("http.send.inflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags) + HTTP_PHP_INI_ENTRY("http.send.deflate.start_auto", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, send.deflate.start_auto) + HTTP_PHP_INI_ENTRY("http.send.deflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags) +#endif #ifdef ZEND_ENGINE_2 HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions) #endif HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit) -#ifdef HTTP_HAVE_ZLIB - HTTP_PHP_INI_ENTRY("http.ob_inflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.inflate.start_auto) - HTTP_PHP_INI_ENTRY("http.ob_inflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags) - HTTP_PHP_INI_ENTRY("http.ob_deflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.deflate.start_auto) - HTTP_PHP_INI_ENTRY("http.ob_deflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags) -#endif PHP_INI_END() /* }}} */ @@ -239,6 +254,7 @@ PHP_MINIT_FUNCTION(http) REGISTER_INI_ENTRIES(); if ( (SUCCESS != PHP_MINIT_CALL(http_support)) || + (SUCCESS != PHP_MINIT_CALL(http_cookie)) || (SUCCESS != PHP_MINIT_CALL(http_send)) || (SUCCESS != PHP_MINIT_CALL(http_url)) || #ifdef HTTP_HAVE_CURL @@ -290,11 +306,11 @@ PHP_MSHUTDOWN_FUNCTION(http) /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(http) { - http_globals_init(HTTP_GLOBALS); + http_globals_init(HTTP_G); - if (HTTP_G(request).methods.allowed) { - http_check_allowed_methods(HTTP_G(request).methods.allowed, - strlen(HTTP_G(request).methods.allowed)); + if (HTTP_G->request.methods.allowed) { + http_check_allowed_methods(HTTP_G->request.methods.allowed, + strlen(HTTP_G->request.methods.allowed)); } if ( (SUCCESS != PHP_RINIT_CALL(http_request_method)) @@ -322,7 +338,7 @@ PHP_RSHUTDOWN_FUNCTION(http) status = FAILURE; } - http_globals_free(HTTP_GLOBALS); + http_globals_free(HTTP_G); return status; } /* }}} */ @@ -391,12 +407,11 @@ PHP_MINFO_FUNCTION(http) php_info_print_table_colspan_header(2, "Request Methods"); { int i; - getGlobals(G); phpstr *custom_request_methods = phpstr_new(); phpstr *known_request_methods = phpstr_from_string(HTTP_KNOWN_METHODS, lenof(HTTP_KNOWN_METHODS)); - http_request_method_entry **ptr = G->request.methods.custom.entries; + http_request_method_entry **ptr = HTTP_G->request.methods.custom.entries; - for (i = 0; i < G->request.methods.custom.count; ++i) { + for (i = 0; i < HTTP_G->request.methods.custom.count; ++i) { if (ptr[i]) { phpstr_appendf(custom_request_methods, "%s, ", ptr[i]->name); } @@ -409,7 +424,7 @@ PHP_MINFO_FUNCTION(http) php_info_print_table_row(2, "Known", PHPSTR_VAL(known_request_methods)); php_info_print_table_row(2, "Custom", PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered"); - php_info_print_table_row(2, "Allowed", strlen(G->request.methods.allowed) ? G->request.methods.allowed : "(ANY)"); + php_info_print_table_row(2, "Allowed", strlen(HTTP_G->request.methods.allowed) ? HTTP_G->request.methods.allowed : "(ANY)"); phpstr_free(&known_request_methods); phpstr_free(&custom_request_methods);