Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,641 Commits 55 Branches 466 Tags
Commit Graph

2907 Commits

Author SHA1 Message Date
olivier lamy
d377db5d26 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-05-23 14:18:39 +10:00
Olivier Lamy
f2c59a3cb7
add convenient StringUtil isEmpty method (#3687) 
* add StringUtil.isEmpty

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-05-23 09:01:36 +10:00
Greg Wilkins
d37038496e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 23:21:02 +02:00
Simone Bordet
fd542c2856
Merge pull request #3591 from eclipse/jetty-9.4.x-3550-QueuedThreadPool-cleanup 
Jetty 9.4.x 3550 queued thread pool cleanup
 2019-05-22 18:18:49 +02:00
Simone Bordet
b70d22fee8 Issue #3550 - QueuedThreadPool cleanup. 
Improved code formatting.
Removed unnecessary code in doStop().
Now explicitly checking whether idleTimeout > 0 before shrinking.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-05-22 18:17:44 +02:00
Greg Wilkins
b0bc9c9200 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-05-17 16:47:45 +02:00
Joakim Erdfelt
73d7eaaba3 Issue #2909 - Replace B64Code with java.util.Base64 
+ Address Mime Encoding behavior difference detected in testcase

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-15 10:08:11 +02:00
Joakim Erdfelt
b44ecc932a Issue #2909 - Replace B64Code with java.util.Base64 
+ Deprecated B64Code
+ All code that isn't B64CodeTest is now using java.util.Base64
+ B64CodeTest is updated to confirm change to java.util.Base64
  is possible without change in behavior. Just have to make
  sure you use the appropriate Encoder / Decoder for the task
  at hand (default vs mime vs url)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-15 10:08:11 +02:00
Joakim Erdfelt
09a60cd4f3 Issue #3630 - more HostPort tests 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-14 17:08:01 +02:00
Greg Wilkins
05072b34dc Issue #3630 Forwarded-Port 
Added support for the X-Forwarded-Port header.
Reimplemented header scanning using more efficient Trie and MethodHandles

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-14 17:08:01 +02:00
Greg Wilkins
715939217f Fixed reserved thread default 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-09 16:27:00 +02:00
Lachlan Roberts
1ef191ffcd Issue #3374 - websocket write timeout improvements 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-09 00:05:57 +02:00
Greg Wilkins
4dd76fc092 Issue #3550 Cleanup QTP after review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-08 14:28:20 +02:00
Greg Wilkins
16b73e55bc Merge branch 'jetty-9.4.x' into jetty-9.4.x-3550-QueuedThreadPool-cleanup 2019-05-08 14:23:30 +02:00
Greg Wilkins
2d5984da20 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-07 15:37:27 +02:00
Simone Bordet
e45c176649 Fixes #3628 - NPE in QueuedThreadPool.getReservedThreads(). 
Added guard to avoid NPE.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-05-07 12:53:15 +02:00
Greg Wilkins
6c6646286d cleanup after review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-03 15:25:05 +02:00
Greg Wilkins
604f2379bd cleanup dumps from review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-03 15:25:05 +02:00
Greg Wilkins
aafb0fcec1 simplification after review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-03 15:25:05 +02:00
Greg Wilkins
1a76d487cc improved names and javadoc 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-03 15:25:05 +02:00
Greg Wilkins
feb0333844 Fixed IncludeExclude combination logic 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-03 15:25:05 +02:00
Greg Wilkins
8b5f0211a8 parameterize include and exclude 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-03 15:25:05 +02:00
Joakim Erdfelt
52bb963186 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	aggregates/jetty-all-compact3/pom.xml
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
#	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
#	jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
#	jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
#	jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
#	jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
#	pom.xml
#	tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
#	tests/test-http-client-transport/pom.xml
#	tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
 2019-05-01 15:02:31 -05:00
Joakim Erdfelt
41ab9baf8c Standardizing on hamcrest Matchers (not CoreMatchers from junit4) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-30 14:39:57 -05:00
Joakim Erdfelt
df716e1b23 Migrating away from junit5 deprecated isIn() to is(in()) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-30 12:33:28 -05:00
Joakim Erdfelt
2b93a4e7ea Updating jetty-test-helper + junit5 + hamcrest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-30 12:23:55 -05:00
Joakim Erdfelt
734be56938 Updating to version 9.4.19-SNAPSHOT 2019-04-29 16:27:23 -05:00
Joakim Erdfelt
e1bc35120a Updating to version 9.4.18.v20190429 2019-04-29 15:40:33 -05:00
Jan Bartel
56a938e512 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-04-29 21:31:41 +02:00
Greg Wilkins
f1d598acc6 Issue #3582 Fix toDetailString buffer modify 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-04-29 16:59:26 +02:00
Greg Wilkins
5496f72a59 set reserved thread idle timeout 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-04-29 16:33:08 +02:00
Greg Wilkins
f28bfa9377 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-04-29 13:21:59 +02:00
Jan Bartel
ab174d1015
Issue #3597 Fix session persistence classloading for deep structures (#3602) 
* Issue #3597 Fix session persistence classloading for deep structures with system classes.
 2019-04-29 12:05:34 +02:00
Greg Wilkins
2562500c7b Merge branch 'jetty-9.4.x' into jetty-9.4.x-3550-QueuedThreadPool-cleanup 2019-04-29 07:42:06 +02:00
Greg Wilkins
3c51304b08 updates from review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-04-29 07:41:59 +02:00
Joakim Erdfelt
29b960551f Merge branch release-9.4.17 into jetty-9.4.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-bom/pom.xml
 2019-04-25 09:15:42 -05: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
Greg Wilkins
812f3dbd2e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-04-25 11:26:33 +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
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