Commit Graph

19090 Commits

Author SHA1 Message Date
Lachlan 86d5ed0569
Merge pull request #3848 from eclipse/jetty-10.0.x-3839-JavaxWebSocketApiJar
Issue #3839 - copy dependency for jetty-javax-websocket-api
2019-07-10 15:48:29 +10:00
olivier lamy 352d1e7c3b fix checkstyle
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-09 18:27:14 +10:00
olivier lamy 81f433a975 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-07-09 17:52:35 +10:00
Olivier Lamy 433709a977
fix modifier order (#3859)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-09 17:51:05 +10:00
olivier lamy 4df544afc6 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-07-09 12:57:26 +10:00
olivier lamy 24afe806fc a bit more time to run all jmh tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-09 12:56:53 +10:00
olivier lamy 9d205f5531 reduce time of jmh run
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-09 09:05:14 +10:00
olivier lamy 0362595a40 javadoc plugin version 3.1.1
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-07 19:44:03 +10:00
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
Lachlan Roberts 9a2253d5a5 Merge remote-tracking branch jetty-10.0.x into jetty-10.0.x-3839-JavaxWebSocketApiJar 2019-07-04 10:13:13 +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
Lachlan Roberts e90b6fd02c Issue #3839 - copy dependency for jetty-javax-websocket-api
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-03 10:48:26 +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