Ticket #7690: 7690.4.diff

wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -9 +9 @@
 /**
  * WordPress Filesystem Class for implementing SSH2.
  *
+ * To use this class you must follow these steps for PHP 5.2.6+
+ * 
+ * @contrib http://kevin.vanzonneveld.net/techblog/article/make_ssh_connections_with_php/ - Installation Notes
+ * 
+ * Complie libssh2 (Note: Only 0.14 is officaly working with PHP 5.2.6+ right now.)
+ * 
+ * cd /usr/src
+ * wget http://surfnet.dl.sourceforge.net/sourceforge/libssh2/libssh2-0.14.tar.gz
+ * tar -zxvf libssh2-0.14.tar.gz
+ * cd libssh2-0.14/
+ * ./configure
+ * make all install
+ * 
+ * Note: No not leave the directory yet!
+ * 
+ * Enter: pecl install -f ssh2
+ * 
+ * Copy the ssh.so file it creates to your PHP Module Directory.
+ * Open up your PHP.INI file and look for where extensions are placed.
+ * Add in your PHP.ini file: extension=ssh2.so
+ * 
+ * Restart Apache!
+ * Check phpinfo() streams to confirm that: ssh2.shell, ssh2.exec, ssh2.tunnel, ssh2.scp, ssh2.sftp  exist.
+ * 
+ * 
  * @since 2.7
  * @package WordPress
  * @subpackage Filesystem
@@ -71 +96 @@
                         $this->options['username'] = $opt['username'];
 
                 if ( empty ($opt['password']) )
-                        $this->errors->add('empty_password', __('SSH password is required'));
+                        $this->errors->add('empty_password', __('SSH2 password is required'));
                 else
                         $this->options['password'] = $opt['password'];
 
@@ -103 +128 @@
                         $time_start = time();
             $data = "";
                         while( true ) {
-                            if( (time()-$time_start) > $this->timeout ){
+                            if( (time()-$time_start) > $this->timeout ) {
                                 $this->errors->add('command', sprintf(__('Connection to the server has timeout after %s seconds.'), $this->timeout));
                                 break;
                             }
-                    while( $buf = fread( $stream, strlen($stream) ) ){
+                    while( $buf = fread( $stream, strlen($stream) ) ) {
                         $data .= $buf;
                     }
                         }
@@ -448 +473 @@
         }
 }
 
-?>
- No newline at end of file
+?>