shire Fri May 8 03:33:06 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
MFH: Add missing #ifdef for curl version that does not have FTP_FILEMETHOD or
IPRESOLVE options. related to fix for bug #39637
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.38&r2=1.62.2.14.2.27.2.39&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.38
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.39
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.38 Mon May 4 14:11:45 2009
+++ php-src/ext/curl/interface.c Fri May 8 03:33:06 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.38 2009/05/04 14:11:45 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.39 2009/05/08 03:33:06 shire Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -449,10 +449,12 @@
of options and which version they were introduced */
/* Constants for curl_setopt() */
+#if LIBCURL_VERSION_NUM > 0x070a07 /* CURLOPT_IPRESOLVE is available since
curl 7.10.8 */
REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE);
REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V4);
REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V6);
+#endif
REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
REGISTER_CURL_CONSTANT(CURLOPT_PORT);
@@ -1528,8 +1530,12 @@
case CURLOPT_REDIR_PROTOCOLS:
case CURLOPT_PROTOCOLS:
#endif
+#if LIBCURL_VERSION_NUM > 0x070a07 /* CURLOPT_IPRESOLVE is available since
curl 7.10.8 */
case CURLOPT_IPRESOLVE:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x070f01
case CURLOPT_FTP_FILEMETHOD:
+#endif
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch->cp, option,
Z_LVAL_PP(zvalue));
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
