Merge remote-tracking branch 'origin/master'

changelog.html

@@ -70,14 +70,20 @@ Upcoming changes</a>
     Some plugins broken since 1.584 if they expected certain events to be fired under a specific user ID.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-25400">issue 25400</a>)
   <li class=bug>
-    Fixed various real or potential resource leaks.
+    Fixed various real or potential resource leaks discovered by <a href="https://scan.coverity.com/projects/94/">Coverity Scan</code>
     (<a href="https://github.com/jenkinsci/jenkins/pull/1434">pull request 1434</a>)  
-  <li class=fre>
-    Expose AbstractProject.AbstractProjectDescriptor#validateLabelExpression for plugins.
+  <li class=rfe>
+    API changes: Expose <code>AbstractProject.AbstractProjectDescriptor#validateLabelExpression</code> for plugins.
     (<a href="https://github.com/jenkinsci/jenkins/pull/1456">pull request 1456</a>)
-  <li class=fre>
-    Aggregate multiple FormValidations into one.
+  <li class=rfe>
+    API method to aggregate multiple FormValidations into one.
     (<a href="https://github.com/jenkinsci/jenkins/pull/1458">pull request 1458</a>)
+  <li class=bug>
+    Always use forward slashes in path separators during in ZIP archives generated by Directory Browser
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22514">issue 22514</a>)  
+  <li class=rfe>
+    API method to get non-null <code>Jenkins</code> instance with internal validation
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-23339">issue 23339</a>)    
 </ul>
 </div><!--=END=-->
 <h3><a name=v1.589>What's new in 1.589</a> (2014/11/09)</h3>

core/src/main/java/hudson/model/DirectoryBrowserSupport.java

@@ -354,7 +354,11 @@ public final class DirectoryBrowserSupport implements HttpResponse {
             } else {
                 relativePath = n;
             }
-            ZipEntry e = new ZipEntry(relativePath);
+            // In ZIP archives "All slashes MUST be forward slashes" (http://pkware.com/documents/casestudies/APPNOTE.TXT)
+            // TODO On Linux file names can contain backslashes which should not treated as file separators.
+            //      Unfortunately, only the file separator char of the master is known (File.separatorChar)
+            //      but not the file separator char of the (maybe remote) "dir".
+            ZipEntry e = new ZipEntry(relativePath.replace('\\', '/'));
             VirtualFile f = dir.child(n);
             e.setTime(f.lastModified());
             zos.putNextEntry(e);