X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=b81c8cb00ff5986a33a6686d73adba3f8cc2b4d2;hp=8930b67939e65efbdc47ae7331d92131a24c8425;hb=3f048c60b3f3b8151eb86121eed8c9b8927c55dc;hpb=4ef2f9e39c8d7c9dc605fb062a50d8a73b52c02a diff --git a/http.c b/http.c index 8930b67..b81c8cb 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" @@ -131,9 +130,23 @@ zend_function_entry http_functions[] = { }; /* }}} */ +/* {{{ 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", @@ -143,9 +156,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 }; /* }}} */ @@ -261,10 +272,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() /* }}} */ @@ -277,29 +289,29 @@ PHP_MINIT_FUNCTION(http) REGISTER_INI_ENTRIES(); - if ( (SUCCESS != http_support_global_init()) || - (SUCCESS != http_headers_global_init()) || - (SUCCESS != http_cache_global_init()) || - (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_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; @@ -311,7 +323,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; } @@ -334,15 +346,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; } /* }}} */ @@ -433,6 +444,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(); @@ -441,7 +453,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, ", "); }