18980 Commits

Author SHA1 Message Date
Lachlan
557b619fab
Merge pull request #3853 from eclipse/jetty-10.0.x-3849-onError-abnormalClose
Issue #3849 - only notify onError for local errors
2019-07-06 13:34:35 +10:00
Lachlan Roberts
9449008581 Issue #3849 - only notify onError for local errors
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-05 16:06:56 +10:00
Simone Bordet
9902794988 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-07-04 21:36:13 +02:00
Simone Bordet
48209e340e Increase wait time to ensure that the session scavenging happens.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-07-04 21:35:06 +02:00
Lachlan Roberts
6eee5ad415 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 14:30:45 +10:00
Lachlan
d8164a1728
Merge pull request #3836 from eclipse/jetty-9.4.x-3835-WebSocketSession-LifeCycle
Issue #3835 - ensure WebSocketSessions are always stopped
2019-07-04 12:59:49 +10:00
Lachlan Roberts
d4217cb20b Merge remote-tracking branch jetty-9.4.x into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 12:39:03 +10:00
Lachlan
9d37c470d1
Merge pull request #3844 from eclipse/jetty-10.0.x-300-CompressionPool
Issue #300 - Deflater / Inflater Object Pool (Jetty-10)
2019-07-04 12:36:04 +10:00
Lachlan
4fb596cf1c
Merge pull request #3771 from eclipse/jetty-9.4.x-300-CompressionPool
Issue #300 - Deflater / Inflater Object Pool
2019-07-04 12:35:27 +10:00
Lachlan Roberts
062444630f Merge remote-tracking branch jetty-9.4.x into jetty-9.4.x-3835-WebSocketSession-LifeCycle
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 11:15:23 +10:00
Lachlan Roberts
d69bf31494 Issue #300 - fix test expectation after CompressExtension changes
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 11:10:24 +10:00
Lachlan Roberts
bb1a260fa5 Merge remote-tracking branch jetty-10.0.x into jetty-10.0.x-300-CompressionPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 10:22:10 +10:00
Lachlan Roberts
50c18798ba Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-300-CompressionPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 10:19:54 +10:00
Greg Wilkins
d744d097de
Checkstyle cleanup (#3847)
* Checkstyle cleanup
* fixed bug from reformat
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 17:24:08 +02:00
Greg Wilkins
9fe27eb8e3 Updated all arrays after merge of #3846
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 17:23:02 +02:00
Jan Bartel
5568f833e7 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:53:00 +02:00
Jan Bartel
bb7fb48f08
Fix checkstyle warnings for tests. (#3846)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:42:20 +02:00
Greg Wilkins
0ddf4fd044 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 11:55:03 +02:00
Greg Wilkins
f84337d5b2
Issue #3840 Slow skip for PathResource (#3845)
Reverted to use FileInputStream

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 11:48:49 +02:00
Greg Wilkins
5c91e44eaf
Issue #3700 better handling of null location (#3837)
Issue #3700 if a location is null then consider if there are inclusions and/or exclusions when matching a class.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 11:48:09 +02:00
Greg Wilkins
e7754f5885 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 08:44:41 +02:00
Greg Wilkins
21857f0b81 fixed checkstyle disable style
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 08:33:13 +02:00
Lachlan Roberts
b46c45f60f Merge remote-tracking branch 'eclipse/jetty-9.4.x-300-CompressionPool' into jetty-10.0.x-300-CompressionPool 2019-07-03 11:56:39 +10:00
Lachlan Roberts
325a084422 Issue #300 - improvements to CompressionPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-03 11:51:05 +10:00
Lachlan Roberts
1554b3dbb1 Issue #3835 - add default methods to WebSocketSessionListener
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-03 11:33:32 +10:00
Lachlan Roberts
07ee1d8fc6 Merge remote-tracking branch jetty-9.4.x into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-03 11:21:30 +10:00
Lachlan
f3f13c4ca9
Issue #2061 - fail current entry in CompressExtension on failure (#3830)
* Issue #2061 - fail current entry in CompressExtension on failure

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #2061 - do not notify callback failure twice

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-03 11:09:34 +10:00
Greg Wilkins
98d0737565 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-07-02 13:25:08 +02:00
Greg Wilkins
89e756a21e Fix checkstyle warnings
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-02 13:20:48 +02:00
Lachlan Roberts
196833d15e Issue #3835 - fix SessionTracker dump, add test assertions
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-02 19:06:05 +10:00
Lachlan Roberts
705e1cafe0 Issue #300 - use inflater/deflater pools in CompressExtension
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-02 16:42:50 +10:00
Lachlan Roberts
64eb3217cd Issue #300 - refactor usages of WebSocketComponents
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-02 15:28:58 +10:00
Lachlan Roberts
e8d21364c3 Merge remote-tracking branch 'jetty-9.4.x-300-CompressionPool' into jetty-10.0.x-300-CompressionPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-02 13:41:05 +10:00
Lachlan Roberts
c5172df484 fix RestartContextTest for javax WebSockets
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-02 11:32:08 +10:00
Jan Bartel
779b949d96 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-07-01 15:47:14 +02:00
Jan Bartel
cf4e7412d4
Issue #3815 Ensure user not in roles for PropertyFileLoginModule (#3826)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-01 15:46:14 +02:00
Jan Bartel
3d923c0cc9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-07-01 15:43:20 +02:00
Jan Bartel
e26179e8e9
Issue #3799 Programmatic listeners from ServletContextListeners. (#3824)
* Issue #3799 Programmatic listeners from ServletContextListeners.

Ensure programmatic listeners added from ServletContextListeners are
called.

Signed-off-by: Jan Bartel <janb@webtide.com>

* Issue #3799 add distribution test

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-01 15:14:19 +02:00
Jan Bartel
b867a1e049 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-07-01 15:09:51 +02:00
Jan Bartel
3d7409e341 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-07-01 15:09:14 +02:00
Jan Bartel
154e036b1d Fix file header in test class ClassOne.java
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-01 14:58:57 +02:00
Jan Bartel
4f74e19463
Issue #3749 Fix memory leak for AsyncContextListeners with annotations (#3769)
* Issue #3749 Fix memory leak for AsyncContextListeners with annotations

Also make InjectionCollection and LifeCycleCollection threadsafe for
readers with concurrent modifications.

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-01 14:46:40 +02:00
Greg Wilkins
b904abe53a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-01 09:39:51 +02:00
Greg Wilkins
1a6ceb2fa8
Issue #3805 Trim space on around XmlConfiguration fields (#3820)
Issue #3805 Trim space on around XmlConfiguration fields (#3820)
2019-07-01 09:32:00 +02:00
Lachlan
cbc4768cae
Issue #3159 - do not copy RSV bits to auto-fragmented frames (#3816)
* Issue #3159 - do not copy RSV bits to auto-fragmented frames

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - warn if DeflateFrameExtension detects autoFragment on

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - automatically set auto-fragment false in DeflateFrameExt

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - automatically set auto-fragment false in DeflateFrameExt

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - add todo

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-01 17:06:32 +10:00
Lachlan
ac8910e044
Issue #3809 - ensure abnormal close frame will hard close ws connection (#3819)
* Issue #3809 - ensure abnormal close frame will hard close ws connection

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - signal onError on abnormal status code close

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-01 16:50:56 +10:00
Lachlan Roberts
2383bf4974 Issue #3835 - ensure WebSocketSessions are always stopped
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-01 16:40:45 +10:00
Lachlan
fa4abfa6bb
Merge pull request #3365 from lachlan-roberts/jetty-10.0.x-3170-websocket-proxy
Issue #3170 - WebSocket Proxy
2019-07-01 11:53:48 +10:00
Greg Wilkins
c94230da40 Issue #3832 Test for proxy protocol v2
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-29 10:04:01 +02:00
olivier lamy
1dc1aa59be Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-06-28 18:38:21 +10:00