Merge remote-tracking branch 'origin/jetty-8'
Conflicts: VERSION.txt jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
This commit is contained in:
commit
f336511f87
77
VERSION.txt
77
VERSION.txt
|
@ -1,6 +1,6 @@
|
||||||
jetty-9.0.0-SNAPSHOT
|
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
|
+ 371170 MongoSessionManager LastAccessTimeTest fails
|
||||||
+ 391877 org.eclipse.jetty.webapp.FragmentDescriptor incorrectly reporting
|
+ 391877 org.eclipse.jetty.webapp.FragmentDescriptor incorrectly reporting
|
||||||
duplicate others for after ordering
|
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-1549 jetty-maven-plugin fails to reload the LoginService properly
|
||||||
+ JETTY-1550 virtual WEB-INF not created if project has overlays
|
+ 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
|
jetty-9.0.0.M1 - 15 October 2012
|
||||||
+ 369349 directory with spaces --dry-run fix
|
+ 369349 directory with spaces --dry-run fix
|
||||||
+ 385049 fix issue with pipelined connections when switching protocols
|
+ 385049 fix issue with pipelined connections when switching protocols
|
||||||
|
|
|
@ -640,7 +640,6 @@ public class HttpParser
|
||||||
_header=null;
|
_header=null;
|
||||||
_value=null;
|
_value=null;
|
||||||
|
|
||||||
|
|
||||||
// now handle the ch
|
// now handle the ch
|
||||||
if (ch == HttpTokens.CARRIAGE_RETURN || ch == HttpTokens.LINE_FEED)
|
if (ch == HttpTokens.CARRIAGE_RETURN || ch == HttpTokens.LINE_FEED)
|
||||||
{
|
{
|
||||||
|
|
|
@ -420,39 +420,42 @@ public class HttpChannel<T> implements HttpParser.RequestHandler<T>, Runnable
|
||||||
switch (header)
|
switch (header)
|
||||||
{
|
{
|
||||||
case EXPECT:
|
case EXPECT:
|
||||||
HttpHeaderValue expect = HttpHeaderValue.CACHE.get(value);
|
if (_version.getVersion()>=HttpVersion.HTTP_1_1.getVersion())
|
||||||
switch (expect == null ? HttpHeaderValue.UNKNOWN : expect)
|
|
||||||
{
|
{
|
||||||
case CONTINUE:
|
HttpHeaderValue expect = HttpHeaderValue.CACHE.get(value);
|
||||||
_expect100Continue = true;
|
switch (expect == null ? HttpHeaderValue.UNKNOWN : expect)
|
||||||
break;
|
{
|
||||||
|
case CONTINUE:
|
||||||
|
_expect100Continue = true;
|
||||||
|
break;
|
||||||
|
|
||||||
case PROCESSING:
|
case PROCESSING:
|
||||||
_expect102Processing = true;
|
_expect102Processing = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
String[] values = value.split(",");
|
String[] values = value.split(",");
|
||||||
for (int i = 0; values != null && i < values.length; i++)
|
for (int i = 0; values != null && i < values.length; i++)
|
||||||
{
|
|
||||||
expect = HttpHeaderValue.CACHE.get(values[i].trim());
|
|
||||||
if (expect == null)
|
|
||||||
_expect = true;
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
switch (expect)
|
expect = HttpHeaderValue.CACHE.get(values[i].trim());
|
||||||
|
if (expect == null)
|
||||||
|
_expect = true;
|
||||||
|
else
|
||||||
{
|
{
|
||||||
case CONTINUE:
|
switch (expect)
|
||||||
_expect100Continue = true;
|
{
|
||||||
break;
|
case CONTINUE:
|
||||||
case PROCESSING:
|
_expect100Continue = true;
|
||||||
_expect102Processing = true;
|
break;
|
||||||
break;
|
case PROCESSING:
|
||||||
default:
|
_expect102Processing = true;
|
||||||
_expect = true;
|
break;
|
||||||
|
default:
|
||||||
|
_expect = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -44,14 +44,15 @@ public class TomcatServerQuirksTest
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
*/
|
*/
|
||||||
@Test
|
@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();
|
DummyServer server = new DummyServer();
|
||||||
int bufferSize = 512;
|
int bufferSize = 512;
|
||||||
QueuedThreadPool threadPool = new QueuedThreadPool();
|
QueuedThreadPool threadPool = new QueuedThreadPool();
|
||||||
WebSocketClientFactory factory = new WebSocketClientFactory(threadPool, new ZeroMaskGen(), bufferSize);
|
WebSocketClientFactory factory = new WebSocketClientFactory(threadPool, new ZeroMaskGen(), bufferSize);
|
||||||
|
|
||||||
try {
|
try
|
||||||
|
{
|
||||||
server.start();
|
server.start();
|
||||||
|
|
||||||
// Setup Client Factory
|
// Setup Client Factory
|
||||||
|
@ -113,7 +114,9 @@ public class TomcatServerQuirksTest
|
||||||
socket.flush();
|
socket.flush();
|
||||||
|
|
||||||
Assert.assertTrue(dataLatch.await(1000, TimeUnit.SECONDS));
|
Assert.assertTrue(dataLatch.await(1000, TimeUnit.SECONDS));
|
||||||
} finally {
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
factory.stop();
|
factory.stop();
|
||||||
threadPool.stop();
|
threadPool.stop();
|
||||||
server.stop();
|
server.stop();
|
||||||
|
|
Loading…
Reference in New Issue