0b6c27e276
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-04-23 13:01:42 +10:00
8bacb603a7
default handler is now HTML5 compliant so default character encoding is now UTF-8
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 12:59:47 +10:00
c75136fe63
Merge branch 'release-9.4.16' into jetty-9.4.x
2019-04-18 10:13:20 -05:00
c2e81f5584
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/WebAppMarshaller.java
# jetty-infinispan/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/MultiParts.java
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
2019-04-18 08:24:10 -05:00
b6809f5555
Jetty 9.4.x 2140 infinispan expired sessions ( #3457 )
...
Infinispan and hazelcast changes to scavenge zombie expired sessions.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Jan Bartel <janb@webtide.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-18 17:24:25 +10:00
2995029c98
Merge branch `jetty-9.3.x` into `jetty-9.4.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
# jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
# pom.xml
2019-04-17 17:10:53 -05:00
3ab1ea3181
Merge branch `jetty-9.2.x` into `jetty-9.3.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
# jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/HttpClientTest.java
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
# pom.xml
2019-04-17 16:47:15 -05:00
a15534d72c
Issue #3555 - Applying more changes from review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-17 16:36:33 -05:00
b0f72a87d5
Issue #3555 - Applying more changes from review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-17 12:16:18 -05:00
5ef8a8abfa
Issue #3555 - Applying more changes from review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-17 10:51:05 -05:00
99f3926d05
Issue #3555 - Applying changes from review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 14:49:03 -05:00
97f4cafa91
Fixed bad merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-16 21:34:53 +02:00
d983890d17
Issue #3555 - DefaultHandler output cleaned up.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 13:28:57 -05:00
6d847d4a73
Issue #3555 - DefaultHandler output is now HTML5 compliant.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 12:02:15 -05:00
9f506e4123
Issue #3555 - Do not reveal base resource in error response
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-15 18:24:35 -05:00
04c994712c
Issue #3555 - Do not reveal base resource in error response
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-15 18:20:39 -05:00
bcb2eae0ba
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-15 16:02:50 +02:00
79537a5f51
Updating to version 9.4.17-SNAPSHOT
2019-04-11 11:00:24 -05:00
e0aa4ae4c0
Updating to version 9.4.16.v20190411
2019-04-11 10:01:26 -05:00
9fc5eb2af8
Issue #3545 - NPE in HttpOutput with print("")
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-11 07:17:00 -05:00
19f81c0ada
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-04-10 16:15:53 -05:00
20343ba7cb
Merge pull request #3542 from eclipse/jetty-9.4.x-issue-3540-ssl-provider-consistency
...
Issue #3540 - Use configured Security Provider consistently
2019-04-10 08:16:03 -07:00
1532eba61d
Issue #3319 - Fixing sorting of listings
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-10 10:15:21 -05:00
0efa519553
Issue #3540 - Use configured Security Provider consistently
...
+ If optional Security Provider is configured, then use it consistently
for all security objects that take a Provider argument.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-10 08:22:16 -05:00
90b3a576b1
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-07 11:06:47 +02:00
3eda16988c
Fixed ClassCastException.
...
Cannot cast Handler[] down to ContextHandlerCollection[].
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-07 11:05:26 +02:00
4ad8553fb1
fix format removing extra space
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-07 10:06:06 +10:00
40c2e76786
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-06 13:45:54 +02:00
6647b9cf37
Issue #3319 - Modernize Directory Listing: HTML5 and Sorting.
...
Fixed test.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-06 11:51:16 +02:00
8829602201
Exclude ipv6 tests for ci profile (Jenkins) ( #3528 )
...
* exclude ipv6 test as currently failing on kubernetes, using junit tag and ci profile activated via Jenkinsfile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* upgrade surefire to 3.0.0-M3
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-06 13:27:42 +10:00
e4e72968cd
Issue #3361 - HandlerCollection.addHandler is lacking synchronization.
...
Removed unused code.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-05 09:00:45 +02:00
97d501d444
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-3361-thread-safe-setHandlers'.
2019-04-05 08:47:34 +02:00
9b19374c5d
Updating to version 9.2.28-SNAPSHOT
2019-04-03 19:38:05 -05:00
84dfe74b97
Updating to version 9.2.27.v20190403
2019-04-03 19:04:45 -05:00
c70034766e
Updating to version 9.3.27-SNAPSHOT
2019-04-03 18:46:31 -05:00
dae476e369
Updating to version 9.3.26.v20190403
2019-04-03 18:16:32 -05:00
2ccde9772b
Undoing bad release-9.3.26
2019-04-03 18:11:16 -05:00
7478c04351
Merge branch `jetty-9.3.x` into `jetty-9.4.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-http-spi/pom.xml
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchangeDelegate.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
# jetty-monitor/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
# jetty-server/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
# jetty-servlet/pom.xml
# jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-servlets/pom.xml
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ThreadStarvationTest.java
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2019-04-03 17:47:18 -05:00
554fc39f06
Merge branch `jetty-9.2.x` into `jetty-9.3.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
# jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
2019-04-03 17:19:34 -05:00
ca77bd384a
Issue #3319 - Refactoring DefaultServlet Index/Listing
...
+ Now generates valid HTML5
+ Now allows column sort
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 16:28:26 -05:00
9f4b3542cb
Updating to version 9.3.27-SNAPSHOT
2019-04-03 17:32:08 +11:00
7ec6d2fb32
Updating to version 9.3.26.v20190403
2019-04-03 13:06:51 +11:00
9c13cf3a52
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-02 17:37:56 +02:00
c4b2621f56
Merge pull request #3480 from eclipse/jetty-9.4.x-3464-split_sslcontextfactory
...
Issue #3464 - Split SslContextFactory into Client and Server
2019-04-02 12:39:37 +02:00
879b9f5d6b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers
2019-04-02 12:44:08 +11:00
b759a50450
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-27 16:54:09 +11:00
1c956dc470
Issue #3361 thread safe addHandler
...
Updates from review:
- undeploy destroys context
- reinstated mapContexts
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-26 14:15:36 +11:00
10d3ea2548
Merge branch `jetty-9.4.x-3427-classpath-with-spaces` into `jetty-9.4.x`
2019-03-21 14:26:00 -05:00
6fb243ff6c
Issue #3464 - Split SslContextFactory into Client and Server
...
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.
Refactored configuration checking so that warnings are not emitted
when non necessary.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-21 14:42:42 +01:00
f2e9f2f7b3
Issue #3361 thread safe addHandler
...
Updates from review:
- private fields
- better blocker for deployment
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-21 17:11:47 +11:00
olivier lamy
Joakim Erdfelt
Jan Bartel
Simone Bordet
Olivier Lamy
Greg Wilkins