| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $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
-#include "php.h"
-
-#include "zend_extensions.h"
-
-#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/info.h"
+#include "zend_extensions.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_cookie_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
# include "php_http_request_api.h"
#endif
+#ifdef HTTP_HAVE_ZLIB
+# include "php_http_encoding_api.h"
+#endif
+#include "php_http_url_api.h"
#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_querystring_object.h"
# ifndef WONKY
# include "php_http_response_object.h"
# endif
# include "php_http_request_object.h"
# include "php_http_requestpool_object.h"
# endif
-# include "php_http_exception_object.h"
-#endif
-
-#include "missing.h"
-#include "phpstr/phpstr.h"
-
-#ifdef HTTP_HAVE_CURL
-# ifdef PHP_WIN32
-# include <winsock2.h>
+# ifdef HTTP_HAVE_ZLIB
+# include "php_http_deflatestream_object.h"
+# include "php_http_inflatestream_object.h"
# endif
-# include <curl/curl.h>
-#endif
-#ifdef HTTP_HAVE_MHASH
-# include <mhash.h>
-#endif
-#ifdef HTTP_HAVE_ZLIB
-# include <zlib.h>
+# include "php_http_exception_object.h"
#endif
-#include <ctype.h>
ZEND_DECLARE_MODULE_GLOBALS(http);
HTTP_DECLARE_ARG_PASS_INFO();
zend_function_entry http_functions[] = {
PHP_FE(http_test, NULL)
PHP_FE(http_date, NULL)
- PHP_FE(http_build_uri, NULL)
- PHP_FALIAS(http_absolute_uri, http_build_uri, NULL)
+ 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)
PHP_FE(http_redirect, NULL)
PHP_FE(http_throttle, NULL)
PHP_FE(http_send_status, NULL)
PHP_FE(http_chunked_decode, 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_arg_pass_ref_3)
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_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)
+ PHP_FE(ob_deflatehandler, NULL)
+ PHP_FE(ob_inflatehandler, NULL)
#endif
PHP_FE(http_support, NULL)
/* {{{ http_module_dep */
#if ZEND_EXTENSION_API_NO >= 220050617
-static zend_module_dep http_module_dep[] = {
+static zend_module_dep http_module_deps[] = {
# 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
+#ifdef HAVE_ICONV
+ ZEND_MOD_REQUIRED("iconv")
+#endif
{NULL, NULL, NULL, 0}
};
#endif
zend_module_entry http_module_entry = {
#if ZEND_EXTENSION_API_NO >= 220050617
STANDARD_MODULE_HEADER_EX, NULL,
- http_module_dep,
+ http_module_deps,
#else
STANDARD_MODULE_HEADER,
#endif
PHP_RINIT(http),
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
- HTTP_PEXT_VERSION,
+ PHP_EXT_HTTP_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
memset(G, 0, sizeof(zend_http_globals));
}
-static inline void http_globals_init(zend_http_globals *G)
+#define http_globals_init(g) _http_globals_init((g) TSRMLS_CC)
+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);
-#ifdef HTTP_HAVE_CURL
- zend_llist_init(&G->request.copies.strings, sizeof(char *), http_request_data_free_string, 0);
- zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0);
- zend_llist_init(&G->request.copies.contexts, sizeof(http_request_callback_ctx *), http_request_data_free_context, 0);
- zend_llist_init(&G->request.copies.convs, sizeof(http_request_conv *), http_request_data_free_conv, 0);
+#ifndef HTTP_HAVE_SAPI_RTIME
+ G->request_time = time(NULL);
#endif
+ G->read_post_data = 0;
}
-static inline void http_globals_free(zend_http_globals *G)
+#define http_globals_free(g) _http_globals_free((g) TSRMLS_CC)
+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);
-#ifdef HTTP_HAVE_CURL
- zend_llist_clean(&G->request.copies.strings);
- zend_llist_clean(&G->request.copies.slists);
- zend_llist_clean(&G->request.copies.contexts);
- zend_llist_clean(&G->request.copies.convs);
-#endif
}
/* }}} */
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(#HASH, lenof(#HASH)); \
- break;
-PHP_INI_DISP(http_etag_mode_displayer)
-{
- long value;
-
- if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
- value = (ini_entry->orig_value) ? atoi(ini_entry->orig_value) : HTTP_ETAG_MD5;
- } else if (ini_entry->value) {
- value = (ini_entry->value[0]) ? atoi(ini_entry->value) : HTTP_ETAG_MD5;
- } else {
- value = HTTP_ETAG_MD5;
- }
-
- switch (value)
- {
-#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
- CASE_HTTP_ETAG_HASH(MD5);
-
-#ifdef HTTP_HAVE_MHASH
- default:
- {
- const char *hash_name = mhash_get_hash_name_static(value);
-
- if (!hash_name) {
- ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
- } else {
- ZEND_WRITE("HTTP_ETAG_MHASH_", lenof("HTTP_ETAG_MHASH_"));
- ZEND_WRITE(hash_name, strlen(hash_name));
- }
- }
- break;
-#endif
- }
-}
-
#ifndef ZEND_ENGINE_2
# define OnUpdateLong OnUpdateInt
#endif
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)
+ 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()
/* }}} */
REGISTER_INI_ENTRIES();
if ( (SUCCESS != PHP_MINIT_CALL(http_support)) ||
- (SUCCESS != PHP_MINIT_CALL(http_headers)) ||
- (SUCCESS != PHP_MINIT_CALL(http_cache)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_cookie)) ||
+ (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 */
+#ifdef HTTP_HAVE_ZLIB
+ (SUCCESS != PHP_MINIT_CALL(http_encoding)) ||
+#endif
(SUCCESS != PHP_MINIT_CALL(http_request_method))) {
return FAILURE;
}
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 */
(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;
}
/* {{{ PHP_RINIT_FUNCTION */
PHP_RINIT_FUNCTION(http)
{
- 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_G);
+
+ 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
+ || (SUCCESS != PHP_RINIT_CALL(http_encoding))
+#endif
+ ) {
+ return FAILURE;
+ }
+
return SUCCESS;
}
/* }}} */
{
STATUS status = SUCCESS;
-#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
- status = PHP_RSHUTDOWN_CALL(http_request_method);
+ 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);
+ http_globals_free(HTTP_G);
return status;
}
/* }}} */
{
php_info_print_table_start();
{
- php_info_print_table_row(2, "Extended HTTP support", "enabled");
- php_info_print_table_row(2, "Extension Version", HTTP_PEXT_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
-#ifdef HTTP_HAVE_MHASH
- {
- char mhash_info[32];
-
- snprintf(mhash_info, 32, "libmhash/%d", MHASH_API_VERSION);
- php_info_print_table_row(2, "mhash ETag Generator", mhash_info);
- }
-#else
- php_info_print_table_row(2, "mhash ETag Generator", "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, "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"
"HttpRequest, "
"HttpRequestPool, "
# endif
+# ifdef HTTP_HAVE_ZLIB
+ "HttpDeflateStream, "
+ "HttpInflateStream, "
+# endif
# ifndef WONKY
- "HttpResponse"
+ "HttpResponse, "
# endif
+ "HttpQueryString"
+#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
);
}
php_info_print_table_end();
php_info_print_table_start();
- php_info_print_table_colspan_header(2, "Supported ETag Hash Algorithms");
+ php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
{
-
- php_info_print_table_row(2, "PHP", "CRC32, MD5, SHA1"
-#ifdef HTTP_HAVE_HASH_EXT
- ", SHA256, SHA384, SHA512, RIPEMD128, RIPEMD160"
+#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_MHASH
- {
- phpstr *algos = phpstr_new();
- int i, c = mhash_count();
-
- for (i = 0; i <= c; ++i) {
- const char *hash = mhash_get_hash_name_static(i);
-
- if (hash) {
- phpstr_appendf(algos, "%s, ", hash);
- }
- }
- phpstr_fix(algos);
- php_info_print_table_row(2, "MHASH", PHPSTR_VAL(algos));
- phpstr_free(&algos);
- }
+#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(2, "MHASH", "not available");
+ 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;
- phpstr *known_request_methods = phpstr_new();
+ int i;
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 = HTTP_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 < HTTP_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));
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(HTTP_G->request.methods.allowed) ? HTTP_G->request.methods.allowed : "(ANY)");
phpstr_free(&known_request_methods);
phpstr_free(&custom_request_methods);