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

[Pierre-Alain Joye]

pajoye          Sun Jan 25 16:27:27 2009 UTC

  Modified files:              
    /php-src/ext/curl   interface.c 
  Log:
  - [DOC] Add support for SSH via libssh2
   - new constants: CURLE_SSH, CURLSSH_AUTH_NONE, CURLSSH_AUTH_PUBLICKEY, 
CURLSSH_AUTH_PASSWORD, CURLSSH_AUTH_HOST, CURLSSH_AUTH_KEYBOARD, 
CURLSSH_AUTH_DEFAULT, CURLOPT_SSH_AUTH_TYPES, CURLOPT_KEYPASSWD, 
CURLOPT_SSH_PUBLIC_KEYFILE, CURLOPT_SSH_PRIVATE_KEYFILE, 
CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
    See http://curl.haxx.se/libcurl/c/curl_easy_setopt.html fortheir roles or 
usages
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.141&r2=1.142&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.141 php-src/ext/curl/interface.c:1.142
--- php-src/ext/curl/interface.c:1.141  Wed Dec 31 11:12:30 2008
+++ php-src/ext/curl/interface.c        Sun Jan 25 16:27:25 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.141 2008/12/31 11:12:30 sebastian Exp $ */
+/* $Id: interface.c,v 1.142 2009/01/25 16:27:25 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -431,7 +431,7 @@
        }
 #endif
 
-#if defined(CURLVERSION_FOURTH) &&  CURLVERSION_NOW >= CURLVERSION_FOURTH
+#if LIBCURL_VERSION_NUM >= 0x071300
 
        if (d->iconv_ver_num) {
                php_info_print_table_row(2, "IconV Version", d->iconv_ver_num);
@@ -694,7 +694,9 @@
 #if LIBCURL_VERSION_NUM >= 0x070b00
        REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
 #endif
-
+#ifdef LIBCURL_VERSION_NUM >= 0x071300
+       REGISTER_CURL_CONSTANT(CURLE_SSH);
+#endif
        REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
        REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS4);
        REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
@@ -731,6 +733,22 @@
        REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
 #endif
 
+/* SSH support works in 7.19.0+ using libssh2 */
+#ifdef LIBCURL_VERSION_NUM >= 0x071300
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_NONE);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PUBLICKEY);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PASSWORD);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_HOST);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_KEYBOARD);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_DEFAULT);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSH_AUTH_TYPES);
+       REGISTER_CURL_CONSTANT(CURLOPT_KEYPASSWD);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSH_PUBLIC_KEYFILE);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSH_PRIVATE_KEYFILE);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
+       REGISTER_CURL_CONSTANT(CURLE_SSH);
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
        if (!CRYPTO_get_id_callback()) {
                int i, c = CRYPTO_num_locks();
@@ -1454,14 +1472,23 @@
                case CURLOPT_SSLENGINE: 
                case CURLOPT_SSLENGINE_DEFAULT:
                case CURLOPT_SSLCERTTYPE:
-               case CURLOPT_ENCODING: {
+               case CURLOPT_ENCODING:
+#if LIBCURL_VERSION_NUM >= 0x071300
+               case CURLOPT_SSH_PUBLIC_KEYFILE:
+               case CURLOPT_SSH_PRIVATE_KEYFILE: 
+#endif
+               {
 #if LIBCURL_VERSION_NUM < 0x071100
                        char *copystr = NULL;
 #endif
        
                        convert_to_string_ex(zvalue);
 
-                       if (option == CURLOPT_URL) {
+                       if (option == CURLOPT_URL
+#if LIBCURL_VERSION_NUM >= 0x071300
+                               || option == CURLOPT_SSH_PUBLIC_KEYFILE || 
option == CURLOPT_SSH_PRIVATE_KEYFILE
+#endif
+                       ) {
                                
PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1);
                        }
 



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