/* $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_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_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)
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)
if ( (SUCCESS != PHP_MINIT_CALL(http_support)) ||
(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)
{
+ 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
|| (SUCCESS != PHP_RINIT_CALL(http_encoding))