Index: E:/Projets/OSS/wagon/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java =================================================================== --- E:/Projets/OSS/wagon/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java (revision 420520) +++ E:/Projets/OSS/wagon/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java (working copy) @@ -156,7 +156,7 @@ } } - if ( proxyInfo != null && proxyInfo.getHost() != null ) + if ( proxyInfo != null && proxyInfo.getHost() != null && !proxyInfo.isNonProxyHost(host)) { Proxy proxy; @@ -300,13 +300,13 @@ output.add( line ); } } - + // drain the output stream. // TODO: we'll save this for the 1.0-alpha-8 line, so we can test it more. the -q arg in the // unzip command should keep us until then... // int avail = in.available(); // byte[] trashcan = new byte[1024]; -// +// // while( ( avail = in.available() ) > 0 ) // { // in.read( trashcan, 0, avail );