From: Michael Wallner <mike@php.net>
Date: Mon, 4 Aug 2014 10:01:09 +0000 (+0200)
Subject:  no other SSL libs need this sort of callbacks
X-Git-Tag: RELEASE_2_1_0_RC2~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5f088c7d8efb0eed7de616843075cb5acbd50f6d;p=m6w6%2Fext-http

 no other SSL libs need this sort of callbacks
---

diff --git a/package.xml b/package.xml
index 33d50e6..664a401 100644
--- a/package.xml
+++ b/package.xml
@@ -39,7 +39,7 @@ v2: http://dev.iworks.at/ext-http/lcov/ext/http/
  </lead>
  <date>2014-08-01</date>
  <version>
-  <release>2.1.0RC1</release>
+  <release>2.1.0dev</release>
   <api>2.1.0</api>
  </version>
  <stability>
diff --git a/php_http.h b/php_http.h
index c549d06..a911044 100644
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_PECL_HTTP_VERSION "2.1.0RC2dev"
+#define PHP_PECL_HTTP_VERSION "2.1.0dev"
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
diff --git a/php_http_curl.c b/php_http_curl.c
index 30feba0..a995094 100644
--- a/php_http_curl.c
+++ b/php_http_curl.c
@@ -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 */