X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=4c285ef23c8872f2f9c3af4650e11b7a2387a072;hp=d766e42cf32f667588e5a0cd5d9368881e71f6dd;hb=d046681a7b929ef813849cfe38fbceb333f0b0eb;hpb=16ea91ddd08d15dd9b7206229fec6158f212adaf diff --git a/http.c b/http.c index d766e42..4c285ef 100644 --- a/http.c +++ b/http.c @@ -1,103 +1,76 @@ /* - +----------------------------------------------------------------------+ - | 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-2006, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ +#define HTTP_WANT_SAPI +#define HTTP_WANT_CURL +#define HTTP_WANT_ZLIB +#define HTTP_WANT_MAGIC +#include "php_http.h" -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifdef HTTP_HAVE_CURL -# ifdef PHP_WIN32 -# include -# endif -# include -#endif - -#include - -#include "php.h" #include "php_ini.h" #include "ext/standard/info.h" +#include "zend_extensions.h" -#include "SAPI.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_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" # include "php_http_util_object.h" # include "php_http_message_object.h" -# include "php_http_response_object.h" +# ifndef WONKY +# include "php_http_response_object.h" +# endif # ifdef HTTP_HAVE_CURL # 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 -#include "phpstr/phpstr.h" - -#ifdef HTTP_HAVE_CURL -#ifdef ZEND_ENGINE_2 -static -ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); - -static -ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); - -static -ZEND_BEGIN_ARG_INFO(http_request_info_ref_5, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); -#else -static unsigned char http_request_info_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -static unsigned char http_request_info_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -#endif /* ZEND_ENGINE_2 */ -#endif /* HTTP_HAVE_CURL */ -ZEND_DECLARE_MODULE_GLOBALS(http) +ZEND_DECLARE_MODULE_GLOBALS(http); +HTTP_DECLARE_ARG_PASS_INFO(); #ifdef COMPILE_DL_HTTP ZEND_GET_MODULE(http) #endif /* {{{ http_functions[] */ -function_entry http_functions[] = { +zend_function_entry http_functions[] = { PHP_FE(http_test, NULL) PHP_FE(http_date, NULL) - PHP_FE(http_absolute_uri, NULL) - PHP_FE(http_negotiate_language, NULL) - PHP_FE(http_negotiate_charset, 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) PHP_FE(http_redirect, NULL) + PHP_FE(http_throttle, NULL) PHP_FE(http_send_status, NULL) PHP_FE(http_send_last_modified, NULL) PHP_FE(http_send_content_type, NULL) @@ -110,28 +83,64 @@ function_entry http_functions[] = { PHP_FE(http_send_file, NULL) PHP_FE(http_send_stream, NULL) PHP_FE(http_chunked_decode, NULL) - PHP_FE(http_split_response, 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_get_request_body_stream, NULL) + PHP_FE(http_match_request_header, NULL) #ifdef HTTP_HAVE_CURL - PHP_FE(http_get, http_request_info_ref_3) - PHP_FE(http_head, http_request_info_ref_3) - PHP_FE(http_post_data, http_request_info_ref_4) - PHP_FE(http_post_fields, http_request_info_ref_5) + PHP_FE(http_get, http_arg_pass_ref_3) + PHP_FE(http_head, http_arg_pass_ref_3) + PHP_FE(http_post_data, http_arg_pass_ref_4) + PHP_FE(http_post_fields, http_arg_pass_ref_5) + PHP_FE(http_put_file, http_arg_pass_ref_4) + PHP_FE(http_put_stream, http_arg_pass_ref_4) #endif - PHP_FE(http_auth_basic, NULL) - PHP_FE(http_auth_basic_cb, NULL) + PHP_FE(http_request_method_register, NULL) + PHP_FE(http_request_method_unregister, NULL) + PHP_FE(http_request_method_exists, NULL) + PHP_FE(http_request_method_name, NULL) #ifndef ZEND_ENGINE_2 PHP_FE(http_build_query, NULL) #endif PHP_FE(ob_etaghandler, NULL) - {NULL, NULL, NULL} +#ifdef HTTP_HAVE_ZLIB + 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) + + 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 +# ifdef HTTP_HAVE_EXT_HASH + ZEND_MOD_REQUIRED("hash") +# endif +# ifdef HAVE_PHP_SESSION + ZEND_MOD_REQUIRED("session") +# 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", @@ -141,61 +150,33 @@ 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 + PHP_EXT_HTTP_VERSION, STANDARD_MODULE_PROPERTIES }; /* }}} */ +int http_module_number; -static void free_to_free(void *s) +/* {{{ http_globals */ +static void http_globals_init_once(zend_http_globals *G) { - efree(*(char **)s); + memset(G, 0, sizeof(zend_http_globals)); } -/* {{{ void http_globals_ctor(zend_http_globals *) */ -#define http_globals_ctor _http_globals_ctor -static inline void _http_globals_ctor(zend_http_globals *http_globals) +#define http_globals_init(g) _http_globals_init((g) TSRMLS_CC) +static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC) { - http_globals->etag_started = 0; - http_globals->ctype = NULL; - http_globals->etag = NULL; - http_globals->lmod = 0; -#ifdef HTTP_HAVE_CURL -# if LIBCURL_VERSION_NUM < 0x070c00 - memset(&http_globals->curlerr, 0, sizeof(http_globals->curlerr)); -# endif - zend_llist_init(&http_globals->to_free, sizeof(char *), free_to_free, 0); + G->send.buffer_size = HTTP_SENDBUF_SIZE; +#ifndef HTTP_HAVE_SAPI_RTIME + G->request_time = time(NULL); #endif - http_globals->allowed_methods = NULL; - http_globals->cache_log = NULL; } -/* }}} */ -/* {{{ void http_globals_dtor() */ -#define http_globals_dtor() _http_globals_dtor(TSRMLS_C) -static inline void _http_globals_dtor(TSRMLS_D) +#define http_globals_free(g) _http_globals_free((g) TSRMLS_CC) +static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC) { - HTTP_G(etag_started) = 0; - HTTP_G(lmod) = 0; - - if (HTTP_G(etag)) { - efree(HTTP_G(etag)); - HTTP_G(etag) = NULL; - } - - if (HTTP_G(ctype)) { - efree(HTTP_G(ctype)); - HTTP_G(ctype) = NULL; - } - -#ifdef HTTP_HAVE_CURL -# if LIBCURL_VERSION_NUM < 0x070c00 - memset(&HTTP_G(curlerr), 0, sizeof(HTTP_G(curlerr))); -# endif -#endif - + STR_SET(G->send.content_type, NULL); + STR_SET(G->send.unquoted_etag, NULL); } /* }}} */ @@ -220,51 +201,70 @@ PHP_INI_MH(http_update_allowed_methods) return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); } -#define http_update_cache_log OnUpdateString +#ifndef ZEND_ENGINE_2 +# define OnUpdateLong OnUpdateInt +#endif PHP_INI_BEGIN() - HTTP_INI_ENTRY("http.allowed_methods", HTTP_KNOWN_METHODS, PHP_INI_ALL, allowed_methods) - HTTP_INI_ENTRY("http.cache_log", NULL, PHP_INI_ALL, cache_log) + HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed) + HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache) + 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("http.etag_mode", "MD5", PHP_INI_ALL, OnUpdateString, 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("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() /* }}} */ -/* {{{ HTTP_CURL_USE_ZEND_MM */ -#if defined(HTTP_HAVE_CURL) && defined(HTTP_CURL_USE_ZEND_MM) -static void http_curl_free(void *p) { efree(p); } -static char *http_curl_strdup(const char *p) { return estrdup(p); } -static void *http_curl_malloc(size_t s) { return emalloc(s); } -static void *http_curl_realloc(void *p, size_t s) { return erealloc(p, s); } -static void *http_curl_calloc(size_t n, size_t s) { return ecalloc(n, s); } -#endif /* HTTP_HAVE_CURL && HTTP_CURL_USE_ZEND_MM */ -/* }}} */ - /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(http) { - ZEND_INIT_MODULE_GLOBALS(http, http_globals_ctor, NULL); - REGISTER_INI_ENTRIES(); + http_module_number = module_number; + + ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL) + REGISTER_INI_ENTRIES(); + + if ( (SUCCESS != PHP_MINIT_CALL(http_support)) || + (SUCCESS != PHP_MINIT_CALL(http_send)) || + (SUCCESS != PHP_MINIT_CALL(http_url)) || #ifdef HTTP_HAVE_CURL -# ifdef HTTP_CURL_USE_ZEND_MM - if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL, - http_curl_malloc, - http_curl_free, - http_curl_realloc, - http_curl_strdup, - http_curl_calloc)) { + (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; } -# endif /* HTTP_CURL_USE_ZEND_MM */ -#endif /* HTTP_HAVE_CURL */ #ifdef ZEND_ENGINE_2 - http_util_object_init(INIT_FUNC_ARGS_PASSTHRU); - http_message_object_init(INIT_FUNC_ARGS_PASSTHRU); - http_response_object_init(INIT_FUNC_ARGS_PASSTHRU); + if ( (SUCCESS != PHP_MINIT_CALL(http_filter)) || + (SUCCESS != PHP_MINIT_CALL(http_util_object)) || + (SUCCESS != PHP_MINIT_CALL(http_message_object)) || +# ifndef WONKY + (SUCCESS != PHP_MINIT_CALL(http_response_object)) || +# endif /* WONKY */ # ifdef HTTP_HAVE_CURL - http_request_object_init(INIT_FUNC_ARGS_PASSTHRU); + (SUCCESS != PHP_MINIT_CALL(http_request_object)) || + (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))|| # endif /* HTTP_HAVE_CURL */ - http_exception_object_init(INIT_FUNC_ARGS_PASSTHRU); +# 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; + } #endif /* ZEND_ENGINE_2 */ return SUCCESS; @@ -276,7 +276,7 @@ PHP_MSHUTDOWN_FUNCTION(http) { UNREGISTER_INI_ENTRIES(); #ifdef HTTP_HAVE_CURL - curl_global_cleanup(); + return PHP_MSHUTDOWN_CALL(http_request); #endif return SUCCESS; } @@ -285,8 +285,21 @@ PHP_MSHUTDOWN_FUNCTION(http) /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(http) { - char *allowed_methods = INI_STR("http.allowed_methods"); - http_check_allowed_methods(allowed_methods, strlen(allowed_methods)); + 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)); + } + + if ( (SUCCESS != PHP_RINIT_CALL(http_request_method)) +#ifdef HTTP_HAVE_ZLIB + || (SUCCESS != PHP_RINIT_CALL(http_encoding)) +#endif + ) { + return FAILURE; + } + return SUCCESS; } /* }}} */ @@ -294,45 +307,107 @@ PHP_RINIT_FUNCTION(http) /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(http) { - http_globals_dtor(); - return SUCCESS; + STATUS status = SUCCESS; + + 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; } /* }}} */ /* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(http) { -#ifdef ZEND_ENGINE_2 -# define HTTP_FUNC_AVAIL(CLASS) "procedural, object oriented (" CLASS ")" + php_info_print_table_start(); + { + 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" #else -# define HTTP_FUNC_AVAIL(CLASS) "procedural" -#endif - -#ifdef HTTP_HAVE_CURL -# define HTTP_CURL_VERSION curl_version() -# ifdef ZEND_ENGINE_2 -# define HTTP_CURL_AVAIL(CLASS) "procedural, object oriented (" CLASS ")" -# else -# define HTTP_CURL_AVAIL(CLASS) "procedural" + "HttpUtil, " + "HttpMessage, " +# ifdef HTTP_HAVE_CURL + "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 -# define HTTP_CURL_VERSION "libcurl not available" -# define HTTP_CURL_AVAIL(CLASS) "libcurl not available" + "http.chunked_decode, http.chunked_encode, http.deflate, http.inflate" #endif - - char full_version_string[1024] = {0}; - snprintf(full_version_string, 1023, "%s (%s)", HTTP_PEXT_VERSION, HTTP_CURL_VERSION); - + ); + } + php_info_print_table_end(); + php_info_print_table_start(); - php_info_print_table_row(2, "Extended HTTP support", "enabled"); - php_info_print_table_row(2, "Extension Version:", full_version_string); + 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_header(2, "Functionality", "Availability"); - php_info_print_table_row(2, "Miscellaneous Utilities:", HTTP_FUNC_AVAIL("HttpUtil, HttpMessage")); - php_info_print_table_row(2, "Extended HTTP Responses:", HTTP_FUNC_AVAIL("HttpResponse")); - php_info_print_table_row(2, "Extended HTTP Requests:", HTTP_CURL_AVAIL("HttpRequest")); + php_info_print_table_colspan_header(2, "Request Methods"); + { + 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 = 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)); + phpstr_fix(known_request_methods); + phpstr_fix(custom_request_methods); + + 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(G->request.methods.allowed) ? G->request.methods.allowed : "(ANY)"); + + phpstr_free(&known_request_methods); + phpstr_free(&custom_request_methods); + } php_info_print_table_end(); DISPLAY_INI_ENTRIES();