no other SSL libs need this sort of callbacks

diff --git a/package.xml b/package.xml
index 33d50e662bb09b11f7a760f3ee1dff4ab33e6acf..664a401c669ecf3518f88159039088d072c1e8ca 100644 (file)
--- 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>
  </lead>
  <date>2014-08-01</date>
  <version>

-  <release>2.1.0RC1</release>
+  <release>2.1.0dev</release>

   <api>2.1.0</api>
  </version>
  <stability>
   <api>2.1.0</api>
  </version>
  <stability>

diff --git a/php_http.h b/php_http.h
index c549d0639fbc0e04fd51564b225dfa7acead0201..a911044c3c19ed376f8cbe0e6aaae1b615276315 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
 #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
 
 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 30feba0fcd5639b11e44c2e13b485a0632bfbec3..a9950948d1c5ebb66ae8c3e4b9b7568e7ec99b7a 100644 (file)
--- 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>
 #              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 */
 #              endif /* PHP_HTTP_HAVE_OPENSSL || PHP_HTTP_HAVE_GNUTLS */
 #      endif /* PHP_WIN32 */
 #endif /* ZTS && PHP_HTTP_HAVE_SSL */