X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=73d6f87283798cb7a9783beb3f8659520d448123;hp=ce1a3988c8133c294e4eaa6090173b3139d0b699;hb=234dac3f03c6b7342bb70829bc9641268cab7156;hpb=ce14c30128d4e944ce1daf9e31ca7cea4f0ee3e2 diff --git a/http.c b/http.c index ce1a398..73d6f87 100644 --- a/http.c +++ b/http.c @@ -19,26 +19,20 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#ifdef HTTP_HAVE_CURL -# ifdef PHP_WIN32 -# include -# endif -# include -#endif - -#include - #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "SAPI.h" +#include "php_ini.h" +#include "ext/standard/info.h" #include "php_http.h" #include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_send_api.h" +#include "php_http_cache_api.h" +#ifdef HTTP_HAVE_CURL +# include "php_http_request_api.h" +#endif #ifdef ZEND_ENGINE_2 # include "php_http_util_object.h" @@ -46,45 +40,25 @@ # include "php_http_response_object.h" # ifdef HTTP_HAVE_CURL # include "php_http_request_object.h" +# include "php_http_requestpool_object.h" # endif # include "php_http_exception_object.h" #endif +#include "missing.h" #include "phpstr/phpstr.h" #ifdef HTTP_HAVE_CURL -#ifdef ZEND_ENGINE_2 -static -ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); - -static -ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); - -static -ZEND_BEGIN_ARG_INFO(http_request_info_ref_5, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); -#else -static unsigned char http_request_info_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -static unsigned char http_request_info_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -#endif /* ZEND_ENGINE_2 */ -#endif /* HTTP_HAVE_CURL */ +# ifdef PHP_WIN32 +# include +# endif +# include +#endif + +#include -ZEND_DECLARE_MODULE_GLOBALS(http) +ZEND_DECLARE_MODULE_GLOBALS(http); +HTTP_DECLARE_ARG_PASS_INFO(); #ifdef COMPILE_DL_HTTP ZEND_GET_MODULE(http) @@ -111,16 +85,18 @@ function_entry http_functions[] = { PHP_FE(http_send_file, NULL) PHP_FE(http_send_stream, NULL) PHP_FE(http_chunked_decode, NULL) - PHP_FE(http_split_response, NULL) + PHP_FE(http_parse_message, NULL) PHP_FE(http_parse_headers, NULL) PHP_FE(http_get_request_headers, NULL) + PHP_FE(http_get_request_body, NULL) + PHP_FE(http_match_request_header, NULL) #ifdef HTTP_HAVE_CURL - PHP_FE(http_get, http_request_info_ref_3) - PHP_FE(http_head, http_request_info_ref_3) - PHP_FE(http_post_data, http_request_info_ref_4) - PHP_FE(http_post_fields, http_request_info_ref_5) - PHP_FE(http_put_file, http_request_info_ref_4) - PHP_FE(http_put_stream, http_request_info_ref_4) + PHP_FE(http_get, http_arg_pass_ref_3) + 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_file, http_arg_pass_ref_4) + PHP_FE(http_put_stream, http_arg_pass_ref_4) PHP_FE(http_request_method_register, NULL) PHP_FE(http_request_method_unregister, NULL) PHP_FE(http_request_method_exists, NULL) @@ -157,32 +133,35 @@ zend_module_entry http_module_entry = { int http_module_number; -#ifdef HTTP_HAVE_CURL -# ifdef HTTP_CURL_USE_ZEND_MM -static void http_curl_free(void *p) { efree(p); } -static char *http_curl_strdup(const char *p) { return estrdup(p); } -static void *http_curl_malloc(size_t s) { return emalloc(s); } -static void *http_curl_realloc(void *p, size_t s) { return erealloc(p, s); } -static void *http_curl_calloc(size_t n, size_t s) { return ecalloc(n, s); } -# endif /* HTTP_CURL_USE_ZEND_MM */ -static void http_curl_freestr(void *s) { efree(*(char **)s); } -#endif /* HTTP_HAVE_CURL */ - /* {{{ http_globals */ -static inline void http_globals_init(zend_http_globals *G) +static void http_globals_init_once(zend_http_globals *G) { memset(G, 0, sizeof(zend_http_globals)); +} + +static inline void http_globals_init(zend_http_globals *G) +{ G->send.buffer_size = HTTP_SENDBUF_SIZE; zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0); #ifdef HTTP_HAVE_CURL - zend_llist_init(&G->request.curl.copies, sizeof(char *), http_curl_freestr, 0); + zend_llist_init(&G->request.copies.strings, sizeof(char *), http_request_data_free_string, 0); + zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0); + zend_llist_init(&G->request.copies.contexts, sizeof(http_curl_callback_ctx *), http_request_data_free_context, 0); + zend_llist_init(&G->request.copies.convs, sizeof(http_curl_conv *), http_request_data_free_conv, 0); #endif } + static inline void http_globals_free(zend_http_globals *G) { - STR_FREE(G->send.content_type); - STR_FREE(G->send.unquoted_etag); + STR_SET(G->send.content_type, NULL); + STR_SET(G->send.unquoted_etag, NULL); zend_hash_destroy(&G->request.methods.custom); +#ifdef HTTP_HAVE_CURL + zend_llist_clean(&G->request.copies.strings); + zend_llist_clean(&G->request.copies.slists); + zend_llist_clean(&G->request.copies.contexts); + zend_llist_clean(&G->request.copies.convs); +#endif } /* }}} */ @@ -208,8 +187,15 @@ PHP_INI_MH(http_update_allowed_methods) } PHP_INI_BEGIN() - HTTP_PHP_INI_ENTRY("http.allowed_methods", NULL, PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed) - HTTP_PHP_INI_ENTRY("http.cache_log", NULL, PHP_INI_ALL, OnUpdateString, log.cache) + 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) +#ifdef ZEND_ENGINE_2 + HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions) +#endif + HTTP_PHP_INI_ENTRY("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, etag.mode) PHP_INI_END() /* }}} */ @@ -219,20 +205,18 @@ PHP_MINIT_FUNCTION(http) { http_module_number = module_number; - ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL); + ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL) + REGISTER_INI_ENTRIES(); + + HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5); + HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1); + HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH); #ifdef HTTP_HAVE_CURL -# ifdef HTTP_CURL_USE_ZEND_MM - if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL, - http_curl_malloc, - http_curl_free, - http_curl_realloc, - http_curl_strdup, - http_curl_calloc)) { + if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) { return FAILURE; } -# endif /* HTTP_CURL_USE_ZEND_MM */ #endif /* HTTP_HAVE_CURL */ #ifdef ZEND_ENGINE_2 @@ -241,10 +225,15 @@ PHP_MINIT_FUNCTION(http) http_response_object_init(); # ifdef HTTP_HAVE_CURL http_request_object_init(); + http_requestpool_object_init(); # endif /* HTTP_HAVE_CURL */ http_exception_object_init(); #endif /* ZEND_ENGINE_2 */ +#ifdef ZEND_ENGINE_2 + zend_hash_init_ex(&http_response_statics, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1, 0); + zend_fix_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC); +#endif return SUCCESS; } /* }}} */ @@ -252,6 +241,7 @@ PHP_MINIT_FUNCTION(http) /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(http) { + zend_hash_destroy(&http_response_statics); UNREGISTER_INI_ENTRIES(); #ifdef HTTP_HAVE_CURL curl_global_cleanup(); @@ -270,6 +260,7 @@ PHP_RINIT_FUNCTION(http) } http_globals_init(HTTP_GLOBALS); + zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC); return SUCCESS; } /* }}} */ @@ -277,6 +268,9 @@ PHP_RINIT_FUNCTION(http) /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(http) { +#ifdef ZEND_ENGINE_2 + zend_clean_static_properties(http_response_object_ce TSRMLS_CC); +#endif http_globals_free(HTTP_GLOBALS); return SUCCESS; } @@ -315,6 +309,7 @@ PHP_MINFO_FUNCTION(http) } php_info_print_table_end(); +#ifdef HTTP_HAVE_CURL php_info_print_table_start(); { unsigned i; @@ -339,17 +334,18 @@ PHP_MINFO_FUNCTION(http) php_info_print_table_row(2, "Custom Request Methods:", PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered"); - phpstr_free(known_request_methods); - phpstr_free(custom_request_methods); + phpstr_free(&known_request_methods); + phpstr_free(&custom_request_methods); } php_info_print_table_end(); +#endif php_info_print_table_start(); { php_info_print_table_header(2, "Functionality", "Availability"); php_info_print_table_row(2, "Miscellaneous Utilities:", HTTP_FUNC_AVAIL("HttpUtil, HttpMessage")); php_info_print_table_row(2, "Extended HTTP Responses:", HTTP_FUNC_AVAIL("HttpResponse")); - php_info_print_table_row(2, "Extended HTTP Requests:", HTTP_CURL_AVAIL("HttpRequest")); + php_info_print_table_row(2, "Extended HTTP Requests:", HTTP_CURL_AVAIL("HttpRequest, HttpRequestPool")); } php_info_print_table_end();