Merge branch 'jetty-9.3.x'

VERSION.txt

@@ -1,5 +1,25 @@
 jetty-9.4.0-SNAPSHOT
 
+jetty-9.2.16.v20160414 - 14 April 2016
+ + 85 Expose TLS protocol used for connection in SecureRequestCustomizer
+ + 316 add chm mime mapping to mime.properties
+ + 353 Jetty Client doesn't forward authentication headers with redirects when
+   using proxy
+ + 365 Potential connection leakage in case of aborted request
+ + 367 Build downloads from git.eclipse.org
+ + 371 jasper dependencies are outdated in 9.2.x
+ + 377 HttpClient - No supported cipher suites leads to stuck requests.
+ + 418 Javax websocket server impl does not expose all required services as
+   OSGi capabilities
+ + 424 Jetty impl. of Websocket ServerEndpointConfig.Configurator lifecycle out
+   of spec.
+ + 437 NPE is raised inside Jetty websocket client on receiving empty message
+   through MessageHandler.Partial<>
+ + 438 File and Path Resources with control characters should be rejected
+ + 469 Update to support apache jasper 8.0.33
+ + 510 Module [depend] property expansion should support eg
+   foo/${bar}/${bar}-xxx
+
 jetty-9.3.9.M1 - 11 April 2016
  + 481 Event response.success notified without waiting for content callback for
    HTTP/2 transport
@@ -136,18 +156,6 @@ jetty-9.2.15.v20160210 - 10 February 2016
  + 484621 Client hangs till timeout when Authentication.authenticate() throws
    exception.
  + 487511 Jetty HTTP won't work on turkish systems
- + 485535 jetty.sh results in FAILED when running service restart
- + 485663 NullPointerException in WebSocketSession during upgrade with DEBUG
-   logging
- + 485712 Quickstart web.xml is absolute
-
-jetty-9.3.7.v20160115 - 15 January 2016
- + 471171 Support SYNC_FLUSH in GzipHandler
- + 485469 permessage-deflate extension causes protocol error in Firefox/Chrome
- + 485714 Update SSL configuration to mitigate SLOTH vulnerability
- + 485884 WebAppContext defaults should be same for xml or war deployment
- + 485969 WebSocket upgrade response should honor HttpConfiguration server
-   version settings
 
 jetty-9.3.7.RC1 - 13 January 2016
  + 481986 Dead JSR 356 Server Session still being tracked after
@@ -1155,13 +1163,9 @@ jetty-9.2.4.v20141103 - 03 November 2014
  + 446559 Avoid spin consuming extra data
  + 446563 Null HttpChannel.getCurrentHttpChannel() in
    ServletHandler.doFilter().
- + 446564 Refactored RequestLog Mechanism
  + 446672 NPN Specification issue in the case no protocols are selected
  + 446923 SharedBlockingCallback does not handle connector max idle time of
    Long.MAX_VALUE; BlockerTimeoutException not serializable
- + 446944 ServletTester and HttpTester should be in
-   <classifier>tests</classifier>
- + 447216 putAll Properties in XmlConfiguration
  + 447381 Disable SSLv3 by default
  + 447472 test harness for slow large writes
  + 447515 Remove GzipFilter

jetty-start/dependency-reduced-pom.xml

@@ -4,6 +4,7 @@
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
     <version>9.4.0-SNAPSHOT</version>
+    <relativePath>../../../../Code/Jetty/jetty.project/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-start</artifactId>

jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java

@@ -121,7 +121,7 @@ class JarFileResource extends JarResource
         _jarFile=null;
         _list=null;
         
-        int sep = _urlString.indexOf("!/");
+        int sep = _urlString.lastIndexOf("!/");
         _jarUrl=_urlString.substring(0,sep+2);
         _path=_urlString.substring(sep+2);
         if (_path.length()==0)
@@ -322,7 +322,7 @@ class JarFileResource extends JarResource
         }
         
         Enumeration<JarEntry> e=jarFile.entries();
-        String dir=_urlString.substring(_urlString.indexOf("!/")+2);
+        String dir=_urlString.substring(_urlString.lastIndexOf("!/")+2);
         while(e.hasMoreElements())
         {
             JarEntry entry = e.nextElement();               
@@ -392,7 +392,6 @@ class JarFileResource extends JarResource
         
         JarFileResource newResource = new JarFileResource(oldResource.getURL(), false);
         return newResource;
-        
     }
     
     /**
@@ -407,12 +406,12 @@ class JarFileResource extends JarResource
     throws MalformedURLException
     {
         String string = _urlString;
-        int index = string.indexOf("!/");
+        int index = string.lastIndexOf("!/");
         if (index > 0)
             string = string.substring(0,index);
         if (string.startsWith("jar:"))
             string = string.substring(4);
         URL url = new URL(string);
-        return url.sameFile(resource.getURL());     
+        return url.sameFile(resource.getURI().toURL());     
     }
 }