Commit Graph

18367 Commits

Author SHA1 Message Date
Greg Wilkins 1accced62f Issue #3361 thread safe addHandler
Added new thread safe methods deployHandler and undeployHandler

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-20 18:18:55 +11:00
Simone Bordet 4cbc933220 Issue #3180 - Review client support for Unix sockets.
Updated code after reviews.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-19 23:36:37 +01:00
Simone Bordet 0f6496abb3 Issue #3180 - Review client support for Unix sockets.
Fixed tests on Jenkins by shortening the Unix socket file name.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-19 18:55:09 +01:00
Simone Bordet bfc5b1fac5 Issue #3180 - Review client support for Unix sockets.
Reviewed the implementation.
Got rid of the single channel stored in the HttpClientTransport.
Re-enabled tests on the Unix socket transport.
Updated JNR to 0.22.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-19 17:37:12 +01:00
Simone Bordet ec8a1bdb23
Merge pull request #3313 from eclipse/jetty-10.0.x-1350-dynamic_client_transport
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
2019-03-19 15:31:11 +01:00
Greg Wilkins 79c1700f62 Issue #3361 thread safe addHandler
Make handler list and context mappings controlled by a single CaS
operation

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-19 18:57:55 +11:00
Greg Wilkins 49eadc5246 Issue #3361 thread safe addHandler
Made Context mapping atomic with a volatile mapping

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-19 17:58:27 +11:00
Greg Wilkins b7e3d6ce5e Issue #3361 thread safe addHandler
Removed synchronization for now, leaving just some cleanups

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-19 16:40:45 +11:00
Greg Wilkins d6ed19a97c Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers 2019-03-19 16:12:50 +11:00
Greg Wilkins f037258725
Merge pull request #3470 from lachlan-roberts/jetty-10.0.x-3462-websocketclient-validation
Issue #3462 - websocket upgrade request valdiation
2019-03-19 16:11:09 +11:00
Lachlan Roberts 7e9700fb9a Issue #3462 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-19 14:38:17 +11:00
Greg Wilkins 8427c52c8f
Merge pull request #3461 from eclipse/jetty-9.3.x-gzipRequestCustomizer
Jetty 9.3.x gzip request customizer
2019-03-19 13:50:50 +11:00
Lachlan Roberts 403bdb70ea Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3462-websocketclient-validation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-19 11:54:19 +11:00
Lachlan Roberts cdd3ed943c Issue #3462 - parse extensions and subprotocols from headers every time
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-19 11:20:49 +11:00
Jan Bartel 441280c9fc Issue #3463 Fix jaas documentation realm and login module names.
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-03-19 11:10:05 +11:00
Greg Wilkins eab971e2cc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-19 09:45:20 +11:00
Greg Wilkins 012b9e526c
Merge pull request #3460 from lachlan-roberts/jetty-10.0.x-3458-jettyWebSocket-API
Issue #3458 - jetty websocket upgrades without using websocket-servlet classes
2019-03-19 09:30:20 +11:00
lachan-roberts 96027f5437 Issue #3462 - incorrectly setting websocket extensions and subprotocol
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-18 16:36:16 +11:00
lachan-roberts dab3b64d70 Issue #3458 - make jetty-websocket-client hide websocket-core
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-18 15:24:23 +11:00
Lachlan Roberts 20e9770b73 Issue #3458 - testing of Jetty WebSocket API ExtensionConfig
wire up the jetty-api extensions by copying the ExtensionConfig from
the jetty-api upgrade request to the core upgrade request

make UpgradeListener interface methods default for convenience

introduce test to test the functionality of API ExtensionConfig

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-18 15:24:23 +11:00
Lachlan Roberts 62406cdfa2 Issue #3458 - missing licence headers and changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-18 15:24:23 +11:00
Lachlan Roberts f60534a8ac Issue #3458 - jetty websocket upgrades with only websocket-server
websocket-servlet exposes core classes as it is used by the jetty and
javax sides, so this introduces a way to add websocket mappings
with jetty-server which does not depend on websocket-servlet

to set websocket mappings through the JettyWebSocketServerContainer
you now need to use the JettyWebSocketCreator which abstracts away
the core classes from use with the jetty websocket api

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-18 15:24:23 +11:00
Lachlan Roberts 86675422a6 Issue #3458 - ExtensionConfig now delegates to core implementation
ExtensionConfig is now interface in jetty-websocket-api and
implemented in jetty-websocket-common, for its static methods it now
uses a ExtensionConfig.Parser found by the ServiceLoader

the api tests were moved to jetty-websocket-tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-18 15:24:23 +11:00
lachan-roberts 1a20c8cda3 Issue #3462 - fix server validation of websocket upgrade response
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-18 15:12:23 +11:00
olivier lamy 38787f619d fix unit test with read module ack
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-18 11:45:33 +10:00
lachan-roberts 53a4a747db Issue #3462 - fix client validation of websocket upgrade response
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-18 12:20:11 +11:00
Joakim Erdfelt 95a6b76851 Merge branch `jetty-9.4.x` into `jetty-10.0.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
#	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-03-15 16:00:59 -05:00
WalkerWatch 5c134efaca Updated Windows service documentation. Resolves #3417
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2019-03-15 16:41:10 -04:00
Joakim Erdfelt d7364e4794 Issue #3422 - Fixing testcase expectations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-15 14:08:33 -05:00
Joakim Erdfelt 4fb1940283 Issue #3422 - Fixing testcase expectation
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-15 12:44:28 -05:00
Joakim Erdfelt 76de1c0f24 Issue #3422 - WebSocket wss CLOSE_WAIT on aborted client connection
+ Adding testcase to replicate
+ Fixing CLOSE_WAIT by issuing wsclose + disconnect on eof

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-15 11:52:14 -05:00
Simone Bordet 01f2a4e16b
Merge pull request #3431 from eclipse/jetty-9.4.x_3425_upgrade_conscrypt_get_rid_reflect
Issue #3425 upgrade conscrypt to 2.0.0 and get rid reflect usage
2019-03-15 09:19:58 +01:00
Simone Bordet 123918018e Issue #3425 - Upgrade conscrypt version to 2.0.0 and remove usage of reflection.
Small fixes after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-15 09:19:16 +01:00
Greg Wilkins 59b026efce Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-14 18:22:29 +11:00
Greg Wilkins 74233d5711
Merge pull request #3441 from eclipse/jetty-9.4.x-3440-StopOnUnavailable
Issue #3440 Stop on Unavailable
2019-03-14 11:24:39 +11:00
Greg Wilkins ffdbbd1821 Issue #3440 Stop failed lifecycle
check that contexts after error are not started.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-14 09:07:16 +11:00
Joakim Erdfelt d719dce18c
Merge pull request #3445 from eclipse/jetty-9.4.x-3429-jmx-webappprovider
Issue #3429 - Adding WebAppProvider.scan() method to JMX
2019-03-13 16:50:13 -05:00
Greg Wilkins 67838609c3
Merge pull request #3435 from eclipse/jetty-10.0.x-3012-Compliance
Issue #3012 refactored HttpCompliance
2019-03-14 08:12:48 +11:00
Jan Bartel de5d04177e
Issue #3399 jetty.webapps.uri should be the parent of the webapp (#3430)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-03-14 07:59:25 +11:00
Joakim Erdfelt 32c5726f13 Issue #3429 - Adding WebAppProvider.scan() method to JMX
+ Fixing up some bad JMX attributes as well.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-13 15:00:41 -05:00
Joakim Erdfelt 012bfddddc Issue #3012 - Adding Cookie Compliance Listener support.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-13 12:35:02 -05:00
Joakim Erdfelt 07d62bb45e Issue #3012 - Fixing javadoc errors
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-13 11:46:23 -05:00
olivier lamy 7404cce052 remove debug logging
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 16:31:27 +01:00
olivier lamy a21dab222f fix simone review comments
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 16:29:21 +01:00
olivier lamy 9471eff332 Issue #3425 upgrade conscrypt to 2.0.0 add note to disable TLS 1.3 for Java 8
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
olivier lamy e2ddfbde00 Issue #3425 upgrade conscrypt to 2.0.0 disable TLSv1.3 for jdk8 tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
olivier lamy adbfcbcf60 - Issue #3425 upgrade conscrypt to 2.0.0 and get rid of reflection usage
- align conscrypt version in conscrypt.mod file
- add more simple unit test to test conscrypt alpn usage

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
Greg Wilkins 481cedaa94 Issue #3012 Compliance modes.
Fixed up httpCompliance configuration.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-13 16:43:11 +11:00
Greg Wilkins d8695f0712 Issue #3012 Compliance modes.
added valueOf methods for XML calls.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-13 15:43:38 +11:00
Greg Wilkins c7f66521cb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3012-Compliance 2019-03-13 14:59:02 +11:00