X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=fefdab17c1524283ef747e8dfbbb37e408217a8d;hp=5da35c5e1ed2376ba07c0c6824159a19d142d2fa;hb=e81100d361a8dc48fa491d973e936a19ea428853;hpb=7b88d9022c90eb12e5fe195af8644935141c9d68 diff --git a/http.c b/http.c index 5da35c5..fefdab1 100644 --- a/http.c +++ b/http.c @@ -6,7 +6,7 @@ | 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 | +--------------------------------------------------------------------+ */ @@ -50,6 +50,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 @@ -125,6 +129,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} }; @@ -163,7 +170,6 @@ static void http_globals_init_once(zend_http_globals *G) 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); } #define http_globals_free(g) _http_globals_free((g) TSRMLS_CC) @@ -171,7 +177,6 @@ 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); } /* }}} */ @@ -252,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; } @@ -282,11 +291,13 @@ PHP_RINIT_FUNCTION(http) http_globals_init(HTTP_GLOBALS); + if ( (SUCCESS != PHP_RINIT_CALL(http_request_method)) #ifdef HTTP_HAVE_ZLIB - if (SUCCESS != PHP_RINIT_CALL(http_encoding)) { + || (SUCCESS != PHP_RINIT_CALL(http_encoding)) +#endif + ) { return FAILURE; } -#endif return SUCCESS; } @@ -297,14 +308,11 @@ PHP_RSHUTDOWN_FUNCTION(http) { STATUS status = SUCCESS; - if ( + if ( (SUCCESS != PHP_RSHUTDOWN_CALL(http_request_method)) #ifdef HTTP_HAVE_ZLIB - (SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding)) || + || (SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding)) #endif -#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) - (SUCCESS != PHP_RSHUTDOWN_CALL(http_request_method)) || -#endif - 0) { + ) { status = FAILURE; } @@ -318,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, "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" @@ -351,6 +338,10 @@ PHP_MINFO_FUNCTION(http) "HttpRequest, " "HttpRequestPool, " # endif +# ifdef HTTP_HAVE_ZLIB + "HttpDeflateStream, " + "HttpInflateStream, " +# endif # ifndef WONKY "HttpResponse" # endif @@ -359,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));