3e33b35d82
Issue #3170 - WebSocketProxy cleanup
...
removing old versions of the proxy frame handler
adding licence headers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 09:38:28 +11:00
4aa52c2f43
Issue #3170 - Improved testing for WebSocketProxy
...
- Added test cases to test failures in and around the WebSocketProxy
and how it handles them.
- In WebSocketChannel.sendFrame() we were using a null cause for
closeConnection, we are now extracting the cause from the
AbnormalCloseStatus. This was resulting in onError not being called
when there was actually an error and an AbnormalCloseStatus.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 09:29:28 +11:00
001bc8f296
Issue #3170 - WebSocketProxy separate actions from the state changes
...
only do state changes inside synchronized blocks, remember what action
to do and only do this outside of the synchronized block
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 09:29:28 +11:00
ace5e7bbe2
Issue #3170 - Redesign on the WebSocketProxy
...
- Redesigned the proxy into a new class called WebSocketProxy containing
a Client2Proxy FrameHandler and a Server2Proxy FrameHandler
- WebSocketProxy uses synchronized blocks with an enum state instead
of the previous compare and sets
- Created a new test similar to ProxyFrameHandlerTest to test the new
WebSocketProxy
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 09:29:28 +11:00
bace5cf82c
Issue #3170 - ProxyFrameHandler race between onOpen and onError
...
- Introduced an EMPTY_SESSION in the ProxyFrameHandler as a terminal
state to know whether a FailedCoreSession has been handled
- Use while(true) loops to do the compareAndSet in ProxyFrameHandler
- Improved the tests for the proxy so that it tests the frames received
at every state (ie Client Proxy and Server)
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 09:29:28 +11:00
bc3df4fd28
Issue #3170 - stop WebSocketCoreClient on close or failure
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 09:29:28 +11:00
55f82ceeec
Issue #3170 - WebSocket Proxy handle error and failure conditions
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 09:29:28 +11:00
c1e3e57f03
Issue #3170 - WebSocket Proxy PoC
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 09:29:28 +11:00
83b53f102c
Merge pull request #3336 from eclipse/jetty-10.0.x-3290-websocket-close
...
Jetty 10.0.x #3290 websocket close
2019-02-18 10:49:33 +01:00
85bc84b122
Issue #3341 - XmlHttpClientProvider
...
Updated comment referencing old class name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-18 10:40:32 +01:00
42290828a6
Merge pull request #3357 from lachlan-roberts/jetty-10.0.x-3341-HttpClientProvider
...
Issue #3341 - WebSocket HttpClientProvider
2019-02-18 10:37:08 +01:00
c14df16494
Merge pull request #3335 from lachlan-roberts/jetty-10.0.x-3290-websocket-close
...
Issue #3290 - FrameFlusher and WebSocket close fixes
2019-02-18 07:30:19 +09:00
a4a6bd03e7
Fix from review
...
use the new close(Throwable) in endpoint
2019-02-17 18:11:23 +09:00
d8b5f0e1b3
Issue #3341 - HttpClientProvider changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-15 18:31:53 +11:00
14d09bac5c
Fixing post-merge test failure in QuickStartTest
...
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-14 14:56:26 -05:00
7b686fa4b6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-02-14 10:25:59 -05:00
f88f856673
Merge pull request #3326 from eclipse/jetty-9.4.x-3278-empty-resourcecollection
...
Issue #3278 Empty ResourceCollection throws NPE
2019-02-14 10:22:48 -05:00
8969c9a18c
Issue #3278 - more cleanup based on review of older codebase with simone
2019-02-14 08:02:24 -05:00
a105c44856
Issue #3278 - code reformatting
2019-02-14 07:48:05 -05:00
432ed1f584
Issue #3278 - changes from review with simone
2019-02-14 07:43:17 -05:00
149620598d
Issue #3341 - change HttpClientProvider to interface
...
- HttpClientProvider is now an interface which defines a default method
newHttpClient, its static get() method get will attempt to use the
XmlHttpClientProvider to create a client, and if this fails to give a
non null client it will be created with the default newHttpClient method
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-14 16:13:43 +11:00
c6fd7a616f
Issue #3341 - Use HttpClientProvider in WebSocketCoreClient
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-14 12:19:00 +11:00
1150f20ed9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3278-empty-resourcecollection
2019-02-13 17:17:42 -05:00
a6c626a891
Fixing Javadoc
2019-02-13 17:17:11 -05:00
7ee7554b8f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3278-empty-resourcecollection
2019-02-13 17:09:38 -05:00
b9797b01eb
Merge pull request #3352 from eclipse/jetty-10.0.x-3351-restructure_unixsocket
...
Fixed #3351 - Restructure jetty-unixsocket module.
2019-02-13 15:19:51 +01:00
92417c0954
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 15:19:09 +01:00
e84feb22b3
Merge pull request #3356 from eclipse/jetty-9.4.x-3350-httpclient_default_sslcontextfactory
...
Issue #3350 - Do not expect to be able to connect to https URLs with …
2019-02-13 15:16:24 +01:00
ec3adb0c11
Issue #3350 - Do not expect to be able to connect to https URLs with the HttpClient created from a parameterless constructor.
...
This is a regression introduced by fixing #2817 .
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 09:37:05 +01:00
1b904c0b77
Fixed #3351 - Restructure jetty-unixsocket module.
...
Split the original module into modules -common, -client, -server.
Added module-info.java for the new modules, referencing the JNR
JPMS module names.
Updated depedencies from old module to new modules.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 09:16:56 +01:00
477d7cf1da
Merge pull request #3342 from eclipse/jetty-10.0.x-3320-review_module_info
...
Fixes #3320 - Review Jetty 10 module-info.java.
2019-02-12 21:51:36 +01:00
ae207bd6dc
Fixes #3320 - Review Jetty 10 module-info.java.
...
After review, keeping "requires static" only if the
module tree can be built without the static module.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 21:17:58 +01:00
009a4659a7
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Made sure web apps are unpacked in a directory
within $jetty.base to avoid cluttering /tmp.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 19:21:43 +01:00
1c55e2bf79
Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
...
Updated javax.annotation -> jakarta.annotation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 18:56:16 +01:00
0b2ca399c0
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 17:04:43 +01:00
bd6feceeb1
Merge pull request #3331 from eclipse/jetty-10.0.x-3225-sendErrorNoReason
...
Issue #3225 sendError does not set reason.
2019-02-12 16:20:58 +01:00
6aa917080f
Issue #3347 - Fix race condition between onFillable() and resume().
...
Renamed Suspender -> ReadState.
Reworked the implementation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 16:15:07 +01:00
a16d98ffd7
Merge pull request #3347 from shawnsmith/jetty-9.4.x-websocket-suspend-resume
...
Fix race condition between onFillable() and resume()
2019-02-12 15:08:43 +01:00
a1e6d5856a
Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
...
Updated javax.transaction -> jakarta.transaction.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 14:41:05 +01:00
5ce3d1bd61
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 11:23:56 +01:00
94829751a3
Merge pull request #3344 from eclipse/jetty-9.4.x_distribution_it_tests
...
Issue #3343 Add an API/tools to be able to test Jetty Distribution
2019-02-12 11:10:34 +01:00
b2e6fae511
Merge pull request #3346 from RichardBradley/vary-origin
...
Include Vary:Origin on all responses from CrossOriginFilter
2019-02-12 09:31:18 +01:00
265cc79225
jetty-distribution is test scope
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-12 18:22:39 +10:00
2d88b3b959
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Refactored streamers into class Run.
Added javadocs.
Moved "maven.resolver.version" to main POM for consistency.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 09:04:45 +01:00
a1a02d9942
fix CI test, distribution must be build first as we want to use a fresh build of the distro
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-12 12:25:57 +10:00
e16e836aa6
Fix race condition between onFillable() and resume()
...
Signed-off-by: Shawn Smith <shawn@thena.net>
2019-02-11 18:08:53 -06:00
9c59db6fdd
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Updated maven.version to 3.6.0.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 21:41:29 +01:00
3c665dfc1c
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Added missing license header.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 21:36:14 +01:00
b0207dd90d
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Reworked the implementation.
Deleted unused stuff.
Written more tests.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 19:37:49 +01:00
cb6b9d4a39
Include Vary:Origin on all responses
...
Signed-off-by: Richard Bradley <Richard.Bradley@softwire.com>
2019-02-11 14:07:41 +00:00
Lachlan Roberts
Simone Bordet
Greg Wilkins
Joakim Erdfelt
Joakim Erdfelt
olivier lamy
Shawn Smith
Richard Bradley