release 2.4.0

[m6w6/ext-http] / php_http_curl.c

diff --git a/php_http_curl.c b/php_http_curl.c
index e9153b1bda9dabbb0e9c05861da589a334803048..a9950948d1c5ebb66ae8c3e4b9b7568e7ec99b7a 100644 (file)
--- a/php_http_curl.c
+++ b/php_http_curl.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -25,11 +25,6 @@
 #              elif defined(PHP_HTTP_HAVE_GNUTLS)
 #                      define PHP_HTTP_NEED_GNUTLS_TSL
 #                      include <gcrypt.h>
-#              else
-#                      warning \
-                               "libcurl was compiled with SSL support, but configure could not determine which" \
-                               "library was used; thus no SSL crypto locking callbacks will be set, which may " \
-                               "cause random crashes on SSL requests"
 #              endif /* PHP_HTTP_HAVE_OPENSSL || PHP_HTTP_HAVE_GNUTLS */
 #      endif /* PHP_WIN32 */
 #endif /* ZTS && PHP_HTTP_HAVE_SSL */
@@ -91,12 +86,6 @@ static struct gcry_thread_cbs php_http_gnutls_tsl = {
 
 PHP_MINIT_FUNCTION(http_curl)
 {
-       php_http_client_factory_driver_t driver = {
-               php_http_curl_client_get_ops(),
-               php_http_curl_client_pool_get_ops(),
-               php_http_curl_client_datashare_get_ops()
-       };
-
 #ifdef PHP_HTTP_NEED_OPENSSL_TSL
        /* mod_ssl, libpq or ext/curl might already have set thread lock callbacks */
        if (!CRYPTO_get_id_callback()) {
@@ -120,10 +109,6 @@ PHP_MINIT_FUNCTION(http_curl)
                return FAILURE;
        }
 
-       if (SUCCESS != php_http_client_factory_add_driver(ZEND_STRL("curl"), &driver)) {
-               return FAILURE;
-       }
-
        return SUCCESS;
 }