16786 Commits

Author SHA1 Message Date
Joakim Erdfelt
13992d96e4
Merge pull request #3557 from lachlan-roberts/jetty-9.4.x-3476-websocket-concurrent-connect
Issue #3476 - previous WebSocketSessions being added to new connections
2019-04-25 06:55:00 -07:00
Greg Wilkins
e532fa09dc Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3550-QueuedThreadPool-cleanup 2019-04-25 12:50:14 +02:00
Greg Wilkins
3fd486737e Improve #3550 Use a TriInteger for larger range of threads
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-25 12:50:05 +02:00
Jan Bartel
1b7221a997 Issue #3563 Update to apache jsp 8.5.40
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-04-25 08:38:01 +02:00
Greg Wilkins
704a97a6d2 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3550-QueuedThreadPool-cleanup 2019-04-25 06:53:07 +02:00
Greg Wilkins
a3f6d3aeb6 Improve #3550 cleanup after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-25 06:26:02 +02:00
Greg Wilkins
ae2addc70a Issue #3550
Ensure that new threads are started if a thread exits due to failure.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-25 06:26:02 +02:00
lachan-roberts
42f2315518 Issue #3550 - start new thread on execute if there are no idle threads
previously if there were no idle threads, QueuedThreadPool.execute()
would just queue the job and not start a new thread to run it

Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-04-25 06:26:02 +02:00
Greg Wilkins
438f0b86a3 Issue #3550
Fixed QueuedThreadPool dump of known threads

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-25 06:26:02 +02:00
Greg Wilkins
ad40ba36a8 Merge branch 'jetty-9.4.x-3550-QueuedThreadPool-stalled' into jetty-9.4.x-3550-QueuedThreadPool-cleanup 2019-04-25 06:25:28 +02:00
Greg Wilkins
a8b4ee3ed2 Merge branch 'jetty-9.4.x' into jetty-9.4.x-3550-QueuedThreadPool-stalled 2019-04-25 06:24:01 +02:00
Jan Bartel
ab03504a2f Issue #3573 Update bom for infinispan.
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-04-25 06:22:24 +02:00
Jan Bartel
41f9d7a95d Issue #3597 NPE in DumpableCollection
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-04-25 06:16:51 +02:00
Greg Wilkins
c66957867b Improve #3550 cleanup after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-25 06:13:30 +02:00
Greg Wilkins
787380a91e Improve #3550 fix with a single Atomic
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-24 22:20:32 +02:00
Greg Wilkins
c4d51b09df Issue #3550
Ensure that new threads are started if a thread exits due to failure.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-24 11:42:23 +02:00
lachan-roberts
f69de3372e Issue #3550 - start new thread on execute if there are no idle threads
previously if there were no idle threads, QueuedThreadPool.execute()
would just queue the job and not start a new thread to run it

Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-04-24 11:11:21 +02:00
Greg Wilkins
561ea0dafb Issue #3550
Fixed QueuedThreadPool dump of known threads

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-24 09:33:14 +02:00
olivier lamy
2d23cb0ecf ignore the correct one
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 19:31:13 +10:00
olivier lamy
c428fc1b62 weird only this annotations
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 15:48:52 +10:00
olivier lamy
4f38e9f488 oops missed annotations
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 14:12:21 +10:00
olivier lamy
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
olivier lamy
6395e7f25a ignore test which cannot work with hazelcast tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 12:40:45 +10:00
Joakim Erdfelt
48f2f9fd48 Correcting header text mentioning EPL 2.0, we are not EPL 2.0 yet, we are still EPL 1.0 2019-04-22 09:51:29 -05:00
Joakim Erdfelt
05bb111580 Updating to version 9.4.18-SNAPSHOT 2019-04-18 15:59:49 -05:00
Joakim Erdfelt
aa1c656c31 Updating to version 9.4.17.v20190418 jetty-9.4.17.v20190418 2019-04-18 14:44:28 -05:00
Joakim Erdfelt
926a8428a8 Updating maven-javadoc-plugin config for JDK-8212233 bug
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-18 14:09:34 -05:00
Joakim Erdfelt
5882d63ba7 Updating to version 9.3.28-SNAPSHOT 2019-04-18 13:54:17 -05:00
Joakim Erdfelt
d3e249f869 Updating to version 9.3.27.v20190418 jetty-9.3.27.v20190418 2019-04-18 13:10:03 -05:00
Joakim Erdfelt
3232d73282 Updating maven-javadoc-plugin config for JDK-8212233 bug 2019-04-18 13:08:41 -05:00
Joakim Erdfelt
d83e1164fc Bumping up javadoc-plugin due to NPE during release 2019-04-18 12:44:44 -05:00
Joakim Erdfelt
2c14d93885 Updating to version 9.2.29-SNAPSHOT 2019-04-18 12:17:07 -05:00
Joakim Erdfelt
1dffa36fe3 Updating to version 9.2.28.v20190418 jetty-9.2.28.v20190418 2019-04-18 11:23:17 -05:00
Simone Bordet
038c7ee6d7 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2019-04-18 18:07:00 +02:00
Simone Bordet
1f31f52a5a Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2019-04-18 18:01:59 +02:00
Simone Bordet
03243ebfbd Updated ALPN version for JDK 8u211 and 8u212.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-18 17:55:06 +02:00
Joakim Erdfelt
1c00de3d1d Fixing bad merge
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-18 10:49:51 -05:00
Joakim Erdfelt
c75136fe63 Merge branch 'release-9.4.16' into jetty-9.4.x 2019-04-18 10:13:20 -05:00
Jan Bartel
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
olivier lamy
36398051de fix header
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-18 09:37:50 +10:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Jan Bartel
3dd0172abd
Issue #3395 Add tests for serializing dynamic proxies in sessions. (#3499)
* Issue #3395 Add tests for serializing dynamic proxies in sessions.
2019-04-17 15:04:28 +10:00
Joakim Erdfelt
72b4f92280 Updating to tests to protect if IPv6 is unavailable.
+ Updating to jetty-test-helper 4.2.1 with new Net.class
+ Assume.assumeTrue(Net.isIpv6InterfaceAvailable());

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 18:10:55 -05:00
Joakim Erdfelt
ec34fafc3f Updating to tests to protect if IPv6 is unavailable.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 17:27:26 -05:00
Joakim Erdfelt
eebad0655a Issue #3555 - Updating testcase
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 17:23:39 -05:00
Joakim Erdfelt
879e161c22 Updating to tests to protect if IPv6 is unavailable.
+ Updating to jetty-test-helper 3.1.1 with new Net.class
+ Assume.assumeTrue(Net.isIpv6InterfaceAvailable());

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 16:34:12 -05:00