- use &EG(symbol_table)'s HTTP_SERVER_VARS instead of

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index d2a8445e47211f3edad819aadce0045357bafc02..5bb5b6580ad203939f80d56d1a34fcdeb75987e9 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -20,6 +20,8 @@
 #endif
 #include "php.h"
 
+#ifdef HTTP_HAVE_CURL
+
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
@@ -39,10 +41,6 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-#ifndef HTTP_CURL_USE_ZEND_MM
-#      define HTTP_CURL_USE_ZEND_MM 0
-#endif
-
 #if LIBCURL_VERSION_NUM < 0x070c00
 #      define curl_easy_strerror(code) HTTP_G(request).error
 #endif
@@ -119,35 +117,6 @@ static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { r
 static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC);
 
 
-#if HTTP_CURL_USE_ZEND_MM
-static void http_curl_free(void *p)                                    { efree(p); }
-static char *http_curl_strdup(const char *p)           { return estrdup(p); }
-static void *http_curl_malloc(size_t s)                                { return emalloc(s); }
-static void *http_curl_realloc(void *p, size_t s)      { return erealloc(p, s); }
-static void *http_curl_calloc(size_t n, size_t s)      { return ecalloc(n, s); }
-#endif
-
-/* {{{ STATUS http_request_global_init() */
-STATUS _http_request_global_init(void)
-{
-#if HTTP_CURL_USE_ZEND_MM
-       if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL,
-                       http_curl_malloc,
-                       http_curl_free,
-                       http_curl_realloc,
-                       http_curl_strdup,
-                       http_curl_calloc)) {
-               return FAILURE;
-       }
-#else
-       if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
-               return FAILURE;
-       }
-#endif
-       return SUCCESS;
-}
-/* }}} */
-
 /* {{{ void *http_request_data_copy(int, void *) */
 void *_http_request_data_copy(int type, void *data TSRMLS_DC)
 {
@@ -1005,6 +974,8 @@ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t k
 }
 /* }}} */
 
+#endif
+
 /*
  * Local variables:
  * tab-width: 4