cvs: php-src(PHP_4_3) /ext/curl curl.c
| From: | Jani Taskinen | Date: | Sun, 20 Jul 2003 15:19:40 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/curl curl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-22668@lists.php.net to get a copy of this message | ||
sniper Sun Jul 20 11:19:40 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/curl curl.c
Log:
- CURLOPT_ENCODING is always defined, check the version instead.
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.12 php-src/ext/curl/curl.c:1.124.2.13
--- php-src/ext/curl/curl.c:1.124.2.12 Thu Jun 19 18:18:58 2003
+++ php-src/ext/curl/curl.c Sun Jul 20 11:19:39 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: curl.c,v 1.124.2.12 2003/06/19 22:18:58 iliaa Exp $ */
+/* $Id: curl.c,v 1.124.2.13 2003/07/20 15:19:39 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -191,7 +191,7 @@
REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE);
REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE_DEFAULT);
REGISTER_CURL_CONSTANT(CURLOPT_CRLF);
-#ifdef CURLOPT_ENCODING
+#if LIBCURL_VERSION_NUM >= 0x070a00
REGISTER_CURL_CONSTANT(CURLOPT_ENCODING);
#endif
@@ -740,7 +740,7 @@
case CURLOPT_SSLKEYTYPE:
case CURLOPT_SSLKEYPASSWD:
case CURLOPT_SSLENGINE:
-#ifdef CURLOPT_ENCODING
+#if LIBCURL_VERSION_NUM >= 0x070a00
case CURLOPT_ENCODING:
#endif
case CURLOPT_SSLENGINE_DEFAULT: {