| 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$ */
-#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_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_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
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)
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)
# endif
# ifdef HTTP_HAVE_EXT_HASH
ZEND_MOD_REQUIRED("hash")
+# endif
+# ifdef HAVE_PHP_SESSION
+ ZEND_MOD_REQUIRED("session")
# endif
{NULL, NULL, NULL, 0}
};
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
}
#define http_globals_free(g) _http_globals_free((g) TSRMLS_CC)
{
STR_SET(G->send.content_type, NULL);
STR_SET(G->send.unquoted_etag, NULL);
- zend_hash_destroy(&G->request.methods.custom);
}
/* }}} */
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 */
(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)
{
+ 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;
}
{
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;
}
"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
);
}
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));
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);