Commit Graph

1997 Commits

Author SHA1 Message Date
Joakim Erdfelt 67db25be16
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-05-12 11:04:26 -05:00
Greg Wilkins f26af79d38 Fix #3764 DeprecationWarning decorator
Add in doStart

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-05-12 20:46:43 +10:00
Olivier Lamy 3ee2ba7172 Updating to version 11.0.3-SNAPSHOT 2021-03-26 06:58:38 +00:00
Olivier Lamy 14ed9a5264 Updating to version 11.0.2 2021-03-26 06:41:47 +00:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
olivier lamy 61b5e1a8af revert back to 11.0.2-SNAPSHOT
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-26 16:15:49 +10:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-26 06:10:47 +00:00
Jesse McConnell e1f2f8c989
Updating to version 11.0.3-SNAPSHOT 2021-03-25 11:14:04 -05:00
Jesse McConnell 0a126e2e21
Updating to version 11.0.2 2021-03-25 10:58:33 -05:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:02:45 +01:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
Simone Bordet 43104e2077 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-22 23:34:08 +01:00
Greg Wilkins 916f4614e6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-22 21:32:45 +11:00
Greg Wilkins c59de808f1
Fix #5835 Durable filters and servlets (#6027)
Fix #5835 Durable filters and servlets with a general ServletHandler cleanup
update indexes after updating mapping
update mappings/indexes before destroyed listeners

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-22 11:28:25 +01:00
Joakim Erdfelt 4e41d8d3e9
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-10 06:24:53 -06:00
Joakim Erdfelt 2710f22e53
Issue #6028 - Adding test of Request.getContextPath() for root context
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 15:04:41 -06:00
gregw 694d3a3e3c Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-02 12:00:00 +01:00
Greg Wilkins 06e1a7e88d
URI compliance modes for #6001 (#6006)
* Fix #4275 separate compliance modes for ambiguous URI segments and separators

default modes allows both ambiguous separators and segments, but still forbids ambiguous parameters

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-02 11:59:16 +01:00
Joakim Erdfelt 7df67f3a3c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-25 15:52:29 -06:00
gregw 2001f9f963 fixed bad merge 2021-02-24 12:33:29 +01:00
olivier lamy a58c8469fe Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-23 10:45:36 +10:00
olivier lamy 0f32e264a2 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-23 10:38:05 +10:00
olivier lamy b836c2fda3 add test for fix containsHeader test when it is not instance of Response, Issue #5977 was partially fixed
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-23 10:32:00 +10:00
Joakim Erdfelt 3f0f57cefc Updating to version 11.0.2-SNAPSHOT 2021-02-19 16:20:48 -06:00
Joakim Erdfelt e98092c179 Updating to version 11.0.1 2021-02-19 16:02:24 -06:00
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
Joakim Erdfelt ea2a76ed3b Updating to version 9.4.38-SNAPSHOT 2021-02-19 09:44:28 -06:00
Joakim Erdfelt 27afab2bd3 Updating to version 9.4.37.v20210219 2021-02-19 09:03:57 -06:00
Simone Bordet 80f4254f32 Fixed javadocs referencing javax.servlet.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-19 14:48:21 +01:00
Jan Bartel 5d5c8a2f76 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-19 10:33:02 +01:00
Jan Bartel 3a32a80b9c
Unify the handling of ServletContainerInitializers (#5959)
* Unify ServletContainerInitializer handling.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-19 10:20:27 +01:00
Joakim Erdfelt 98518c96fe
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-18 11:39:59 -06:00
gregw bb5fefdaeb Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-18 17:44:46 +01:00
Greg Wilkins 324ab668de
More optional etag gzip fixes for #5979 (#5986)
* More optional etag gzip fixes for #5979

IF no separator defined, do not add a suffix to an etag.
Some cleanup of the implementation.

* More optional etag gzip fixes for #5979

updates from review
2021-02-18 17:24:16 +01:00
olivier lamy b4cc14834b fix compilation
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-18 14:36:46 +10:00
olivier lamy e90ffbecba Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-18 09:52:07 +10:00
olivier lamy 5857496ef2 fix header
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-18 09:50:14 +10:00
Olivier Lamy 5eb17a0a66 Issue #5977 do not force Cache-Control header if already set (#5978)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-18 09:40:30 +10:00
Greg Wilkins 71fb369dc5 Fix #5979 by allowing a configurable etag separator. (#5980)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-02-18 09:39:25 +10:00
olivier lamy 1d5662f841 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-18 07:44:37 +10:00
Olivier Lamy addfbe81c1
Issue #5977 do not force Cache-Control header if already set (#5978)
* Issue #5977 do not force Cache-Control header if already set

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-18 07:29:24 +10:00
Greg Wilkins a8b4927427
Fix #5979 by allowing a configurable etag separator. (#5980)
* Fix #5979 by allowing a configurable etag separator.

Fix #5979 by allowing a configurable etag separator

* updates from review

* Updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-02-17 22:19:23 +01:00
Ludovic Orban 22be42c436 Merge branch 'jetty-10.0.x' into jetty-11.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-17 16:38:06 +01:00
gregw 73f8af19f1 Fixed bad merge 2021-02-16 18:18:46 +01:00
gregw 172cd61878 merge from 9.4.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-16 16:35:57 +01:00