Commit Graph

20224 Commits

Author SHA1 Message Date
Lachlan Roberts 3344772e2f Issue #4447 - hard code in version for javax-websocket-api 1.1.2
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-03 18:29:46 +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 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
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
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
Lachlan Roberts f9f2ccaefa Issue #4383 - check for non multipart content type in constructor
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-22 14:26:36 +11:00
Greg Wilkins a76fd0e948 updated Weld
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-21 10:21:52 +01:00
Jan Bartel d74caab345
Issue #4496 Update paxexam for osgi tests (#4497)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-21 09:48:46 +01:00
Lachlan Roberts 0ab7751ef2 Issue #4383 - fix javadoc build issue
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-21 18:22:22 +11:00
Lachlan Roberts b217a35415 Issue #4383 - add State diagram and other changes for review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-21 16:14:01 +11:00
Jan Bartel 45b3a34170
Issue #4432 Implement get/setSessionTimeout for ServletContext (#4458)
* Issue #4432 Implement get/setSessionTimeout for ServletContext

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 17:26:55 +01:00
Lachlan Roberts c5d074e5f2 Issue #4383 - atomic state to MultiPart for multi-thread synchronization
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-20 22:36:23 +11:00
Jan Bartel b520ca6d30
Issue #4433 - Implement ServletContext.addJspFile (#4463)
* Issue #4433 Implement ServletContext.addJspFile

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 09:45:35 +01:00
Simone Bordet d0e6d123ba
Merge pull request #4494 from eclipse/jetty-10.0.x-3185-osgi_required_environment_java11
Fixes #3185 - Bundle-RequiredExecutionEnvironment: JavaSE-11 for Jett…
2020-01-20 09:43:55 +01:00
Jan Bartel fedc7c6599
Issue #4360 Update to jasper 8.5.49 (#4487)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 09:21:16 +01:00
Jan Bartel b805bf1324
Issue #4361 Update to apache jsp 9.0.29 (#4488)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 09:20:23 +01:00
Simone Bordet ab94112f66 Fixes #3185 - Bundle-RequiredExecutionEnvironment: JavaSE-11 for Jetty 10.0.x.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-19 19:03:09 +01:00
Joakim Erdfelt 92a2ceacbe Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2020-01-17 12:51:13 -06:00
Chris Walker 738c582468
Fixing documentation note 2020-01-17 12:29:28 -06:00
Chris Walker f37720fca4
Merge 9.4.x 2020-01-17 12:27:37 -06:00
Chris Walker 20af3c1b13
Noted 9.3 is deprecated 2020-01-17 12:25:04 -06:00