cvs: pecl /http config.w32 http.c http_request_api.c

mike            Fri Jul 29 16:35:03 2005 EDT

  Modified files:              
    /pecl/http  config.w32 http.c http_request_api.c 
  Log:
   - curl cannot use zend mm
  
  
http://cvs.php.net/diff.php/pecl/http/config.w32?r1=1.16&r2=1.17&ty=u
Index: pecl/http/config.w32
diff -u pecl/http/config.w32:1.16 pecl/http/config.w32:1.17
--- pecl/http/config.w32:1.16   Fri Jul 22 12:01:57 2005
+++ pecl/http/config.w32        Fri Jul 29 16:35:02 2005
@@ -1,8 +1,7 @@
 // config.w32 for pecl/http
-// $Id: config.w32,v 1.16 2005/07/22 16:01:57 mike Exp $
+// $Id: config.w32,v 1.17 2005/07/29 20:35:02 mike Exp $
 
 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",
@@ -23,9 +22,6 @@
             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");
     }
http://cvs.php.net/diff.php/pecl/http/http.c?r1=1.88&r2=1.89&ty=u
Index: pecl/http/http.c
diff -u pecl/http/http.c:1.88 pecl/http/http.c:1.89
--- pecl/http/http.c:1.88       Fri Jul 29 04:57:31 2005
+++ pecl/http/http.c    Fri Jul 29 16:35:02 2005
@@ -13,7 +13,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: http.c,v 1.88 2005/07/29 08:57:31 mike Exp $ */
+/* $Id: http.c,v 1.89 2005/07/29 20:35:02 mike Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -200,7 +200,7 @@
        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 */
http://cvs.php.net/diff.php/pecl/http/http_request_api.c?r1=1.33&r2=1.34&ty=u
Index: pecl/http/http_request_api.c
diff -u pecl/http/http_request_api.c:1.33 pecl/http/http_request_api.c:1.34
--- pecl/http/http_request_api.c:1.33   Fri Jul 29 04:57:34 2005
+++ pecl/http/http_request_api.c        Fri Jul 29 16:35:02 2005
@@ -13,7 +13,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: http_request_api.c,v 1.33 2005/07/29 08:57:34 mike Exp $ */
+/* $Id: http_request_api.c,v 1.34 2005/07/29 20:35:02 mike Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
@@ -39,10 +39,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 +115,6 @@
 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)
 {