stas Fri Mar 13 19:43:50 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
Log:
add new CURL options
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.41&r2=1.62.2.14.2.42&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.41
php-src/ext/curl/interface.c:1.62.2.14.2.42
--- php-src/ext/curl/interface.c:1.62.2.14.2.41 Mon Jan 26 15:25:23 2009
+++ php-src/ext/curl/interface.c Fri Mar 13 19:43:49 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.41 2009/01/26 15:25:23 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.42 2009/03/13 19:43:49 stas Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -630,6 +630,24 @@
REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
#endif
+#if LIBCURL_VERSION_NUM >= 0x071304
+ REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS);
+ REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS);
+ REGISTER_CURL_CONSTANT(CURLPROTO_HTTP);
+ REGISTER_CURL_CONSTANT(CURLPROTO_HTTPS);
+ REGISTER_CURL_CONSTANT(CURLPROTO_FTP);
+ REGISTER_CURL_CONSTANT(CURLPROTO_FTPS);
+ REGISTER_CURL_CONSTANT(CURLPROTO_SCP);
+ REGISTER_CURL_CONSTANT(CURLPROTO_SFTP);
+ REGISTER_CURL_CONSTANT(CURLPROTO_TELNET);
+ REGISTER_CURL_CONSTANT(CURLPROTO_LDAP);
+ REGISTER_CURL_CONSTANT(CURLPROTO_LDAPS);
+ REGISTER_CURL_CONSTANT(CURLPROTO_DICT);
+ REGISTER_CURL_CONSTANT(CURLPROTO_FILE);
+ REGISTER_CURL_CONSTANT(CURLPROTO_TFTP);
+ REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
+#endif
+
#ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
@@ -1303,6 +1321,10 @@
#if LIBCURL_VERSION_NUM > 0x070b01 /* CURLOPT_TCP_NODELAY is available since
curl 7.11.2 */
case CURLOPT_TCP_NODELAY:
#endif
+#if LIBCURL_VERSION_NUM >= 0x71304
+ case CURLOPT_REDIR_PROTOCOLS:
+ case CURLOPT_PROTOCOLS:
+#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
