/* $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"
#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
#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
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)
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_deflate, 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 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
static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
{
G->send.buffer_size = HTTP_SENDBUF_SIZE;
+#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)
REGISTER_INI_ENTRIES();
if ( (SUCCESS != PHP_MINIT_CALL(http_support)) ||
- (SUCCESS != PHP_MINIT_CALL(http_headers)) ||
+ (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 */
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 */
/* {{{ 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);
- 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
status = FAILURE;
}
- http_globals_free(HTTP_GLOBALS);
+ http_globals_free(HTTP_G);
return status;
}
/* }}} */
"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_colspan_header(2, "Request Methods");
{
int i;
- getGlobals(G);
- struct _entry {char *name; char *cnst;} *entry;
- phpstr *known_request_methods = phpstr_new();
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_MIN_REQUEST_METHOD; i < HTTP_MAX_REQUEST_METHOD; ++i) {
- phpstr_appendl(known_request_methods, http_request_method_name(i));
- phpstr_appends(known_request_methods, ", ");
- }
- for (i = 0; i < G->request.methods.custom.count; ++i) {
- if ((entry = ((struct _entry **) G->request.methods.custom.entries)[i])) {
- phpstr_appendf(custom_request_methods, "%s, ", entry->name);
+ for (i = 0; i < HTTP_G->request.methods.custom.count; ++i) {
+ if (ptr[i]) {
+ phpstr_appendf(custom_request_methods, "%s, ", ptr[i]->name);
}
}
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);