X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=4c285ef23c8872f2f9c3af4650e11b7a2387a072;hp=eb8f5e92bb09c519a5e023469fc5028849780b8c;hb=d046681a7b929ef813849cfe38fbceb333f0b0eb;hpb=dc76f745ce61ab266f873e80a39604fa91875c3d diff --git a/http.c b/http.c index eb8f5e9..4c285ef 100644 --- a/http.c +++ b/http.c @@ -6,22 +6,18 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - +#define HTTP_WANT_SAPI #define HTTP_WANT_CURL #define HTTP_WANT_ZLIB #define HTTP_WANT_MAGIC #include "php_http.h" -#include "SAPI.h" #include "php_ini.h" #include "ext/standard/info.h" #include "zend_extensions.h" @@ -29,12 +25,15 @@ #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_send_api.h" #include "php_http_message_api.h" #include "php_http_request_method_api.h" #ifdef HTTP_HAVE_CURL # include "php_http_request_api.h" #endif +#ifdef HTTP_HAVE_ZLIB +# include "php_http_encoding_api.h" +#endif #ifdef ZEND_ENGINE_2 # include "php_http_filter_api.h" @@ -47,6 +46,10 @@ # include "php_http_request_object.h" # include "php_http_requestpool_object.h" # endif +# ifdef HTTP_HAVE_ZLIB +# include "php_http_deflatestream_object.h" +# include "php_http_inflatestream_object.h" +# endif # include "php_http_exception_object.h" #endif @@ -62,8 +65,7 @@ ZEND_GET_MODULE(http) zend_function_entry http_functions[] = { PHP_FE(http_test, NULL) PHP_FE(http_date, NULL) - PHP_FE(http_build_uri, NULL) - PHP_FALIAS(http_absolute_uri, http_build_uri, NULL) + PHP_FE(http_build_url, http_arg_pass_ref_4) PHP_FE(http_negotiate_language, http_arg_pass_ref_2) PHP_FE(http_negotiate_charset, http_arg_pass_ref_2) PHP_FE(http_negotiate_content_type, http_arg_pass_ref_2) @@ -86,6 +88,7 @@ zend_function_entry http_functions[] = { PHP_FE(http_parse_cookie, NULL) PHP_FE(http_get_request_headers, NULL) PHP_FE(http_get_request_body, NULL) + PHP_FE(http_get_request_body_stream, NULL) PHP_FE(http_match_request_header, NULL) #ifdef HTTP_HAVE_CURL PHP_FE(http_get, http_arg_pass_ref_3) @@ -104,10 +107,10 @@ zend_function_entry http_functions[] = { #endif PHP_FE(ob_etaghandler, NULL) #ifdef HTTP_HAVE_ZLIB - PHP_FE(http_gzencode, NULL) - PHP_FE(http_gzdecode, NULL) PHP_FE(http_deflate, NULL) PHP_FE(http_inflate, NULL) + PHP_FE(ob_deflatehandler, NULL) + PHP_FE(ob_inflatehandler, NULL) #endif PHP_FE(http_support, NULL) @@ -123,6 +126,9 @@ static zend_module_dep http_module_dep[] = { # endif # ifdef HTTP_HAVE_EXT_HASH ZEND_MOD_REQUIRED("hash") +# endif +# ifdef HAVE_PHP_SESSION + ZEND_MOD_REQUIRED("session") # endif {NULL, NULL, NULL, 0} }; @@ -157,17 +163,20 @@ 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) +#define http_globals_init(g) _http_globals_init((g) TSRMLS_CC) +static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC) { G->send.buffer_size = HTTP_SENDBUF_SIZE; - zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0); +#ifndef HTTP_HAVE_SAPI_RTIME + G->request_time = time(NULL); +#endif } -static inline void http_globals_free(zend_http_globals *G) +#define http_globals_free(g) _http_globals_free((g) TSRMLS_CC) +static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC) { STR_SET(G->send.content_type, NULL); STR_SET(G->send.unquoted_etag, NULL); - zend_hash_destroy(&G->request.methods.custom); } /* }}} */ @@ -207,6 +216,12 @@ PHP_INI_BEGIN() HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions) #endif HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit) +#ifdef HTTP_HAVE_ZLIB + HTTP_PHP_INI_ENTRY("http.ob_inflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.inflate.start_auto) + HTTP_PHP_INI_ENTRY("http.ob_inflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags) + HTTP_PHP_INI_ENTRY("http.ob_deflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.deflate.start_auto) + HTTP_PHP_INI_ENTRY("http.ob_deflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags) +#endif PHP_INI_END() /* }}} */ @@ -220,10 +235,14 @@ PHP_MINIT_FUNCTION(http) REGISTER_INI_ENTRIES(); if ( (SUCCESS != PHP_MINIT_CALL(http_support)) || - (SUCCESS != PHP_MINIT_CALL(http_headers)) || + (SUCCESS != PHP_MINIT_CALL(http_send)) || + (SUCCESS != PHP_MINIT_CALL(http_url)) || #ifdef HTTP_HAVE_CURL (SUCCESS != PHP_MINIT_CALL(http_request)) || #endif /* HTTP_HAVE_CURL */ +#ifdef HTTP_HAVE_ZLIB + (SUCCESS != PHP_MINIT_CALL(http_encoding)) || +#endif (SUCCESS != PHP_MINIT_CALL(http_request_method))) { return FAILURE; } @@ -239,6 +258,10 @@ PHP_MINIT_FUNCTION(http) (SUCCESS != PHP_MINIT_CALL(http_request_object)) || (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))|| # endif /* HTTP_HAVE_CURL */ +# ifdef HTTP_HAVE_ZLIB + (SUCCESS != PHP_MINIT_CALL(http_deflatestream_object)) || + (SUCCESS != PHP_MINIT_CALL(http_inflatestream_object)) || +# endif /* HTTP_HAVE_ZLIB */ (SUCCESS != PHP_MINIT_CALL(http_exception_object))) { return FAILURE; } @@ -262,12 +285,21 @@ PHP_MSHUTDOWN_FUNCTION(http) /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(http) { + http_globals_init(HTTP_GLOBALS); + if (HTTP_G(request).methods.allowed) { http_check_allowed_methods(HTTP_G(request).methods.allowed, strlen(HTTP_G(request).methods.allowed)); } - http_globals_init(HTTP_GLOBALS); + if ( (SUCCESS != PHP_RINIT_CALL(http_request_method)) +#ifdef HTTP_HAVE_ZLIB + || (SUCCESS != PHP_RINIT_CALL(http_encoding)) +#endif + ) { + return FAILURE; + } + return SUCCESS; } /* }}} */ @@ -277,9 +309,13 @@ PHP_RSHUTDOWN_FUNCTION(http) { STATUS status = SUCCESS; -#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) - status = PHP_RSHUTDOWN_CALL(http_request_method); + if ( (SUCCESS != PHP_RSHUTDOWN_CALL(http_request_method)) +#ifdef HTTP_HAVE_ZLIB + || (SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding)) #endif + ) { + status = FAILURE; + } http_globals_free(HTTP_GLOBALS); return status; @@ -291,29 +327,8 @@ PHP_MINFO_FUNCTION(http) { php_info_print_table_start(); { - php_info_print_table_row(2, "Extended HTTP support", "enabled"); + php_info_print_table_row(2, "HTTP Support", "enabled"); php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION); -#ifdef HTTP_HAVE_CURL - php_info_print_table_row(2, "cURL HTTP Requests", curl_version()); -#else - php_info_print_table_row(2, "cURL HTTP Requests", "disabled"); -#endif -#ifdef HTTP_HAVE_ZLIB - { - char my_zlib_version[64] = {0}; - - strlcat(my_zlib_version, "zlib/", 63); - strlcat(my_zlib_version, zlibVersion(), 63); - php_info_print_table_row(2, "zlib GZIP Encodings", my_zlib_version); - } -#else - php_info_print_table_row(2, "zlib GZIP Encodings", "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, "magic MIME Guessing", "disabled"); -#endif php_info_print_table_row(2, "Registered Classes", #ifndef ZEND_ENGINE_2 "none" @@ -324,30 +339,61 @@ PHP_MINFO_FUNCTION(http) "HttpRequest, " "HttpRequestPool, " # endif +# ifdef HTTP_HAVE_ZLIB + "HttpDeflateStream, " + "HttpInflateStream, " +# endif # ifndef WONKY "HttpResponse" # endif #endif ); + php_info_print_table_row(2, "Output Handlers", "ob_deflatehandler, ob_inflatehandler, ob_etaghandler"); + php_info_print_table_row(2, "Stream Filters", +#ifndef ZEND_ENGINE_2 + "none" +#else + "http.chunked_decode, http.chunked_encode, http.deflate, http.inflate" +#endif + ); + } + php_info_print_table_end(); + + php_info_print_table_start(); + php_info_print_table_header(3, "Used Library", "Compiled", "Linked"); + { +#ifdef HTTP_HAVE_CURL + curl_version_info_data *cv = curl_version_info(CURLVERSION_NOW); + php_info_print_table_row(3, "libcurl", LIBCURL_VERSION, cv->version); +#else + php_info_print_table_row(2, "libcurl", "disabled", "disabled"); +#endif +#ifdef HTTP_HAVE_ZLIB + php_info_print_table_row(3, "libz", ZLIB_VERSION, zlibVersion()); +#else + php_info_print_table_row(3, "libz", "disabled", "disabled"); +#endif +#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY) + php_info_print_table_row(3, "libmagic", "unknown", "unknown"); +#else + php_info_print_table_row(3, "libmagic", "disabled", "disabled"); +#endif } php_info_print_table_end(); php_info_print_table_start(); php_info_print_table_colspan_header(2, "Request Methods"); { - unsigned i; - HashPosition pos; - zval **custom_method; - phpstr *known_request_methods = phpstr_new(); + int i; + getGlobals(G); phpstr *custom_request_methods = phpstr_new(); + phpstr *known_request_methods = phpstr_from_string(HTTP_KNOWN_METHODS, lenof(HTTP_KNOWN_METHODS)); + http_request_method_entry **ptr = G->request.methods.custom.entries; - for (i = HTTP_NO_REQUEST_METHOD+1; i < HTTP_MAX_REQUEST_METHOD; ++i) { - phpstr_appendl(known_request_methods, http_request_method_name(i)); - phpstr_appends(known_request_methods, ", "); - } - FOREACH_HASH_VAL(pos, &HTTP_G(request).methods.custom, custom_method) { - phpstr_append(custom_request_methods, Z_STRVAL_PP(custom_method), Z_STRLEN_PP(custom_method)); - phpstr_appends(custom_request_methods, ", "); + for (i = 0; i < G->request.methods.custom.count; ++i) { + if (ptr[i]) { + phpstr_appendf(custom_request_methods, "%s, ", ptr[i]->name); + } } phpstr_append(known_request_methods, PHPSTR_VAL(custom_request_methods), PHPSTR_LEN(custom_request_methods)); @@ -357,7 +403,7 @@ PHP_MINFO_FUNCTION(http) 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)"); + php_info_print_table_row(2, "Allowed", strlen(G->request.methods.allowed) ? G->request.methods.allowed : "(ANY)"); phpstr_free(&known_request_methods); phpstr_free(&custom_request_methods);