X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=00f8919b5096360e1964b41b8950fd8426aed772;hb=93a48c0a6710c7aa678ce0b48e6c1a5d2bf544ee;hp=899083fcb9b7ee3a6a0631e023ad336f730638fa;hpb=b8e107f69fcd64811e2dd428b6980412749cbc7b;p=m6w6%2Fext-http diff --git a/http.c b/http.c index 899083f..00f8919 100644 --- a/http.c +++ b/http.c @@ -34,6 +34,7 @@ #ifdef HTTP_HAVE_ZLIB # include "php_http_encoding_api.h" #endif +#include "php_http_url_api.h" #ifdef ZEND_ENGINE_2 # include "php_http_filter_api.h" @@ -67,6 +68,10 @@ zend_function_entry http_functions[] = { PHP_FE(http_test, NULL) PHP_FE(http_date, NULL) 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) +#endif PHP_FE(http_negotiate_language, http_arg_pass_ref_2) PHP_FE(http_negotiate_charset, http_arg_pass_ref_2) PHP_FE(http_negotiate_content_type, http_arg_pass_ref_2) @@ -103,9 +108,6 @@ zend_function_entry http_functions[] = { PHP_FE(http_request_method_unregister, NULL) PHP_FE(http_request_method_exists, NULL) PHP_FE(http_request_method_name, NULL) -#ifndef ZEND_ENGINE_2 - PHP_FE(http_build_query, NULL) -#endif PHP_FE(ob_etaghandler, NULL) #ifdef HTTP_HAVE_ZLIB PHP_FE(http_deflate, NULL) @@ -171,6 +173,7 @@ static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC) #ifndef HTTP_HAVE_SAPI_RTIME G->request_time = time(NULL); #endif + G->read_post_data = 0; } #define http_globals_free(g) _http_globals_free((g) TSRMLS_CC)