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

20293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Wilkins
f88eb73a91
Issue #4533 Hard close from Dispatcher (#4534) 
* Issue #4533 Hard close from Dispatcher

Signed-off-by: Greg Wilkins <gregw@webtide.com>

#4533 Do hard close from Dispatcher so response wrappers may intercept close.

* Issue #4533 Hard close from Dispatcher

Signed-off-by: Greg Wilkins <gregw@webtide.com>

#4533 improve test after review

* Issue #4533 Hard close from Dispatcher

Some renaming of methods to make it clear that softClose should only be used as part of sendError handling.  If softClose is used by other components, then sendError can be prevented from setting the error status.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-01-31 11:55:14 +01:00
Lachlan Roberts
fde1ab3e5b Issue #4462 - fix incorrect test expectations 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-31 16:31:35 +11:00
Lachlan Roberts
a7c0c57496 Issue #4447 - separate modules for jetty and javax websockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-31 15:58:20 +11:00
Lachlan Roberts
bdaa06e8dd Issue #4462 - do not throw IOException on Javax websocket close 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-31 11:09:30 +11:00
Simone Bordet
ce6e146ac1
Merge pull request #4489 from eclipse/jetty-10.0.x-2643-pkcs12_keystores 
Fixes #2643 - Switch SslContextFactory.keystoreType from JKS to PKCS12.
 2020-01-30 19:28:49 +01:00
Simone Bordet
8bd1a7f5bc Using only non-obfuscated passwords in tests. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-30 18:48:08 +01:00
Simone Bordet
4b9fec0cf3 Updates after review. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-30 17:53:41 +01:00
Greg Wilkins
5aaec6e23f
Issue #4321 Refactored Graceful shutdown (#4482) 
* Issue #4321 Refactored Graceful shutdown

removed stopTimeout from all abstractLifeCycles.  It is on Graceful.LifeCycle, which is only implemented by components that can start a graceful shutdown (eg Server, ContextHandler and QueuedThreadPool)

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

cleanup after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

reinstate other stop tests (more work to do).

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

Fixes for stop test by improving LocalConnector shutdown handling

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

Removed broken test on LocalConnector that is already tested in GracefulStopTest

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

Fixed all stop tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

fixed checkstyle

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

No stopTimeout JMX attribute

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

Dump stopTimeout
test with default stopTimeout

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

USe sendError for 503

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

minor cleanups

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

Simplifications after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4321 Refactored Graceful shutdown

after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-01-30 17:05:03 +01:00
Simone Bordet
1ee26ba736 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-30 12:09:35 +01:00
Simone Bordet
4139b67d8f Replaced references to branch 'master' with 'jetty-9.3.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-30 11:32:37 +01:00
Simone Bordet
7592d36c4b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-30 10:41:43 +01:00
Simone Bordet
7746be770a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-30 10:17:10 +01:00
Simone Bordet
f52ed62f36 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-30 10:09:34 +01:00
Simone Bordet
305e4609b2 Updated ALPN version for JDK 8u241 and 8u242. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-30 10:03:38 +01:00
Simone Bordet
3b2b74939e
Merge pull request #4527 from eclipse/jetty-10.0.x-WebSocketServerContainers 
Make the WebSocketServerContainer initialize methods private
 2020-01-30 09:47:07 +01:00
Lachlan Roberts
b4d2ccc6b8 Make the WebSocketServerContainer initialize methods private 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-30 15:01:15 +11:00
Lachlan
1b10e2330e
Merge pull request #4522 from eclipse/jetty-10.0.x-4226-JavaxWebSocketJPMS 
Issue #4226 - fix JPMS issues with javax websockets
 2020-01-30 12:09:02 +11:00
Lachlan Roberts
006fd3f913 Issue #4226 - fix test failures 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-30 11:26:51 +11:00
Lachlan Roberts
82c61c48eb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4226-JavaxWebSocketJPMS 2020-01-30 10:37:34 +11:00
Lachlan
19354d0c24
Merge pull request #4523 from eclipse/jetty-10.0.x-4502-wsOnClose 
Issue #4502 - allow changing of close response from jetty and javax websocket onClose events
 2020-01-30 09:10:48 +11:00
Jan Bartel
45771dbd26 Fix bad merge 2020-01-29 12:08:13 +01:00
Jan Bartel
79a337567f Issue #4247 use context default for samesite cookie attribute (#4512) 
* Issue #4247 use context default for samesite cookie attribute

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-01-29 11:54:43 +01:00
Greg Wilkins
842fa6aa53 Issue #4504 Forwarded Host and Server (#4511) 
X-Forwarded-Host has precedence of X-Forwarded-Server and outcome is not order dependent.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-01-29 11:54:43 +01:00
Simone Bordet
a682fe1772
Merge pull request #4451 from eclipse/jetty-10.0.x-4450-WebSocketCoreJPMS 
Issue #4450 - websocket-core exposes internal classes
 2020-01-29 11:17:40 +01:00
Jan Bartel
9850c29839
Issue #4247 use context default for samesite cookie attribute (#4512) 
* Issue #4247 use context default for samesite cookie attribute

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-01-29 11:05:35 +01:00
Simone Bordet
96741ebb28 Fixed compilation issues after merge. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-29 10:11:21 +01:00
Lachlan Roberts
1afb7fd1f2 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4450-WebSocketCoreJPMS 2020-01-29 19:21:39 +11:00
Lachlan Roberts
8638fb2cc3 Fix broken test cases 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-29 19:13:03 +11:00
Lachlan Roberts
fdd27a9f28 Issue #4502 - add onClose tests for Jetty and Javax WS APIs 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-29 15:20:36 +11:00
Lachlan Roberts
4ef208e9f6 Issue #4502 - onClose can now be triggered on receiving a close frame 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-29 15:19:48 +11:00
Lachlan
f6fd3c41a5
Issue #4462 - Prevent jetty 10 WebSocket close deadlocks (#4472) 
- Replicate problems from WS close deadlock with test cases
- use FutureCallback instead of SharedBlockingCallback for WS blocking methods
- add timeout to the blocking callbacks for WS for (idleTimeout + 1000ms)
- Core throws ClosedChannelException instead of ISE if send after closed
 2020-01-29 09:15:40 +11:00
Chris Walker
ae6610f4ba
Updated wireframe of Jetty 9.4 to 10.0 upgrade guide 2020-01-28 12:35:50 -06:00
Olivier Lamy
d74676e46c
tck tests are done after ServletContext has already been initialized so we need to test this first to get some tck test passing... (#4514) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-01-28 20:33:16 +10:00
Lachlan Roberts
a4b85d1df2 Issue #4226 JavaxWebSocketServerContainer leaking into public signature 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-28 18:16:22 +11:00
Lachlan Roberts
6698592139 Add tests for Javax ServerContainer default configuration. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-28 18:15:27 +11:00
Greg Wilkins
56754f4a29
Issue #4504 Forwarded Host and Server (#4511) 
X-Forwarded-Host has precedence of X-Forwarded-Server and outcome is not order dependent.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-01-24 11:20:52 +01:00
olivier lamy
cdcef4f328 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-01-24 20:04:41 +10:00
olivier lamy
ff19bef4dc alpn for jdk 1.8.0_242 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-01-24 19:59:28 +10:00
Lachlan
681d0bee3c
Merge pull request #4498 from eclipse/jetty-10.0.x-4383-MultiPartNPE 
Issue #4383 - synchronize multiparts for cleanup from different thread
 2020-01-24 11:42:59 +11:00
Lachlan Roberts
f76687ad68 Issue 4383 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-24 11:06:37 +11:00
Lachlan Roberts
6c2c4d8ad7 Issue 4450 - remove ConfigurationCustomizer static method 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-24 11:05:14 +11:00
Lachlan
b64964113c
Merge pull request #4486 from eclipse/jetty-9.4.x-4475-WebSocketStreamMessageOrder 
Issue #4475 - fix WebSocket streaming message ordering
 2020-01-24 10:01:22 +11:00
Lachlan Roberts
64d72abde6 Extension interface now uses CoreSession and not Configuration 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-23 10:20:40 +11:00
olivier lamy
68aa814533 skip surefire execution for build-resources module 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-01-23 07:57:51 +10:00
Olivier Lamy
9b9771d77d
spec addJspFile javadoc expect IllegalArgumentException if name is null or empty string (#4510) 
* spec javadoc expect IllegalArgumentException if name is null or empty string

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-01-23 07:53:56 +10:00
Jan Bartel
158789b766
Issue #4505 Ensure get/setInitParam with null arg throws NPE (#4509) 
* Issue #4505 Ensure get/setInitParam with null arg throws NPE
 2020-01-22 10:48:34 +01:00
Lachlan Roberts
bc88224f19 combine ConfigurationHolder and ConfigurationCustomizer 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-22 18:15:59 +11:00
Lachlan Roberts
f35a01c73c further checkstyle fixes 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-22 17:26:07 +11:00
Lachlan Roberts
acabec2e91 fix licence headers and checkstyle 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-22 16:08:08 +11:00
Lachlan Roberts
86037367bc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4450-WebSocketCoreJPMS 2020-01-22 14:51:51 +11:00