X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=bbbb03aa99b20d95bbf32791b357f417c896f6ac;hp=2cc838508ce08922159fa5deb17273fe3119cfa6;hb=98e0618077ab00672dd0e6e134d4722e033d827e;hpb=b20688d08c28e9733ba6c021f5eee460ee6bf07a diff --git a/http.c b/http.c index 2cc8385..bbbb03a 100644 --- a/http.c +++ b/http.c @@ -6,22 +6,18 @@ | 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 - +#define HTTP_WANT_SAPI #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" @@ -29,7 +25,7 @@ #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 @@ -43,6 +39,7 @@ # include "php_http_filter_api.h" # include "php_http_util_object.h" # include "php_http_message_object.h" +# include "php_http_querystring_object.h" # ifndef WONKY # include "php_http_response_object.h" # endif @@ -50,6 +47,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 @@ -65,7 +66,11 @@ ZEND_GET_MODULE(http) zend_function_entry http_functions[] = { PHP_FE(http_test, NULL) PHP_FE(http_date, NULL) - PHP_FE(http_build_url, http_arg_pass_ref_3) + PHP_FE(http_build_url, http_arg_pass_ref_4) + PHP_FE(http_build_str, NULL) +#ifndef ZEND_ENGINE_2 + PHP_FALIAS(http_build_query, http_build_str) +#endif 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) @@ -88,6 +93,7 @@ zend_function_entry http_functions[] = { 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_arg_pass_ref_3) @@ -101,9 +107,6 @@ zend_function_entry http_functions[] = { 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) #ifdef HTTP_HAVE_ZLIB PHP_FE(http_deflate, NULL) @@ -125,6 +128,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 +169,10 @@ 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); +#ifndef HTTP_HAVE_SAPI_RTIME + G->request_time = time(NULL); +#endif + G->read_post_data = 0; } #define http_globals_free(g) _http_globals_free((g) TSRMLS_CC) @@ -171,7 +180,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); } /* }}} */ @@ -230,7 +238,8 @@ 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)) || + (SUCCESS != PHP_MINIT_CALL(http_url)) || #ifdef HTTP_HAVE_CURL (SUCCESS != PHP_MINIT_CALL(http_request)) || #endif /* HTTP_HAVE_CURL */ @@ -245,6 +254,7 @@ PHP_MINIT_FUNCTION(http) if ( (SUCCESS != PHP_MINIT_CALL(http_filter)) || (SUCCESS != PHP_MINIT_CALL(http_util_object)) || (SUCCESS != PHP_MINIT_CALL(http_message_object)) || + (SUCCESS != PHP_MINIT_CALL(http_querystring_object))|| # ifndef WONKY (SUCCESS != PHP_MINIT_CALL(http_response_object)) || # endif /* WONKY */ @@ -252,6 +262,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; } @@ -275,18 +289,20 @@ PHP_MSHUTDOWN_FUNCTION(http) /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(http) { + 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)); } - 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 +313,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)) || -#endif -#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) - (SUCCESS != PHP_RSHUTDOWN_CALL(http_request_method)) || + || (SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding)) #endif - 0) { + ) { status = FAILURE; } @@ -330,9 +343,21 @@ PHP_MINFO_FUNCTION(http) "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 + "http.chunked_decode, http.chunked_encode, http.deflate, http.inflate" #endif ); } @@ -363,19 +388,16 @@ PHP_MINFO_FUNCTION(http) php_info_print_table_start(); php_info_print_table_colspan_header(2, "Request Methods"); { - unsigned i; - HashPosition pos; - zval **custom_method; - phpstr *known_request_methods = phpstr_new(); + 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 = HTTP_NO_REQUEST_METHOD+1; 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 (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)); @@ -385,7 +407,7 @@ PHP_MINFO_FUNCTION(http) 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(HTTP_G(request).methods.allowed) ? HTTP_G(request).methods.allowed : "(ANY)"); + 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);