Commit Graph

17869 Commits

Author SHA1 Message Date
Joakim Erdfelt 5095c8a7b2 Issue #3288 - Correcting Jetty WebSocket API artifactIds
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-23 15:58:11 -06:00
Joakim Erdfelt 0b3262e16c
Merge pull request #3275 from eclipse/jetty-10.0.x-issue-3274-exclude-osgi-foundation-conflicting-classes
Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes
2019-01-23 10:50:56 -06:00
Greg Wilkins 6fc1cb5ca6
Merge pull request #3262 from eclipse/jetty-10.0.x-3167-2175-websocket-close
Jetty 10.0.x 3167 2175 websocket close clean up
2019-01-23 10:32:16 +11:00
Greg Wilkins d520ae5a11 Issue #2175 cleanups after review
Re implemented a queue and flusher above extension stack to serialize
frame handling without holding a lock when calling callbacks

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-23 09:06:27 +11:00
Greg Wilkins 3d7ee93112 Issue #2175 cleanups after review
Re implemented a queue and flusher above extension stack to serialize
frame handling without holding a lock when calling callbacks

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-23 08:49:55 +11:00
Greg Wilkins d598e0dc6f Issue #2175 cleanups after review
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 21:20:01 +11:00
Greg Wilkins 7fec51ad40 Issue #2175 cleanups after review
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 15:41:46 +11:00
Greg Wilkins 1189ceed4c Issue #2175 cleanups after review
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 13:36:09 +11:00
Greg Wilkins 05dfbd18cd Issue #2175 cleanups after review
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 13:25:29 +11:00
Jan Bartel c2224e3118 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-01-22 12:42:55 +11:00
Jan Bartel 60158edd2b
Issue #3280 Remove unused build.properties from osgi (#3281)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-01-22 12:41:28 +11:00
Greg Wilkins f9b9cc1313 Issue #2175 cleanups after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 09:11:05 +11:00
Greg Wilkins 8aca98976d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-2175-websocket-close 2019-01-22 08:47:27 +11:00
Joakim Erdfelt 5bed6a4fd8 Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-18 11:17:49 -06:00
Simone Bordet afa708a6b8
Merge pull request #3273 from oglueck/jetty-9.4.x
make JAASPrincipal thread-safe
2019-01-18 17:20:08 +01:00
Ortwin Glück 1df8dfcc91 make JAASPrincipal thread-safe
It's immutable anyway, so declare its only instance var final.

Signed-off-by: Ortwin Glück <odi@odi.ch>
2019-01-18 14:52:34 +01:00
olivier lamy 2f6d0b3fb7 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-17 15:35:27 +10:00
Olivier Lamy 766e088109
Issue #3241 Jetty runner add missing Main-Class in MANIFEST (#3260)
* Issue #3241 no Main Class attribute in MANIFEST for jetty-runner

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-17 15:24:07 +10:00
Simone Bordet 2ddd00ec37 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:33:13 +01:00
Simone Bordet 2a8b4c4c47 Updated ALPN to JDK 8u201 and 8u202.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:25:39 +01:00
Simone Bordet 0e17b56aaf Updated ALPN to JDK 8u201 and 8u202.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:12:25 +01:00
Simone Bordet cdd553332c Updated ALPN version for JDK 8u201 and 8u202. 2019-01-16 17:03:51 +01:00
olivier lamy 14aa789738 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-16 21:48:57 +10:00
Greg Wilkins f16789b101 Issue #3167 cleanups after merge (in #2175)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-16 15:19:36 +11:00
Greg Wilkins c89de87f38 Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-2175-websocket-close 2019-01-16 09:14:49 +11:00
Greg Wilkins 4f65799a7b
Merge pull request #3222 from eclipse/jetty-10.0.x-3167-websocket-mapping
Jetty 10.0.x #3167 refactor websocket mapping
2019-01-16 09:13:42 +11:00
Lachlan Roberts 2fc6185c29 Issue #3236 - fixed CustomRequestLogTest failure when JAVA_HOME not set
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 13:11:06 -06:00
olivier lamy 027a91d224 maven assembly plugin 3.1.1
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-15 21:20:46 +10:00
Simone Bordet 1eb6339a6d
Merge pull request #3255 from eclipse/jetty-10.0.x-2095-remove_fcgi_multiplex
Fixes #2095 - Remove FastCGI multiplexing.
2019-01-15 11:02:00 +01:00
Greg Wilkins be69351f0e Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 18:02:41 +11:00
Greg Wilkins 4a70d1534e Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 17:59:09 +11:00
Greg Wilkins 5307f49bbc
Merge pull request #3259 from lachlan-roberts/jetty-10.0.x-websocket-tests
Issue #3246 - javax-websocket-tests exception stacktraces
2019-01-15 17:56:08 +11:00
Lachlan Roberts dde42fc22e Issue #3246 - fix possible illegal javadoc symbol
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 17:54:53 +11:00
Lachlan Roberts b7219d9d9b Issue #3246 - remove debugging code from cherry-picked commit
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 17:49:20 +11:00
Greg Wilkins c84f97e983 Issue #3246 Avoid concurrent raw write on fuzzer client
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 16:58:30 +11:00
Greg Wilkins 391f2b1a27 Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close 2019-01-15 16:28:39 +11:00
Greg Wilkins 4f570b62e3 BrowserTool enhancements
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 16:28:01 +11:00
Greg Wilkins 12655a0944 Working BrowserDebugTool for jetty websocket API
Plus fixes for 10.0.x

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 15:54:09 +11:00
Jan Bartel 0e97d9b68d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-01-15 14:57:21 +11:00
Jan Bartel 9f3f3b78ae
Issue #3250 Ease osgi debugging (#3251)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-01-15 14:38:16 +11:00
Greg Wilkins aedf17b020 Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close 2019-01-15 14:13:55 +11:00
Greg Wilkins 30db9addbb fixed javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 14:13:13 +11:00
Greg Wilkins be3b155e32 fixed merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 14:01:25 +11:00
Greg Wilkins 878e51032d Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close 2019-01-15 13:38:19 +11:00
Greg Wilkins a2d3a81cef
Merge pull request #3253 from lachlan-roberts/jetty-10.0.x-3167-2175-websocket-close
Issue #3167 - Refactor of WebSocketChannelState
2019-01-15 13:37:17 +11:00
Greg Wilkins e1daad1599 Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 13:31:11 +11:00
Greg Wilkins 3246d07ca9 Revert "Working BrowserDebugTool for jetty websocket API"
This reverts commit c320e020d2.
2019-01-15 13:14:53 +11:00
Lachlan Roberts 5d31612ec2 Merge remote-tracking branch 'eclipse/jetty-10.0.x-3167-2175-websocket-close' into jetty-10.0.x-3167-2175-websocket-close 2019-01-15 13:05:23 +11:00
Lachlan Roberts 63a1db39a0 Issue #3167 - simplification of WebSocketChannelState from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 11:58:39 +11:00
Greg Wilkins 664ddef6fd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:44:53 +11:00