X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=521f2b5ce58b7a0f660063e8e0ef8b3ac5b45f54;hp=1dba9c6a63d32470daf2bd91ff6acdb7f9971a3a;hb=bed6be7b39b7992b44eb56455afe3f0b0bd04964;hpb=fb5d0ef47f1f54dad0efa1f091324e3d7d18050b diff --git a/http.c b/http.c index 1dba9c6..521f2b5 100644 --- a/http.c +++ b/http.c @@ -31,6 +31,7 @@ #include "php_http_request_method_api.h" #ifdef HTTP_HAVE_CURL # include "php_http_request_api.h" +# include "php_http_request_datashare_api.h" #endif #ifdef HTTP_HAVE_ZLIB # include "php_http_encoding_api.h" @@ -48,6 +49,7 @@ # ifdef HTTP_HAVE_CURL # include "php_http_request_object.h" # include "php_http_requestpool_object.h" +# include "php_http_requestdatashare_object.h" # endif # ifdef HTTP_HAVE_ZLIB # include "php_http_deflatestream_object.h" @@ -66,7 +68,6 @@ ZEND_GET_MODULE(http) /* {{{ http_functions[] */ 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) @@ -93,6 +94,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_build_cookie, NULL) PHP_FE(http_parse_params, NULL) PHP_FE(http_get_request_headers, NULL) PHP_FE(http_get_request_body, NULL) @@ -107,9 +109,7 @@ zend_function_entry http_functions[] = { 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) -#ifdef HAVE_CURL_GETFORMDATA PHP_FE(http_request_body_encode, NULL) -#endif #endif PHP_FE(http_request_method_register, NULL) PHP_FE(http_request_method_unregister, NULL) @@ -137,16 +137,16 @@ PHP_MINFO_FUNCTION(http); /* {{{ http_module_dep */ #if ZEND_EXTENSION_API_NO >= 220050617 static zend_module_dep http_module_deps[] = { -# if HTTP_HAVE_EXT(SPL) +# ifdef HTTP_HAVE_SPL ZEND_MOD_REQUIRED("spl") # endif -# if HTTP_HAVE_EXT_HASH +# ifdef HTTP_HAVE_HASH ZEND_MOD_REQUIRED("hash") # endif -# if HTTP_HAVE_EXT(SESSION) +# ifdef HTTP_HAVE_SESSION ZEND_MOD_REQUIRED("session") # endif -# if HTTP_HAVE_EXT(ICONV) +# ifdef HTTP_HAVE_ICONV ZEND_MOD_REQUIRED("iconv") # endif {NULL, NULL, NULL, 0} @@ -186,11 +186,11 @@ static void http_globals_init_once(zend_http_globals *G) static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC) { #ifdef HTTP_HAVE_SAPI_RTIME - G->request.time = Z_LVAL_P(http_get_server_var("REQUEST_TIME")); + G->request.time = sapi_get_request_time(TSRMLS_C); #else G->request.time = time(NULL); #endif - G->send.buffer_size = HTTP_SENDBUF_SIZE; + G->send.buffer_size = 0; G->send.not_found_404 = 1; G->read_post_data = 0; } @@ -198,8 +198,17 @@ static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC) #define http_globals_free(g) _http_globals_free((g) TSRMLS_CC) static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC) { + if (G->request.headers) { + zend_hash_destroy(G->request.headers); + FREE_HASHTABLE(G->request.headers); + G->request.headers = NULL; + } STR_SET(G->send.content_type, NULL); STR_SET(G->send.unquoted_etag, NULL); + if (G->server_var) { + zval_ptr_dtor(&G->server_var); + G->server_var = NULL; + } } /* }}} */ @@ -237,6 +246,12 @@ PHP_INI_BEGIN() 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) +#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) + HTTP_PHP_INI_ENTRY("http.request.datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.cookie) + HTTP_PHP_INI_ENTRY("http.request.datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.dns) + HTTP_PHP_INI_ENTRY("http.request.datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.ssl) + HTTP_PHP_INI_ENTRY("http.request.datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.connect) +#endif #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) @@ -266,6 +281,9 @@ PHP_MINIT_FUNCTION(http) (SUCCESS != PHP_MINIT_CALL(http_url)) || #ifdef HTTP_HAVE_CURL (SUCCESS != PHP_MINIT_CALL(http_request)) || +# ifdef ZEND_ENGINE_2 + (SUCCESS != PHP_MINIT_CALL(http_request_datashare)) || +# endif #endif /* HTTP_HAVE_CURL */ #ifdef HTTP_HAVE_ZLIB (SUCCESS != PHP_MINIT_CALL(http_encoding)) || @@ -285,6 +303,7 @@ PHP_MINIT_FUNCTION(http) # ifdef HTTP_HAVE_CURL (SUCCESS != PHP_MINIT_CALL(http_request_object)) || (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))|| + (SUCCESS != PHP_MINIT_CALL(http_requestdatashare_object))|| # endif /* HTTP_HAVE_CURL */ # ifdef HTTP_HAVE_ZLIB (SUCCESS != PHP_MINIT_CALL(http_deflatestream_object)) || @@ -304,7 +323,13 @@ PHP_MSHUTDOWN_FUNCTION(http) { UNREGISTER_INI_ENTRIES(); #ifdef HTTP_HAVE_CURL - return PHP_MSHUTDOWN_CALL(http_request); + if ( +# ifdef ZEND_ENGINE_2 + (SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)) || +# endif + (SUCCESS != PHP_MSHUTDOWN_CALL(http_request))) { + return FAILURE; + } #endif return SUCCESS; } @@ -323,6 +348,9 @@ PHP_RINIT_FUNCTION(http) if ( (SUCCESS != PHP_RINIT_CALL(http_request_method)) #ifdef HTTP_HAVE_ZLIB || (SUCCESS != PHP_RINIT_CALL(http_encoding)) +#endif +#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) + || (SUCCESS != PHP_RINIT_CALL(http_request_datashare)) #endif ) { return FAILURE; @@ -341,7 +369,10 @@ PHP_RSHUTDOWN_FUNCTION(http) #ifdef HTTP_HAVE_ZLIB || (SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding)) #endif - ) { +#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) + || (SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare)) +#endif + ) { status = FAILURE; } @@ -366,6 +397,7 @@ PHP_MINFO_FUNCTION(http) # ifdef HTTP_HAVE_CURL "HttpRequest, " "HttpRequestPool, " + "HttpRequestDataShare, " # endif # ifdef HTTP_HAVE_ZLIB "HttpDeflateStream, "