- curl cannot use zend mm

diff --git a/config.w32 b/config.w32
index 142983669f3089ac8f1385b1d4be34f1aa2c5f41..c70529690fc032826d4682e3919f73080de565b5 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -2,7 +2,6 @@
 // $Id$
 
 ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
 // $Id$
 
 ARG_ENABLE("http", "whether to enable extended HTTP support", "no");

-ARG_WITH("http-curl-zend-mm", "whether ext/http's curl should use zend mm");

 
 if (PHP_HTTP != "no") {
        EXTENSION("http",
 
 if (PHP_HTTP != "no") {
        EXTENSION("http",


@@ -23,9 +22,6 @@ if (PHP_HTTP != "no") {
             CHECK_LIB("zlib.lib", "http", PHP_HTTP) &&
             CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
         AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
             CHECK_LIB("zlib.lib", "http", PHP_HTTP) &&
             CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
         AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");

-               if (PHP_HTTP_CURL_ZEND_MM == "yes") {
-                       AC_DEFINE("HTTP_CURL_USE_ZEND_MM", 1, "CURL library shall use Zend MM");
-               }

     } else {
         WARNING("curl convenience functions not enabled; libraries and headers not found");
     }
     } else {
         WARNING("curl convenience functions not enabled; libraries and headers not found");
     }

diff --git a/http.c b/http.c
index 0acb05c33c85462ddcbc9e1b9214626082f185d4..548c39158bf64d901389b0620d808ab26d089287 100644 (file)
--- a/http.c
+++ b/http.c
@@ -200,7 +200,7 @@ PHP_MINIT_FUNCTION(http)
        REGISTER_INI_ENTRIES();
 
 #ifdef HTTP_HAVE_CURL
        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 */
                return FAILURE;
        }
 #endif /* HTTP_HAVE_CURL */

diff --git a/http_request_api.c b/http_request_api.c
index d2a8445e47211f3edad819aadce0045357bafc02..b6c2e833c8b5bf0808a65b8b41f4ae04a501048d 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -39,10 +39,6 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
 
 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
 #if LIBCURL_VERSION_NUM < 0x070c00
 #      define curl_easy_strerror(code) HTTP_G(request).error
 #endif


@@ -119,35 +115,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);
 
 
 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)
 {
 /* {{{ void *http_request_data_copy(int, void *) */
 void *_http_request_data_copy(int type, void *data TSRMLS_DC)
 {