Merge branch 'master' into JENKINS-14362-jzlib

core/src/main/java/hudson/FilePath.java

@@ -97,6 +97,7 @@ import com.jcraft.jzlib.GZIPOutputStream;
 
 import com.sun.jna.Native;
 import hudson.os.PosixException;
+import java.io.BufferedInputStream;
 import java.util.Enumeration;
 import java.util.logging.Logger;
 import org.apache.tools.ant.taskdefs.Chmod;
@@ -496,7 +497,7 @@ public final class FilePath implements Serializable {
     private static void unzip(File dir, InputStream in) throws IOException {
         File tmpFile = File.createTempFile("tmpzip", null); // uses java.io.tmpdir
         try {
-            // XXX why does this not simply use ZipInputStream?
+            // TODO why does this not simply use ZipInputStream?
             IOUtils.copy(in, tmpFile);
             unzip(dir,tmpFile);
         }
@@ -1663,7 +1664,7 @@ public final class FilePath implements Serializable {
         return act(new FileCallable<String>() {
             private static final long serialVersionUID = 1L;
             public String invoke(File f, VirtualChannel channel) throws IOException {
-                return Util.getDigestOf(new FileInputStream(f));
+                return Util.getDigestOf(new BufferedInputStream(new FileInputStream(f)));
             }
         });
     }