X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=26bcf0f1e35580c0bff50a590f380ba644472801;hp=627f5b70dedf9b89c2e94809e8a3f4276fc57319;hb=7482519f97dbcb643318a44da8ba9167205c441a;hpb=61f165688d2cc39424678829a145c8cbab51d1af diff --git a/http.c b/http.c index 627f5b7..26bcf0f 100644 --- a/http.c +++ b/http.c @@ -30,6 +30,7 @@ #include "php_http_api.h" #include "php_http_send_api.h" #include "php_http_cache_api.h" +#include "php_http_headers_api.h" #include "php_http_request_method_api.h" #ifdef HTTP_HAVE_CURL # include "php_http_request_api.h" @@ -57,6 +58,9 @@ # endif # include #endif +#ifdef HTTP_HAVE_MHASH +# include +#endif #include @@ -68,12 +72,13 @@ ZEND_GET_MODULE(http) #endif /* {{{ http_functions[] */ -function_entry http_functions[] = { +zend_function_entry http_functions[] = { PHP_FE(http_test, NULL) PHP_FE(http_date, NULL) - PHP_FE(http_absolute_uri, NULL) - PHP_FE(http_negotiate_language, NULL) - PHP_FE(http_negotiate_charset, NULL) + PHP_FE(http_build_uri, NULL) + PHP_FALIAS(http_absolute_uri, http_build_uri, NULL) + PHP_FE(http_negotiate_language, http_arg_pass_ref_2) + PHP_FE(http_negotiate_charset, http_arg_pass_ref_2) PHP_FE(http_redirect, NULL) PHP_FE(http_throttle, NULL) PHP_FE(http_send_status, NULL) @@ -109,7 +114,8 @@ function_entry http_functions[] = { PHP_FE(http_build_query, NULL) #endif PHP_FE(ob_etaghandler, NULL) - {NULL, NULL, NULL} + + EMPTY_FUNCTION_ENTRY }; /* }}} */ @@ -147,8 +153,8 @@ static inline void http_globals_init(zend_http_globals *G) #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); + zend_llist_init(&G->request.copies.contexts, sizeof(http_request_callback_ctx *), http_request_data_free_context, 0); + zend_llist_init(&G->request.copies.convs, sizeof(http_request_conv *), http_request_data_free_conv, 0); #endif } @@ -201,6 +207,10 @@ PHP_INI_DISP(http_etag_mode_displayer) switch (value) { + case HTTP_ETAG_CRC32: + ZEND_WRITE("HTTP_ETAG_CRC32", lenof("HTTP_ETAG_CRC32")); + break; + case HTTP_ETAG_SHA1: ZEND_WRITE("HTTP_ETAG_SHA1", lenof("HTTP_ETAG_SHA1")); break; @@ -220,7 +230,7 @@ PHP_INI_DISP(http_etag_mode_displayer) if (!hash_name) { ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5")); } else { - ZEND_WRITE("HTTP_ETAG_MHASH|MHASH_", lenof("HTTP_ETAG_MHASH|MHASH_")); + ZEND_WRITE("HTTP_ETAG_MHASH_", lenof("HTTP_ETAG_MHASH_")); ZEND_WRITE(hash_name, strlen(hash_name)); } } @@ -246,7 +256,6 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ - /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(http) { @@ -256,12 +265,17 @@ PHP_MINIT_FUNCTION(http) 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); - + if (SUCCESS != http_headers_global_init()) { + return FAILURE; + } + if (SUCCESS != http_cache_global_init()) { + return FAILURE; + } + if (SUCCESS != http_request_method_global_init()) { + return FAILURE; + } #ifdef HTTP_HAVE_CURL - if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) { + if (SUCCESS != http_request_global_init()) { return FAILURE; } #endif /* HTTP_HAVE_CURL */ @@ -288,7 +302,7 @@ PHP_MSHUTDOWN_FUNCTION(http) { UNREGISTER_INI_ENTRIES(); #ifdef HTTP_HAVE_CURL - curl_global_cleanup(); + http_request_global_cleanup(); #endif return SUCCESS; } @@ -311,6 +325,13 @@ PHP_RINIT_FUNCTION(http) /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(http) { +#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) + int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom); + + for (i = 0; i < c; ++i) { + http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i); + } +#endif http_globals_free(HTTP_GLOBALS); return SUCCESS; } @@ -319,30 +340,31 @@ PHP_RSHUTDOWN_FUNCTION(http) /* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(http) { -#ifdef HTTP_HAVE_CURL -# define HTTP_CURL_VERSION curl_version() -#else -# define HTTP_CURL_VERSION "libcurl not available" -#endif - php_info_print_table_start(); { - char full_version_string[1024] = {0}; - snprintf(full_version_string, 1023, "%s (%s)", HTTP_PEXT_VERSION, HTTP_CURL_VERSION); - - php_info_print_table_row(2, "Extended HTTP support:", "enabled"); - php_info_print_table_row(2, "Extension Version:", full_version_string); + php_info_print_table_row(2, "Extended HTTP support", "enabled"); + php_info_print_table_row(2, "Extension Version", HTTP_PEXT_VERSION); #ifdef HTTP_HAVE_CURL - php_info_print_table_row(2, "cURL HTTP Requests:", "enabled"); + php_info_print_table_row(2, "cURL HTTP Requests", curl_version()); #else - php_info_print_table_row(2, "cURL HTTP Requests:", "disabled"); + php_info_print_table_row(2, "cURL HTTP Requests", "disabled"); #endif #ifdef HTTP_HAVE_MHASH - php_info_print_table_row(2, "mhash ETag Generator:", "enabled"); + { + char mhash_info[32]; + + snprintf(mhash_info, 32, "libmhash/%d", MHASH_API_VERSION); + php_info_print_table_row(2, "mhash ETag Generator", mhash_info); + } +#else + php_info_print_table_row(2, "mhash ETag Generator", "disabled"); +#endif +#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY) + php_info_print_table_row(2, "magic MIME Guessing", "libmagic/unknown"); #else - php_info_print_table_row(2, "mhash ETag Generator:", "disabled"); + php_info_print_table_row(2, "magic MIME Guessing", "disabled"); #endif - php_info_print_table_row(2, "Registered Classes:", + php_info_print_table_row(2, "Registered Classes", #ifndef ZEND_ENGINE_2 "none" #else @@ -359,8 +381,36 @@ PHP_MINFO_FUNCTION(http) ); } php_info_print_table_end(); + + php_info_print_table_start(); + php_info_print_table_colspan_header(2, "Supported ETag Hash Algorithms"); + { + + php_info_print_table_row(2, "PHP", "CRC32, MD5, SHA1"); +#ifdef HTTP_HAVE_MHASH + { + phpstr *algos = phpstr_new(); + int i, c = mhash_count(); + + for (i = 0; i <= c; ++i) { + const char *hash = mhash_get_hash_name_static(i); + + if (hash) { + phpstr_appendf(algos, "%s, ", hash); + } + } + phpstr_fix(algos); + php_info_print_table_row(2, "MHASH", PHPSTR_VAL(algos)); + phpstr_free(&algos); + } +#else + php_info_print_table_row(2, "MHASH", "not available"); +#endif + } + php_info_print_table_end(); php_info_print_table_start(); + php_info_print_table_colspan_header(2, "Request Methods"); { unsigned i; zval **custom_method; @@ -380,10 +430,11 @@ PHP_MINFO_FUNCTION(http) phpstr_fix(known_request_methods); phpstr_fix(custom_request_methods); - php_info_print_table_row(2, "Known Request Methods:", PHPSTR_VAL(known_request_methods)); - php_info_print_table_row(2, "Custom Request Methods:", + php_info_print_table_row(2, "Known", PHPSTR_VAL(known_request_methods)); + php_info_print_table_row(2, "Custom", PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered"); - + php_info_print_table_row(2, "Allowed", strlen(HTTP_G(request).methods.allowed) ? HTTP_G(request).methods.allowed : "(ANY)"); + phpstr_free(&known_request_methods); phpstr_free(&custom_request_methods); }