diff --git a/VERSION.txt b/VERSION.txt index ba933eb51a1..0e91998562a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,6 @@ jetty-9.0.0-SNAPSHOT -jetty-9.0.0.M2 - 05 November 2012 +jetty-9.0.0.M2 - 06 November 2012 + 371170 MongoSessionManager LastAccessTimeTest fails + 391877 org.eclipse.jetty.webapp.FragmentDescriptor incorrectly reporting duplicate others for after ordering @@ -29,6 +29,81 @@ jetty-9.0.0.M2 - 05 November 2012 + JETTY-1549 jetty-maven-plugin fails to reload the LoginService properly + JETTY-1550 virtual WEB-INF not created if project has overlays +jetty-8.1.8.v20121106 - 06 November 2012 + + 371170 MongoSessionManager LastAccessTimeTest fails + + 388675 Non utf8 encoded query strings not decoded to parameter map using + queryEncoding + + 388706 Avoid unnecessary indirection through Charset.name + + 389390 AnnotationConfiguration is ignored if the metadata-complete attribute + is present in an override descriptor regardless of the value + + 389452 if web-fragment metadata-complete==true still scan its related jar if + there there is a ServletContainerInitializer, ensure webapp restarts work + + 389686 Fix reference to org.eclipse.jetty.util.log.stderr.LONG system + property in javadoc for StdErrLog + + 389956 Bad __context set in WebAppContext.start sequence with respect to ENC + setup + + 389965 OPTIONS should allow spaces in comma separated list + + 390108 Servlet 3.0 API for programmatic login doesn't appear to work + + 390161 Apply DeferredAuthentication fix to jaspi + + 390163 Implement ServletRegistration.Dynamic.setServletSecurity + + 390503 http-method-omission element not being processed + + 390560 The method AnnotationParser.getAnnotationHandlers(String) always + returns a empty collection. + + 391080 Multipart temp files can be left on disk from Request.getPart and + getParts + + 391082 No exception if multipart input stream incomplete + + 391188 Files written with Request.getPart().write(filename) should not be + auto-deleted + + 391483 fix bad javadoc example in shutdown handler + + 391622 Be lenient on RFC6265 restriction on duplicate cookie names in same + response + + 391623 Add option to --stop to wait for target jetty to stop + + 391877 org.eclipse.jetty.webapp.FragmentDescriptor incorrectly reporting + duplicate others for after ordering + + 392239 Allow no error-code or exception for error-pages + + 392525 Add option to --stop-wait to specify timeout + + 392641 JDBC Sessions not scavenged if expired during downtime + + 392812 MongoSessionIDManager never purges old sessions + + 393014 Mongodb purgevalid using query for purgeinvalid + + 393015 Mongodb purge not rescheduled + + 393075 Jetty WebSocket client cannot connect to Tomcat WebSocket Server + + 393218 add xsd=application/xml mime mapping to defaults + + 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls + + 393368 min websocket version + + 393383 delay onClose call until closeOut is done + + 393494 HashSessionManager can't delete unrestorable sessions on Windows + + JETTY-1547 Jetty does not honor web.xml + web-app/jsp-config/jsp-property-group/default-content-type + +jetty-7.6.8.v20121106 - 06 November 2012 + + 371170 MongoSessionManager LastAccessTimeTest fails + + 388675 Non utf8 encoded query strings not decoded to parameter map using + queryEncoding + + 389686 Fix reference to org.eclipse.jetty.util.log.stderr.LONG system + property in javadoc for StdErrLog + + 389956 Bad __context set in WebAppContext.start sequence with respect to ENC + setup + + 389965 OPTIONS should allow spaces in comma separated list + + 390161 Apply DeferredAuthentication fix to jaspi + + 390560 The method AnnotationParser.getAnnotationHandlers(String) always + returns a empty collection. + + 391483 fix bad javadoc example in shutdown handler + + 391622 Be lenient on RFC6265 restriction on duplicate cookie names in same + response + + 391623 Add option to --stop to wait for target jetty to stop + + 392239 Allow no error-code or exception for error-pages + + 392525 Add option to --stop-wait to specify timeout + + 392641 JDBC Sessions not scavenged if expired during downtime + + 392812 MongoSessionIDManager never purges old sessions + + 393014 Mongodb purgevalid using query for purgeinvalid + + 393015 Mongodb purge not rescheduled + + 393075 Jetty WebSocket client cannot connect to Tomcat WebSocket Server + + 393218 add xsd=application/xml mime mapping to defaults + + 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls + + 393368 min websocket version + + 393383 delay onClose call until closeOut is done + + 393494 HashSessionManager can't delete unrestorable sessions on Windows + jetty-9.0.0.M1 - 15 October 2012 + 369349 directory with spaces --dry-run fix + 385049 fix issue with pipelined connections when switching protocols diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java index 2d08cf602b5..c9ce1940c93 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java @@ -640,7 +640,6 @@ public class HttpParser _header=null; _value=null; - // now handle the ch if (ch == HttpTokens.CARRIAGE_RETURN || ch == HttpTokens.LINE_FEED) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java index 2891d8bd9ef..a34d4c5aa1d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java @@ -420,39 +420,42 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable switch (header) { case EXPECT: - HttpHeaderValue expect = HttpHeaderValue.CACHE.get(value); - switch (expect == null ? HttpHeaderValue.UNKNOWN : expect) + if (_version.getVersion()>=HttpVersion.HTTP_1_1.getVersion()) { - case CONTINUE: - _expect100Continue = true; - break; + HttpHeaderValue expect = HttpHeaderValue.CACHE.get(value); + switch (expect == null ? HttpHeaderValue.UNKNOWN : expect) + { + case CONTINUE: + _expect100Continue = true; + break; - case PROCESSING: - _expect102Processing = true; - break; + case PROCESSING: + _expect102Processing = true; + break; - default: - String[] values = value.split(","); - for (int i = 0; values != null && i < values.length; i++) - { - expect = HttpHeaderValue.CACHE.get(values[i].trim()); - if (expect == null) - _expect = true; - else + default: + String[] values = value.split(","); + for (int i = 0; values != null && i < values.length; i++) { - switch (expect) + expect = HttpHeaderValue.CACHE.get(values[i].trim()); + if (expect == null) + _expect = true; + else { - case CONTINUE: - _expect100Continue = true; - break; - case PROCESSING: - _expect102Processing = true; - break; - default: - _expect = true; + switch (expect) + { + case CONTINUE: + _expect100Continue = true; + break; + case PROCESSING: + _expect102Processing = true; + break; + default: + _expect = true; + } } } - } + } } break; diff --git a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/TomcatServerQuirksTest.java b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/TomcatServerQuirksTest.java index 754a4199db4..8fdd3a1b67e 100644 --- a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/TomcatServerQuirksTest.java +++ b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/TomcatServerQuirksTest.java @@ -44,14 +44,15 @@ public class TomcatServerQuirksTest * @throws IOException */ @Test - @Ignore("Bug with Transfer-Encoding") - public void testTomcat7_0_32_WithTransferEncoding() throws Exception { + public void testTomcat7_0_32_WithTransferEncoding() throws Exception + { DummyServer server = new DummyServer(); int bufferSize = 512; QueuedThreadPool threadPool = new QueuedThreadPool(); WebSocketClientFactory factory = new WebSocketClientFactory(threadPool, new ZeroMaskGen(), bufferSize); - try { + try + { server.start(); // Setup Client Factory @@ -113,7 +114,9 @@ public class TomcatServerQuirksTest socket.flush(); Assert.assertTrue(dataLatch.await(1000, TimeUnit.SECONDS)); - } finally { + } + finally + { factory.stop(); threadPool.stop(); server.stop();