X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=0acb05c33c85462ddcbc9e1b9214626082f185d4;hp=575fc3c724f2a43d2ec22d9d46a4341bdb6b986e;hb=b08947e98f1832091c8a9f6dea3799e0524d2822;hpb=76a1064dde808801f4988df89521a323661742aa diff --git a/http.c b/http.c index 575fc3c..0acb05c 100644 --- a/http.c +++ b/http.c @@ -19,26 +19,17 @@ #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_request_api.h" #ifdef ZEND_ENGINE_2 # include "php_http_util_object.h" @@ -54,38 +45,16 @@ #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) @@ -115,14 +84,15 @@ function_entry http_functions[] = { PHP_FE(http_split_response, 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) @@ -159,17 +129,6 @@ 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) { @@ -177,15 +136,24 @@ 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); zend_hash_destroy(&G->request.methods.custom); - zend_llist_clean(&G->request.curl.copies); +#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 } /* }}} */ @@ -211,8 +179,11 @@ 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) +#ifdef ZEND_ENGINE_2 + HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions) +#endif PHP_INI_END() /* }}} */ @@ -222,20 +193,16 @@ PHP_MINIT_FUNCTION(http) { http_module_number = module_number; - ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL); +#ifdef ZTS + ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL) +#endif + REGISTER_INI_ENTRIES(); #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 (SUCCESS != http_request_global_init()) { return FAILURE; } -# endif /* HTTP_CURL_USE_ZEND_MM */ #endif /* HTTP_HAVE_CURL */ #ifdef ZEND_ENGINE_2 @@ -353,7 +320,7 @@ PHP_MINFO_FUNCTION(http) 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();