- fix builds and tests without libcurl linked in

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 192834be53f9476a16060641f9869bddaf8e9fbd..1516aa7ce753f600fb1249cdea70a71b639338c2 100644 (file)
--- a/http.c
+++ b/http.c
@@ -29,7 +29,9 @@
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_send_api.h"
-#include "php_http_request_api.h"
+#ifdef HTTP_HAVE_CURL
+#      include "php_http_request_api.h"
+#endif
 
 #ifdef ZEND_ENGINE_2
 #      include "php_http_util_object.h"
@@ -139,6 +141,7 @@ static inline void http_globals_init(zend_http_globals *G)
        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_curl_callback_ctx *), http_request_data_free_context, 0);
+       zend_llist_init(&G->request.copies.convs, sizeof(http_curl_conv *), http_request_data_free_conv, 0);
 #endif
 }
 
@@ -151,6 +154,7 @@ static inline void http_globals_free(zend_http_globals *G)
        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
 }
 /* }}} */
@@ -177,8 +181,11 @@ PHP_INI_MH(http_update_allowed_methods)
 }
 
 PHP_INI_BEGIN()
-       HTTP_PHP_INI_ENTRY("http.allowed_methods", NULL, PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
-       HTTP_PHP_INI_ENTRY("http.cache_log", NULL, PHP_INI_ALL, OnUpdateString, log.cache)
+       HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
+       HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache)
+#ifdef ZEND_ENGINE_2
+       HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
+#endif
 PHP_INI_END()
 /* }}} */
 
@@ -195,7 +202,7 @@ PHP_MINIT_FUNCTION(http)
        REGISTER_INI_ENTRIES();
 
 #ifdef HTTP_HAVE_CURL
-       if (SUCCESS != http_request_global_init()) {
+       if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
                return FAILURE;
        }
 #endif /* HTTP_HAVE_CURL */
@@ -240,19 +247,9 @@ PHP_RINIT_FUNCTION(http)
 }
 /* }}} */
 
-static int cleanup_statics(void *p TSRMLS_DC)
-{
-       zval_dtor(*(zval **)p);
-       return 0;
-}
-
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
-       /* ZE kludge */
-#ifdef ZEND_ENGINE_2
-       zend_hash_apply(http_response_object_ce->static_members, cleanup_statics TSRMLS_CC);
-#endif
        http_globals_free(HTTP_GLOBALS);
        return SUCCESS;
 }
@@ -291,6 +288,7 @@ PHP_MINFO_FUNCTION(http)
        }
        php_info_print_table_end();
 
+#ifdef HTTP_HAVE_CURL
        php_info_print_table_start();
        {
                unsigned i;
@@ -319,6 +317,7 @@ PHP_MINFO_FUNCTION(http)
                phpstr_free(custom_request_methods);
        }
        php_info_print_table_end();
+#endif
 
        php_info_print_table_start();
        {