[FIXED JENKINS-20663] For now, go back to using ZipOutputStream from …

…Ant that supports setting the filename encoding (present in java.util.zip only in Java 7+). (cherry picked from commit 84c7625) Conflicts: changelog.html
jenkinsci · Aug 1, 2014 · e6a46d8 · e6a46d8
1 parent 8c70a2b
commit e6a46d8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -40,13 +40,13 @@
 import java.util.StringTokenizer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.util.VirtualFile;
 import org.apache.commons.io.IOUtils;
+import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipOutputStream;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
@@ -340,6 +340,7 @@ private static String createBackRef(int times) {
 
     private static void zip(OutputStream outputStream, VirtualFile dir, String glob) throws IOException {
         ZipOutputStream zos = new ZipOutputStream(outputStream);
+        zos.setEncoding(System.getProperty("file.encoding")); // TODO JENKINS-20663 make this overridable via query parameter
         for (String n : dir.list(glob.length() == 0 ? "**" : glob)) {
             String relativePath;
             if (glob.length() == 0) {