From: Pierre Joye <pajoye@php.net>
Date: Mon, 4 May 2009 14:09:28 +0000 (+0000)
Subject: - [DOC] MFH: #39637, add CURLOPT_FTP_FILEMETHOD which accepts CURLFTPMETHOD_MULTICWD... 
X-Git-Tag: php-5.3.0RC2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93941d1735309bee02e471914753513e27413272;p=php

- [DOC] MFH: #39637, add CURLOPT_FTP_FILEMETHOD which accepts CURLFTPMETHOD_MULTICWD, CURLFTPMETHOD_NOCWD and CURLFTPMETHOD_SINGLECWD
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 97b5586812..dbd36d9f19 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -757,6 +757,13 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
 #endif
 
+#if LIBCURL_VERSION_NUM >= 0x070f01
+	REGISTER_CURL_CONSTANT(CURLOPT_FTP_FILEMETHOD);
+	REGISTER_CURL_CONSTANT(CURLFTPMETHOD_MULTICWD);
+	REGISTER_CURL_CONSTANT(CURLFTPMETHOD_NOCWD);
+	REGISTER_CURL_CONSTANT(CURLFTPMETHOD_SINGLECWD);
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
 	if (!CRYPTO_get_id_callback()) {
 		int i, c = CRYPTO_num_locks();
@@ -1517,6 +1524,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 		case CURLOPT_PROTOCOLS:
 #endif
 		case CURLOPT_IPRESOLVE:
+		case CURLOPT_FTP_FILEMETHOD:
 			convert_to_long_ex(zvalue);
 			error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
 			break;