X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=567d45668156a84bfe264067af07d69b35a71cdd;hp=2402ccba6b7fd761c9ac943106306833f38c5430;hb=5de7bf562f55eae49d3424670ad56f68458ad7f1;hpb=2e1cd7f9942bb07d7c3a2efb79090215fc1406d6 diff --git a/http.c b/http.c index 2402ccb..567d456 100644 --- a/http.c +++ b/http.c @@ -1,16 +1,13 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2005, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ @@ -21,6 +18,8 @@ #endif #include "php.h" +#include "zend_extensions.h" + #include "SAPI.h" #include "php_ini.h" #include "ext/standard/info.h" @@ -37,6 +36,7 @@ #endif #ifdef ZEND_ENGINE_2 +# include "php_http_filter_api.h" # include "php_http_util_object.h" # include "php_http_message_object.h" # ifndef WONKY @@ -61,6 +61,9 @@ #ifdef HTTP_HAVE_MHASH # include #endif +#ifdef HTTP_HAVE_ZLIB +# include +#endif #include @@ -77,8 +80,8 @@ zend_function_entry http_functions[] = { PHP_FE(http_date, NULL) PHP_FE(http_build_uri, NULL) PHP_FALIAS(http_absolute_uri, http_build_uri, NULL) - PHP_FE(http_negotiate_language, NULL) - PHP_FE(http_negotiate_charset, 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) @@ -114,14 +117,37 @@ zend_function_entry http_functions[] = { PHP_FE(http_build_query, NULL) #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) +#endif + PHP_FE(http_support, NULL) EMPTY_FUNCTION_ENTRY }; /* }}} */ +/* {{{ http_module_dep */ +#if ZEND_EXTENSION_API_NO >= 220050617 +static zend_module_dep http_module_dep[] = { +# ifdef HAVE_SPL + ZEND_MOD_REQUIRED("spl") +# endif + {NULL, NULL, NULL, 0} +}; +#endif +/* }}} */ + /* {{{ http_module_entry */ zend_module_entry http_module_entry = { -#if ZEND_MODULE_API_NO >= 20010901 +#if ZEND_EXTENSION_API_NO >= 220050617 + STANDARD_MODULE_HEADER_EX, NULL, + http_module_dep, +#else STANDARD_MODULE_HEADER, #endif "http", @@ -131,9 +157,7 @@ zend_module_entry http_module_entry = { PHP_RINIT(http), PHP_RSHUTDOWN(http), PHP_MINFO(http), -#if ZEND_MODULE_API_NO >= 20010901 HTTP_PEXT_VERSION, -#endif STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -193,6 +217,11 @@ PHP_INI_MH(http_update_allowed_methods) return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); } +#undef CASE_HTTP_ETAG_HASH +#define CASE_HTTP_ETAG_HASH(HASH) \ + case HTTP_ETAG_##HASH: \ + ZEND_WRITE("HTTP_ETAG_"#HASH, lenof("HTTP_ETAG_"#HASH)); \ + break; PHP_INI_DISP(http_etag_mode_displayer) { long value; @@ -207,20 +236,19 @@ 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; - - case HTTP_ETAG_MD5: +#ifdef HTTP_HAVE_HASH_EXT + CASE_HTTP_ETAG_HASH(RIPEMD160); + CASE_HTTP_ETAG_HASH(RIPEMD128); + CASE_HTTP_ETAG_HASH(SHA512); + CASE_HTTP_ETAG_HASH(SHA384); + CASE_HTTP_ETAG_HASH(SHA256); +#endif + CASE_HTTP_ETAG_HASH(CRC32); + CASE_HTTP_ETAG_HASH(SHA1); #ifndef HTTP_HAVE_MHASH default: #endif - ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5")); - break; + CASE_HTTP_ETAG_HASH(MD5); #ifdef HTTP_HAVE_MHASH default: @@ -249,10 +277,11 @@ PHP_INI_BEGIN() 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) + HTTP_PHP_INI_ENTRY_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, etag.mode) #ifdef ZEND_ENGINE_2 HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions) #endif - HTTP_PHP_INI_ENTRY_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, etag.mode) + HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit) PHP_INI_END() /* }}} */ @@ -265,32 +294,30 @@ PHP_MINIT_FUNCTION(http) REGISTER_INI_ENTRIES(); - 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; - } + if ( (SUCCESS != PHP_MINIT_CALL(http_support)) || + (SUCCESS != PHP_MINIT_CALL(http_headers)) || + (SUCCESS != PHP_MINIT_CALL(http_cache)) || #ifdef HTTP_HAVE_CURL - if (SUCCESS != http_request_global_init()) { + (SUCCESS != PHP_MINIT_CALL(http_request)) || +#endif /* HTTP_HAVE_CURL */ + (SUCCESS != PHP_MINIT_CALL(http_request_method))) { return FAILURE; } -#endif /* HTTP_HAVE_CURL */ #ifdef ZEND_ENGINE_2 - http_util_object_init(); - http_message_object_init(); + if ( (SUCCESS != PHP_MINIT_CALL(http_filter)) || + (SUCCESS != PHP_MINIT_CALL(http_util_object)) || + (SUCCESS != PHP_MINIT_CALL(http_message_object)) || # ifndef WONKY - http_response_object_init(); -# endif + (SUCCESS != PHP_MINIT_CALL(http_response_object)) || +# endif /* WONKY */ # ifdef HTTP_HAVE_CURL - http_request_object_init(); - http_requestpool_object_init(); + (SUCCESS != PHP_MINIT_CALL(http_request_object)) || + (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))|| # endif /* HTTP_HAVE_CURL */ - http_exception_object_init(); + (SUCCESS != PHP_MINIT_CALL(http_exception_object))) { + return FAILURE; + } #endif /* ZEND_ENGINE_2 */ return SUCCESS; @@ -302,7 +329,7 @@ PHP_MSHUTDOWN_FUNCTION(http) { UNREGISTER_INI_ENTRIES(); #ifdef HTTP_HAVE_CURL - http_request_global_cleanup(); + return PHP_MSHUTDOWN_CALL(http_request); #endif return SUCCESS; } @@ -311,10 +338,9 @@ PHP_MSHUTDOWN_FUNCTION(http) /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(http) { - char *m; - - if (m = INI_STR("http.allowed_methods")) { - http_check_allowed_methods(m, strlen(m)); + 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); @@ -325,15 +351,14 @@ 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); + STATUS status = SUCCESS; - for (i = 0; i < c; ++i) { - http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i); - } +#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) + status = PHP_RSHUTDOWN_CALL(http_request_method); #endif + http_globals_free(HTTP_GLOBALS); - return SUCCESS; + return status; } /* }}} */ @@ -349,6 +374,17 @@ PHP_MINFO_FUNCTION(http) #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 #ifdef HTTP_HAVE_MHASH { char mhash_info[32]; @@ -386,7 +422,11 @@ PHP_MINFO_FUNCTION(http) php_info_print_table_colspan_header(2, "Supported ETag Hash Algorithms"); { - php_info_print_table_row(2, "PHP", "CRC32, MD5, SHA1"); + php_info_print_table_row(2, "PHP", "CRC32, MD5, SHA1" +#ifdef HTTP_HAVE_HASH_EXT + ", SHA256, SHA384, SHA512, RIPEMD128, RIPEMD160" +#endif + ); #ifdef HTTP_HAVE_MHASH { phpstr *algos = phpstr_new(); @@ -413,6 +453,7 @@ PHP_MINFO_FUNCTION(http) php_info_print_table_colspan_header(2, "Request Methods"); { unsigned i; + HashPosition pos; zval **custom_method; phpstr *known_request_methods = phpstr_new(); phpstr *custom_request_methods = phpstr_new(); @@ -421,7 +462,7 @@ PHP_MINFO_FUNCTION(http) phpstr_appendl(known_request_methods, http_request_method_name(i)); phpstr_appends(known_request_methods, ", "); } - FOREACH_HASH_VAL(&HTTP_G(request).methods.custom, custom_method) { + 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, ", "); }