X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=dc8d7dd7c44f68bec6d5118320d88a7d25b8cc88;hp=62f86ab011d108cbdb08c042472eb6b5d6180079;hb=f030576e6647dcb0cb21a24e8d51eddd56204357;hpb=96f5c917e43d94f2d5d7f092a09422db6b13f307 diff --git a/http.c b/http.c index 62f86ab..dc8d7dd 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" @@ -51,8 +45,18 @@ # include "php_http_exception_object.h" #endif +#include "missing.h" #include "phpstr/phpstr.h" +#ifdef HTTP_HAVE_CURL +# ifdef PHP_WIN32 +# include +# endif +# include +#endif + +#include + ZEND_DECLARE_MODULE_GLOBALS(http); HTTP_DECLARE_ARG_PASS_INFO(); @@ -81,9 +85,10 @@ 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_arg_pass_ref_3) @@ -97,8 +102,6 @@ function_entry http_functions[] = { PHP_FE(http_request_method_exists, NULL) PHP_FE(http_request_method_name, NULL) #endif - PHP_FE(http_auth_basic, NULL) - PHP_FE(http_auth_basic_cb, NULL) #ifndef ZEND_ENGINE_2 PHP_FE(http_build_query, NULL) #endif @@ -129,25 +132,34 @@ zend_module_entry http_module_entry = { int http_module_number; /* {{{ 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.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 } /* }}} */ @@ -172,9 +184,20 @@ PHP_INI_MH(http_update_allowed_methods) return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); } +#ifndef ZEND_ENGINE_2 +# define OnUpdateLong OnUpdateInt +#endif + 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() /* }}} */ @@ -184,11 +207,16 @@ 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 - if (SUCCESS != http_request_global_init()) { + if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) { return FAILURE; } #endif /* HTTP_HAVE_CURL */ @@ -196,7 +224,9 @@ PHP_MINIT_FUNCTION(http) #ifdef ZEND_ENGINE_2 http_util_object_init(); http_message_object_init(); +# ifndef WONKY http_response_object_init(); +# endif # ifdef HTTP_HAVE_CURL http_request_object_init(); http_requestpool_object_init(); @@ -274,6 +304,7 @@ PHP_MINFO_FUNCTION(http) } php_info_print_table_end(); +#ifdef HTTP_HAVE_CURL php_info_print_table_start(); { unsigned i; @@ -298,10 +329,11 @@ 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(); {