X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=f5f66a7f846e599421edc7035669f15b3cd7dcb5;hb=5aa958980652d72433ba8e9e500b8dfd123d56a1;hp=1c4a6a4e5cf19a746139019dfb5056a55803be83;hpb=0acbfc76b5a3e4122a6d06d64bd834a810806656;p=m6w6%2Fext-http diff --git a/http.c b/http.c index 1c4a6a4..f5f66a7 100644 --- a/http.c +++ b/http.c @@ -6,34 +6,38 @@ | 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 -#include "php.h" -#include "zend_extensions.h" +#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" -#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" -#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" @@ -46,23 +50,13 @@ # 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 PHP_WIN32 -# include +# ifdef HTTP_HAVE_ZLIB +# include "php_http_deflatestream_object.h" +# include "php_http_inflatestream_object.h" # endif -# include -#endif -#ifdef HTTP_HAVE_ZLIB -# include +# include "php_http_exception_object.h" #endif -#include ZEND_DECLARE_MODULE_GLOBALS(http); HTTP_DECLARE_ARG_PASS_INFO(); @@ -75,8 +69,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_3) 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) @@ -96,6 +89,7 @@ zend_function_entry http_functions[] = { PHP_FE(http_chunked_decode, NULL) PHP_FE(http_parse_message, NULL) PHP_FE(http_parse_headers, NULL) + PHP_FE(http_parse_cookie, NULL) PHP_FE(http_get_request_headers, NULL) PHP_FE(http_get_request_body, NULL) PHP_FE(http_match_request_header, NULL) @@ -116,12 +110,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(http_compress, NULL) - PHP_FE(http_uncompress, NULL) + PHP_FE(ob_deflatehandler, NULL) + PHP_FE(ob_inflatehandler, NULL) #endif PHP_FE(http_support, NULL) @@ -134,6 +126,12 @@ zend_function_entry http_functions[] = { static zend_module_dep http_module_dep[] = { # ifdef HAVE_SPL ZEND_MOD_REQUIRED("spl") +# endif +# ifdef HTTP_HAVE_EXT_HASH + ZEND_MOD_REQUIRED("hash") +# endif +# ifdef HAVE_PHP_SESSION + ZEND_MOD_REQUIRED("session") # endif {NULL, NULL, NULL, 0} }; @@ -155,7 +153,7 @@ zend_module_entry http_module_entry = { PHP_RINIT(http), PHP_RSHUTDOWN(http), PHP_MINFO(http), - HTTP_PEXT_VERSION, + PHP_EXT_HTTP_VERSION, STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -168,29 +166,17 @@ 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); -#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_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 } -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); -#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 } /* }}} */ @@ -230,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() /* }}} */ @@ -243,10 +235,13 @@ 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)) || #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; } @@ -262,6 +257,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; } @@ -291,6 +290,15 @@ PHP_RINIT_FUNCTION(http) } 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; } /* }}} */ @@ -300,9 +308,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; @@ -314,29 +326,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, "Extension Version", HTTP_PEXT_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, "HTTP Support", "enabled"); + php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION); php_info_print_table_row(2, "Registered Classes", #ifndef ZEND_ENGINE_2 "none" @@ -347,6 +338,10 @@ PHP_MINFO_FUNCTION(http) "HttpRequest, " "HttpRequestPool, " # endif +# ifdef HTTP_HAVE_ZLIB + "HttpDeflateStream, " + "HttpInflateStream, " +# endif # ifndef WONKY "HttpResponse" # endif @@ -355,22 +350,45 @@ PHP_MINFO_FUNCTION(http) } 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; + int i; + getGlobals(G); + struct _entry {char *name; char *cnst;} *entry; phpstr *known_request_methods = phpstr_new(); phpstr *custom_request_methods = phpstr_new(); - for (i = HTTP_NO_REQUEST_METHOD+1; i < HTTP_MAX_REQUEST_METHOD; ++i) { + for (i = HTTP_MIN_REQUEST_METHOD; 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 ((entry = ((struct _entry **) G->request.methods.custom.entries)[i])) { + phpstr_appendf(custom_request_methods, "%s, ", entry->name); + } } phpstr_append(known_request_methods, PHPSTR_VAL(custom_request_methods), PHPSTR_LEN(custom_request_methods));