- add ob_(deflate|inflate)handler

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 1c4a6a4e5cf19a746139019dfb5056a55803be83..5da35c5e1ed2376ba07c0c6824159a19d142d2fa 100644 (file)
--- a/http.c
+++ b/http.c
@@ -12,28 +12,32 @@
 
 /* $Id$ */
 
-
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-#include "php.h"
 
-#include "zend_extensions.h"
+#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.h"
-#include "php_http_std_defs.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_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
 
 #ifdef ZEND_ENGINE_2
 #      include "php_http_filter_api.h"
@@ -49,20 +53,6 @@
 #      include "php_http_exception_object.h"
 #endif
 
-#include "missing.h"
-#include "phpstr/phpstr.h"
-
-#ifdef HTTP_HAVE_CURL
-#      ifdef PHP_WIN32
-#              include <winsock2.h>
-#      endif
-#      include <curl/curl.h>
-#endif
-#ifdef HTTP_HAVE_ZLIB
-#      include <zlib.h>
-#endif
-
-#include <ctype.h>
 
 ZEND_DECLARE_MODULE_GLOBALS(http);
 HTTP_DECLARE_ARG_PASS_INFO();
@@ -75,8 +65,7 @@ ZEND_GET_MODULE(http)
 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_3)
        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)
@@ -96,6 +85,7 @@ zend_function_entry http_functions[] = {
        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_match_request_header, NULL)
@@ -116,12 +106,10 @@ zend_function_entry http_functions[] = {
 #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)
        
@@ -134,6 +122,9 @@ zend_function_entry http_functions[] = {
 static zend_module_dep http_module_dep[] = {
 #      ifdef HAVE_SPL
        ZEND_MOD_REQUIRED("spl")
+#      endif
+#      ifdef HTTP_HAVE_EXT_HASH
+       ZEND_MOD_REQUIRED("hash")
 #      endif
        {NULL, NULL, NULL, 0}
 };
@@ -155,7 +146,7 @@ zend_module_entry http_module_entry = {
        PHP_RINIT(http),
        PHP_RSHUTDOWN(http),
        PHP_MINFO(http),
-       HTTP_PEXT_VERSION,
+       PHP_EXT_HTTP_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -168,29 +159,19 @@ static void http_globals_init_once(zend_http_globals *G)
        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);
-#endif
 }
 
-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
 }
 /* }}} */
 
@@ -230,6 +211,12 @@ PHP_INI_BEGIN()
        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()
 /* }}} */
 
@@ -247,6 +234,9 @@ PHP_MINIT_FUNCTION(http)
 #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;
        }
@@ -291,6 +281,13 @@ PHP_RINIT_FUNCTION(http)
        }
 
        http_globals_init(HTTP_GLOBALS);
+
+#ifdef HTTP_HAVE_ZLIB  
+       if (SUCCESS != PHP_RINIT_CALL(http_encoding)) {
+               return FAILURE;
+       }
+#endif
+       
        return SUCCESS;
 }
 /* }}} */
@@ -300,9 +297,16 @@ PHP_RSHUTDOWN_FUNCTION(http)
 {
        STATUS status = SUCCESS;
        
+       if (
+#ifdef HTTP_HAVE_ZLIB
+               (SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding)) ||
+#endif
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
-       status = PHP_RSHUTDOWN_CALL(http_request_method);
+               (SUCCESS != PHP_RSHUTDOWN_CALL(http_request_method)) ||
 #endif
+       0) {
+               status = FAILURE;
+       }
        
        http_globals_free(HTTP_GLOBALS);
        return status;
@@ -315,7 +319,7 @@ PHP_MINFO_FUNCTION(http)
        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);
+               php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION);
 #ifdef HTTP_HAVE_CURL
                php_info_print_table_row(2, "cURL HTTP Requests", curl_version());
 #else