ensure options are applied before the headers are set

[m6w6/ext-http] / php_http.c

diff --git a/php_http.c b/php_http.c
index c3838b80b905ac7dee1e6bb4df2af603c438a1e8..f7a0b8698f03012f2d8460532fcdb37504ea5649 100644 (file)
--- a/php_http.c
+++ b/php_http.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -60,9 +60,6 @@ static zend_module_dep http_module_deps[] = {
 #endif
 #ifdef PHP_HTTP_HAVE_JSON
        ZEND_MOD_REQUIRED("json")
-#endif
-#ifdef PHP_HTTP_HAVE_EVENT
-       ZEND_MOD_CONFLICTS("event")
 #endif
        {NULL, NULL, NULL, 0}
 };
@@ -145,6 +142,7 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_filter)
        || SUCCESS != PHP_MINIT_CALL(http_header)
        || SUCCESS != PHP_MINIT_CALL(http_message)
+       || SUCCESS != PHP_MINIT_CALL(http_message_parser)
        || SUCCESS != PHP_MINIT_CALL(http_message_body)
        || SUCCESS != PHP_MINIT_CALL(http_querystring)
        || SUCCESS != PHP_MINIT_CALL(http_client)
@@ -190,9 +188,6 @@ PHP_RINIT_FUNCTION(http)
 {
        if (0
        || SUCCESS != PHP_RINIT_CALL(http_env)
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
-       || SUCCESS != PHP_RINIT_CALL(http_client_curl)
-#endif
        ) {
                return FAILURE;
        }
@@ -203,9 +198,6 @@ PHP_RINIT_FUNCTION(http)
 PHP_RSHUTDOWN_FUNCTION(http)
 {
        if (0
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
-       || SUCCESS != PHP_RSHUTDOWN_CALL(http_client_curl)
-#endif
        || SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
        ) {
                return FAILURE;