[PHP-CVS] cvs: php-src /ext/curl interface.c

[Pierre-Alain Joye]

pajoye          Mon May  4 14:09:13 2009 UTC

  Modified files:              
    /php-src/ext/curl   interface.c 
  Log:
  - [DOC] #39637, add CURLOPT_FTP_FILEMETHOD which accepts 
CURLFTPMETHOD_MULTICWD, CURLFTPMETHOD_NOCWD and CURLFTPMETHOD_SINGLECWD
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.154&r2=1.155&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.154 php-src/ext/curl/interface.c:1.155
--- php-src/ext/curl/interface.c:1.154  Mon May  4 12:12:40 2009
+++ php-src/ext/curl/interface.c        Mon May  4 14:09:12 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.154 2009/05/04 12:12:40 pajoye Exp $ */
+/* $Id: interface.c,v 1.155 2009/05/04 14:09:12 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -757,6 +757,13 @@
        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();
@@ -1530,6 +1537,7 @@
                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;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php