diff --git a/VERSION.txt b/VERSION.txt index 15265169eac..742cd725907 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,5 +1,53 @@ jetty-9.4.0-SNAPSHOT +jetty-9.4.0.RC2 - 16 November 2016 + + 240 Missing content for multipart request after upgrade to Jetty > 9.2.7 + + 586 Thread pools and connectors + + 644 Modules for enabling logging + + 905 Jetty terminates SSL connections too early with Connection: close + + 907 Update to support apache jasper 8.5.5 + + 1020 Java Util Logging properties in wrong location + + 1023 Error on configuring slf4j-simple-impl module + + 1029 Restore Request.setHttpVersion() + + 1031 Improve HttpField pre-encoding + + 1032 Remove jetty dependencies in jetty jasper classes + + 1037 Don't execute AsyncListener.onTimeout events in spare Scheduler-Thread + + 1038 AttributeNormalizer does not favor ${WAR} over other attributes, like + ${jetty.base} + + 1039 AttributeNormalizer should not track attributes that are null + + 1045 Abort HttpChannel onCompletion if wrong content length set + + 1046 Improve HTTP2Flusher error report + + 1050 Add multiple FilterHolder to a ServletContextHandler may cause problems + + 1054 Using WebSocketPingPongListener with empty PING payload results in + NullPointerException + + 1057 Improve WebSocketUpgradeFilter fast path performance + + 1062 Jetty allows requests to hang under PUT load + + 1063 HostPortHttpField should handle port-only values + + 1064 HttpClient sets chunked transfer-encoding + + 1065 Response.setBufferSize checks for written content. + + 1066 Content-Length: 0 set when not required. + + 1067 Ensure if session scavenging is disabled, no candidate expired sessions + accumulate + + 1069 Host header should be sent with HTTP/1.0 + + 1070 Refactor calculation for session expiry + + 1071 Ensure dirty flag set on a new session + + 1072 InetAccessHandler needs InetAddress & Path based restrictions like + IPAccessHandler did + + 1074 Improve HttpInput for non dispatched calls + + 1075 If read from session data cache fails, fallback to session data store + + 1076 bad error handling in + ServerTimeoutsTest.testBlockingReadWithMinimumDataRateBelowLimit + + 1077 doHandle defined twice for ScopedHandler + + 1078 DigestAuthentication should use realm from server, even if unknown in + advance + + 1081 DigestAuthenticator does not check the realm sent by the client + + 1091 Update to gcloud datastore 0.5.1 + + 1098 MimeTypes.getCharsetFromContentType() unable parse "application/pdf;;; + charset=UTF-8" + + 1099 PushCacheFilter pushes POST requests + + 1103 AbstractNCSARequestLog reports too much of the Request URI + + 480764 Suppress stacks in multipart filter tests + jetty-9.4.0.RC1 - 21 October 2016 + 277 Proxy servlet does not handle HTTP status 100 correctly + 292 NPE in SslConnectionFactory newConnection diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod index 82ae530c008..6547bc2e532 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod @@ -13,35 +13,37 @@ jul-impl [files] maven://aopalliance/aopalliance/1.0|lib/gcloud/aopalliance-1.0.jar maven://com.fasterxml.jackson.core/jackson-core/2.1.3|lib/gcloud/jackson-core-2.1.3.jar -maven://com.google.api-client/google-api-client-appengine/1.21.0|lib/gcloud/google-api-client-appengine-1.21.0.jar +maven://com.google.api/api-common/0.0.2|lib/gcloud/api-common-0.0.2.jar maven://com.google.api-client/google-api-client/1.20.0|lib/gcloud/google-api-client-1.20.0.jar +maven://com.google.api-client/google-api-client-appengine/1.21.0|lib/gcloud/google-api-client-appengine-1.21.0.jar maven://com.google.api-client/google-api-client-servlet/1.21.0|lib/gcloud/google-api-client-servlet-1.21.0.jar -maven://com.google.api/gax/0.0.21|lib/gcloud/gax-0.0.21.jar -maven://com.google.api.grpc/grpc-google-common-protos/0.1.0|lib/gcloud/grpc-google-common-protos-0.1.0.jar -maven://com.google.api.grpc/grpc-google-iam-v1/0.1.0|lib/gcloud/grpc-google-iam-v1-0.1.0.jar -maven://com.google.auth/google-auth-library-credentials/0.3.1|lib/gcloud/google-auth-library-credentials-0.3.1.jar -maven://com.google.auth/google-auth-library-oauth2-http/0.3.1|lib/gcloud/google-auth-library-oauth2-http-0.3.1.jar +maven://com.google.api/gax/0.0.25|lib/gcloud/gax-0.0.25.jar +maven://com.google.api.grpc/grpc-google-common-protos/0.1.3|lib/gcloud/grpc-google-common-protos-0.1.3.jar +maven://com.google.api.grpc/grpc-google-iam-v1/0.1.3|lib/gcloud/grpc-google-iam-v1-0.1.3.jar +maven://com.google.auth/google-auth-library-credentials/0.6.0|lib/gcloud/google-auth-library-credentials-0.6.0.jar +maven://com.google.auth/google-auth-library-oauth2-http/0.6.0|lib/gcloud/google-auth-library-oauth2-http-0.6.0.jar maven://com.google.auto.value/auto-value/1.2|lib/gcloud/auto-value-1.2.jar maven://com.google.cloud.datastore/datastore-v1-proto-client/1.3.0|lib/gcloud/datastore-v1-proto-client-1.3.0.jar maven://com.google.cloud.datastore/datastore-v1-protos/1.3.0|lib/gcloud/datastore-v1-protos-1.3.0.jar -maven://com.google.cloud/google-cloud-core/0.5.1|lib/gcloud/google-cloud-core-0.5.0.jar -maven://com.google.cloud/google-cloud-datastore/0.5.1|lib/gcloud/google-cloud-datastore-0.5.1.jar +maven://com.google.cloud/google-cloud-core/0.7.0|lib/gcloud/google-cloud-core-0.7.0.jar +maven://com.google.cloud/google-cloud-datastore/0.7.0|lib/gcloud/google-cloud-datastore-0.7.0.jar maven://com.google.code.findbugs/jsr305/1.3.9|lib/gcloud/jsr305-1.3.9.jar maven://com.google.code.gson/gson/2.3|lib/gcloud/gson-2.3.jar maven://com.google.guava/guava/19.0|lib/gcloud/guava-19.0.jar -maven://com.google.http-client/google-http-client-appengine/1.21.0|lib/gcloud/google-http-client-appengine-1.21.0.jar -maven://com.google.http-client/google-http-client-jackson2/1.19.0|lib/gcloud/google-http-client-jackson2-1.19.0.jar -maven://com.google.http-client/google-http-client-jackson/1.21.0|lib/gcloud/google-http-client-jackson-1.21.0.jar maven://com.google.http-client/google-http-client/1.21.0|lib/gcloud/google-http-client-1.21.0.jar +maven://com.google.http-client/google-http-client-appengine/1.21.0|lib/gcloud/google-http-client-appengine-1.21.0.jar +maven://com.google.http-client/google-http-client-jackson/1.21.0|lib/gcloud/google-http-client-jackson-1.21.0.jar +maven://com.google.http-client/google-http-client-jackson2/1.19.0|lib/gcloud/google-http-client-jackson2-1.19.0.jar maven://com.google.http-client/google-http-client-jdo/1.21.0|lib/gcloud/google-http-client-jdo-1.21.0.jar maven://com.google.http-client/google-http-client-protobuf/1.20.0|lib/gcloud/google-http-client-protobuf-1.20.0.jar maven://com.google.inject/guice/4.0|lib/gcloud/guice-4.0.jar -maven://com.google.oauth-client/google-oauth-client-appengine/1.21.0|lib/gcloud/google-oauth-client-appengine-1.21.0.jar maven://com.google.oauth-client/google-oauth-client/1.21.0|lib/gcloud/google-oauth-client-1.21.0.jar +maven://com.google.oauth-client/google-oauth-client-appengine/1.21.0|lib/gcloud/google-oauth-client-appengine-1.21.0.jar maven://com.google.oauth-client/google-oauth-client-servlet/1.21.0|lib/gcloud/google-oauth-client-servlet-1.21.0.jar maven://com.google.protobuf/protobuf-java/3.0.0|lib/gcloud/protobuf-java-3.0.0.jar maven://com.google.protobuf/protobuf-java-util/3.0.0|lib/gcloud/protobuf-java-util-3.0.0.jar maven://commons-codec/commons-codec/1.3|lib/gcloud/commons-codec-1.3.jar +maven://commons-logging/commons-logging/1.1.1|lib/gcloud/commons-logging-1.1.1.jar maven://io.grpc/grpc-context/1.0.1|lib/gcloud/grpc-context-1.0.1.jar maven://io.grpc/grpc-core/1.0.1|lib/gcloud/grpc-core-1.0.1.jar maven://io.grpc/grpc-protobuf/1.0.1|lib/gcloud/grpc-protobuf-1.0.1.jar @@ -54,4 +56,3 @@ maven://org.apache.httpcomponents/httpclient/4.0.1|lib/gcloud/httpclient-4.0.1.j maven://org.apache.httpcomponents/httpcore/4.0.1|lib/gcloud/httpcore-4.0.1.jar maven://org.codehaus.jackson/jackson-core-asl/1.9.11|lib/gcloud/jackson-core-asl-1.9.11.jar maven://org.json/json/20151123|lib/gcloud/json-20151123.jar - diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index dbb86dd4e58..8c8c5ba8914 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -13,7 +13,7 @@ Jetty :: GCloud - 0.5.1 + 0.7.0 diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java index e1d6e473803..c78e2dc2a7b 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java @@ -77,6 +77,7 @@ public class QuickStartDescriptorGenerator { private static final Logger LOG = Log.getLogger(QuickStartDescriptorGenerator.class); + public static final String ORIGIN = "org.eclipse.jetty.originAttribute"; public static final String DEFAULT_QUICKSTART_DESCRIPTOR_NAME = "quickstart-web.xml"; public static final String DEFAULT_ORIGIN_ATTRIBUTE_NAME = "origin"; @@ -152,6 +153,16 @@ public class QuickStartDescriptorGenerator addContextParamFromAttribute(out,MetaInfConfiguration.METAINF_RESOURCES,normalizer); + //add the name of the origin attribute, if it is being used + if (_generateOrigin) + { + out.openTag("context-param") + .tag("param-name", ORIGIN) + .tag("param-value", _originAttribute) + .closeTag(); + } + + // init params for (String p : _webApp.getInitParams().keySet()) out.openTag("context-param",origin(md,"context-param." + p)) diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java index 35d41ea17ae..e006c1e015f 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java @@ -28,9 +28,12 @@ import javax.servlet.ServletContext; import org.eclipse.jetty.annotations.AnnotationConfiguration; import org.eclipse.jetty.annotations.ServletContainerInitializersStarter; import org.eclipse.jetty.plus.annotation.ContainerInitializer; +import org.eclipse.jetty.servlet.ServletMapping; import org.eclipse.jetty.util.QuotedStringTokenizer; +import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceCollection; +import org.eclipse.jetty.webapp.DefaultsDescriptor; import org.eclipse.jetty.webapp.Descriptor; import org.eclipse.jetty.webapp.IterativeDescriptorProcessor; import org.eclipse.jetty.webapp.MetaInfConfiguration; @@ -44,11 +47,18 @@ import org.eclipse.jetty.xml.XmlParser; */ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor { + + private String _originAttributeName = null; + + /** + * + */ public QuickStartDescriptorProcessor() { try { registerVisitor("context-param", this.getClass().getMethod("visitContextParam", __signature)); + registerVisitor("servlet-mapping", this.getClass().getMethod("visitServletMapping", __signature)); } catch (Exception e) { @@ -62,6 +72,7 @@ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor @Override public void start(WebAppContext context, Descriptor descriptor) { + _originAttributeName = context.getInitParameter(QuickStartDescriptorGenerator.ORIGIN); } /** @@ -70,8 +81,50 @@ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor @Override public void end(WebAppContext context, Descriptor descriptor) { + _originAttributeName = null; + } + + + /** + * Process a servlet-mapping element + * + * @param context the webapp + * @param descriptor the xml file to process + * @param node the servlet-mapping element in the xml file to process + */ + public void visitServletMapping(WebAppContext context, Descriptor descriptor, XmlParser.Node node) + { + String servletName = node.getString("servlet-name", false, true); + ServletMapping mapping = null; + ServletMapping[] mappings = context.getServletHandler().getServletMappings(); + + if (mappings != null) + { + for (ServletMapping m:mappings) + { + if (servletName.equals(m.getServletName())) + { + mapping = m; + break; + } + } + } + + if (mapping != null && _originAttributeName != null) + { + String origin = node.getAttribute(_originAttributeName); + if (!StringUtil.isBlank(origin) && origin.startsWith(DefaultsDescriptor.class.getSimpleName())) + mapping.setDefault(true); + } } + /** + * Process a context-param element + * @param context the webapp + * @param descriptor the xml file to process + * @param node the context-param node in the xml file + * @throws Exception + */ public void visitContextParam (WebAppContext context, Descriptor descriptor, XmlParser.Node node) throws Exception { @@ -82,11 +135,16 @@ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor // extract values switch(name) { + case QuickStartDescriptorGenerator.ORIGIN: + { + //value already contains what we need + break; + } case ServletContext.ORDERED_LIBS: case AnnotationConfiguration.CONTAINER_INITIALIZERS: case MetaInfConfiguration.METAINF_TLDS: case MetaInfConfiguration.METAINF_RESOURCES: - + { context.removeAttribute(name); QuotedStringTokenizer tok = new QuotedStringTokenizer(value,","); @@ -94,7 +152,7 @@ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor values.add(tok.nextToken().trim()); break; - + } default: values.add(value); } @@ -103,6 +161,11 @@ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor // handle values switch(name) { + case QuickStartDescriptorGenerator.ORIGIN: + { + context.setAttribute(QuickStartDescriptorGenerator.ORIGIN, value); + break; + } case ServletContext.ORDERED_LIBS: { List libs = new ArrayList<>(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java index 01793d2ae41..c69130c9d6a 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java @@ -354,7 +354,7 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi if (_houseKeeper == null) { - LOG.warn("No SessionScavenger set, using defaults"); + LOG.info("No SessionScavenger set, using defaults"); _ownHouseKeeper = true; _houseKeeper = new HouseKeeper(); _houseKeeper.setSessionIdManager(this);