- allow to disable zlib support

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 2cc838508ce08922159fa5deb17273fe3119cfa6..039f7206234d9909ebff8751415180651e34c915 100644 (file)
--- a/http.c
+++ b/http.c
@@ -50,6 +50,10 @@
 #              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
 
@@ -125,6 +129,9 @@ static zend_module_dep http_module_dep[] = {
 #      endif
 #      ifdef HTTP_HAVE_EXT_HASH
        ZEND_MOD_REQUIRED("hash")
+#      endif
+#      ifdef HAVE_PHP_SESSION
+       ZEND_MOD_REQUIRED("session")
 #      endif
        {NULL, NULL, NULL, 0}
 };
@@ -163,7 +170,6 @@ static void http_globals_init_once(zend_http_globals *G)
 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);
 }
 
 #define http_globals_free(g) _http_globals_free((g) TSRMLS_CC)
@@ -171,7 +177,6 @@ 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);
 }
 /* }}} */
 
@@ -252,6 +257,10 @@ PHP_MINIT_FUNCTION(http)
                        (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;
        }
@@ -282,11 +291,13 @@ PHP_RINIT_FUNCTION(http)
 
        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;
 }
@@ -297,14 +308,11 @@ PHP_RSHUTDOWN_FUNCTION(http)
 {
        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;
        }
        
@@ -330,6 +338,10 @@ PHP_MINFO_FUNCTION(http)
                        "HttpRequest, "
                        "HttpRequestPool, "
 #      endif
+#      ifdef HTTP_HAVE_ZLIB
+                       "HttpDeflateStream, "
+                       "HttpInflateStream, "
+#      endif
 #      ifndef WONKY
                        "HttpResponse"
 #      endif
@@ -363,19 +375,20 @@ PHP_MINFO_FUNCTION(http)
        php_info_print_table_start();
        php_info_print_table_colspan_header(2, "Request Methods");
        {
-               unsigned i;
-               HashPosition pos;
-               zval **custom_method;
+               int i;
+               getGlobals(G);
+               struct _entry {char *name; char *cnst;} *entry;
                phpstr *known_request_methods = phpstr_new();
                phpstr *custom_request_methods = phpstr_new();
 
-               for (i = HTTP_NO_REQUEST_METHOD+1; i < HTTP_MAX_REQUEST_METHOD; ++i) {
+               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, ", ");
                }
-               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 ((entry = ((struct _entry **) G->request.methods.custom.entries)[i])) {
+                               phpstr_appendf(custom_request_methods, "%s, ", entry->name);
+                       }
                }
 
                phpstr_append(known_request_methods, PHPSTR_VAL(custom_request_methods), PHPSTR_LEN(custom_request_methods));