Commit Graph

2093 Commits

Author SHA1 Message Date
Joakim Erdfelt 7d60e56e51
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-21 10:42:02 -06:00
Joakim Erdfelt cf0193421e
Issue #8905 - GzipHandler should include `Vary` header on 304 (Not Modified) responses (per RFC9110)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 14:31:44 -06:00
Jan Bartel c4ef972190 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-17 11:03:47 +11:00
Jan Bartel d9b6aa02f2
Issue #8712 Deprecate ELContextCleaner (#8713) 2022-10-17 11:02:16 +11:00
Olivier Lamy 6b1611592d
merge back release branch to bump version to 11.0.13-SNAPSHOT (#8594)
* Updating to version 11.0.12

* Updating to version 11.0.13-SNAPSHOT

* add release jetty-9.4.49.v20220914 and 10.0.12 in VERSION.TXT
2022-09-16 19:50:26 +10:00
Olivier Lamy dbd07146ec
merge back release branch to bump version to 10.0.13-SNAPSHOT (#8593)
* Updating to version 10.0.12

* Updating to version 10.0.13-SNAPSHOT

* VERSION.TXT =+ content of jetty-9.4.49.v20220914 release

* remove strange line and reorder
2022-09-16 19:50:12 +10:00
Simone Bordet 7fb4ac559d
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-06 09:40:25 +02:00
Simone Bordet 77ad0189ba
Fixes #8532 - Review System.nanoTime() usages. (#8535)
* Fixes #8532 - Review System.nanoTime() usages.

Introduced o.e.j.util.NanoTime class to deal with nanoTimes.

Now NanoTime.now() should be used instead of System.nanoTime(),
and various <unit>[elapsed|since|until]() methods to calculate nanoTimes.

Furthermore, comparing 2 nanoTimes should be done via isBefore(),
rather than using the < operator, which is wrong as specified in
the System.nanoTime() javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-06 09:30:02 +02:00
Joakim Erdfelt eddff4d2ee
Merge Release 11.0.11 back into `jetty-11.0.x` (#8193)
* Updating to version 11.0.11

* Updating to version 11.0.12-SNAPSHOT
2022-06-22 16:24:57 -05:00
Joakim Erdfelt 64d12e2a5a
Merge Release 10.0.11 back into `jetty-10.0.x` branch (#8194)
* Updating to version 10.0.11

* Updating to version 10.0.12-SNAPSHOT
2022-06-22 16:24:48 -05:00
Joakim Erdfelt 8149350c10
Merge Release 11.0.10 back into `jetty-11.0.x` (#8181)
* Updating to version 11.0.11-SNAPSHOT
2022-06-21 14:45:00 +02:00
Joakim Erdfelt c2bc103cb9
Merge Release 10.0.10 back into `jetty-10.0.x` (#8180)
* Updating to version 10.0.11-SNAPSHOT
2022-06-21 14:41:41 +02:00
Joakim Erdfelt 1a217f4d29
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-16 13:53:28 -05:00
Joakim Erdfelt 1b4f941942
RegexPathSpec documentation and MatchedPath improvements (#8163)
* More documentation

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-06-16 13:53:04 -05:00
Joakim Erdfelt 69216a5e3d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-08 12:46:30 -05:00
Joakim Erdfelt 8de55150fe
Cherry-pick of Improvements to PathSpec for Jetty 10.0.x (#8136)
* Cherry-pick of Improvements to PathSpec.
* From commit: 5b4d1dd1c6
* Fixing ConstraintSecurityHandler usage of PathMappings
* Fixing bad INCLUDE logic from cherry-pick in ServletHandler.doScope()
* Cleanup of non ServletPathSpec behaviors in ServletPathMapping class
* Skip optional group name/info lookup if regex fails.
* Prevent NPE on static servletPathMappings
* Update WebSocketMappings to use new PathMappings.getMatched(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-06-08 12:36:30 -05:00
Joakim Erdfelt 8a2785afae
Fix imports and checkstyle 2022-05-18 17:03:12 -05:00
Joakim Erdfelt a5df3eb7f8
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-18 15:12:47 -05:00
Joakim Erdfelt 546c382255
Issue #7858 - GzipHandler request.isHandled support (#8013)
* Better conditional logic in GzipHandler
* Correct test expectations
* Use super.handle() where appropriate

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-05-18 15:12:16 -05:00
Joakim Erdfelt 563500f2df
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-11 16:14:04 -05:00
markslater b47d9c41d7
#7880 retain resource service configuration (#7881)
* #7880 PrecompressedFormats set on ResourceService are used in DefaultServlet unless overridden by an InitParameter.
* #7880 Fix checkstyle violations.
* #7880 Fix NPEs.
2022-05-11 16:08:28 -05:00
Lachlan Roberts 503c534def Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-09 15:59:04 +10:00
Lachlan 7a5ea2bac0
Merge pull request #7873 from eclipse/jetty-10.0.x-4414-gzipInflationExclusion
Issue #4414 - add option to exclude paths from GzipHandler request inflation
2022-05-09 15:58:19 +10:00
Greg Wilkins 544d5eb954 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-04-25 08:31:37 +02:00
Greg Wilkins efd9f26024
Fix #7891 regex pathInfo (#7892)
Fix 7891 regex pathInfo

+ Use the pathSpec methods to set servletPath and pathInfo when possible

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-04-25 08:30:31 +02:00
Lachlan Roberts 5c760ae5a3 Issue #4414 - add option to exclude paths from GzipHandler request inflation.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-04-12 14:53:53 +10:00
Joakim Erdfelt a546006eea
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-04-11 10:09:31 -05:00
markslater 8bcb842fbb
#7863 Include value of first accept-encoding header where multiple accept-encoding headers are given. (#7864)
Signed-off-by: markslater <mark.slater@mail.com>
2022-04-11 10:09:18 -05:00
Joakim Erdfelt 16420f0181
Set version to `10.0.10-SNAPSHOT` (#7823)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-04-03 20:33:44 +10:00
Olivier Lamy 0c7bb8b43f
unwrap exception until we get the first non ServletException, as this can be wrap of wrap of wrap when using ContextHandlerCollection (#7803)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-04-03 20:31:46 +10:00
Joakim Erdfelt f079949a35
Merge Release 10.0.9 (#7821)
* Updating to version 10.0.9

* Updating to version 10.0.10
2022-04-02 08:43:44 -05:00
Joakim Erdfelt 9548ab0cc9 Updating to version 11.0.10-SNAPSHOT 2022-03-30 13:06:46 -05:00
Joakim Erdfelt 243a48a658 Updating to version 11.0.9 2022-03-30 12:43:51 -05:00
Joakim Erdfelt d3eedfc553
Fix #7777 - ServletRequestListener init test fix 2022-03-25 12:39:00 -05:00
Joakim Erdfelt 821fa15e73
Fixing merge, import javax -> jakarta references
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-03-22 13:52:24 -05:00
Greg Wilkins 43cfbe8084 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-03-22 09:51:58 +01:00
Greg Wilkins cab9945430
Issue #7748 - allow override of path mapping behavior in ServletContextHandler (#7614)
Added protected method to ServletHandler to allow other servlet mappings (eg regex) in embedded/extended usage

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-03-22 09:48:09 +01:00
Lachlan Roberts 5e752a9789 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-02-17 09:11:15 +11:00
Lachlan Roberts 0aa307db64 Issue #7567 - don't compare params when checking MIME type for GzipHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-02-14 12:13:14 +11:00
Simone Bordet 4e02be57fd
Updating to version 11.0.9-SNAPSHOT 2022-02-07 12:42:04 +01:00
Simone Bordet 79cc9cf90e
Updating to version 11.0.8 2022-02-07 12:10:09 +01:00
Simone Bordet a4fda96f49
Updating to version 10.0.9-SNAPSHOT 2022-02-07 12:02:02 +01:00
Simone Bordet 716c7afd8e
Updating to version 10.0.8 2022-02-07 11:34:12 +01:00
Joakim Erdfelt be58156c77
Happy New Year 2022 (#7460)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-27 10:42:43 -06:00
Joakim Erdfelt cb127793e5
Happy New Year 2022 (#7459)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-27 10:42:30 -06:00
Lachlan Roberts 258e1b3803 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-12-15 10:18:35 +11:00
Lachlan 39585ea86e
Merge pull request #7263 from eclipse/jetty-10.0.x-7262-ServletHandlerGetFilterChain
Issue #7262 - make the ServletHandler.getFilterChain method protected
2021-12-15 10:17:07 +11:00
Lachlan Roberts 7672980afe Issue #7262 - make the ServletHandler.getFilterChain method protected
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-12-13 11:35:07 +11:00
Lachlan Roberts 0d9fe66e8a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-12-07 09:45:49 +11:00
Lachlan e345ee28a5
Issue #7059 - prevent an internal NPE in AllowedResourceAliasChecker doStart (#7076)
- prevent an internal NPE in AllowedResourceAliasChecker doStart
- Fix LifeCycle issues with AllowedResourceAliasChecker
- add null check for protected targets in toString.
- improve warning message for AllowedResourceAliasChecker
- add AllowedResourceAliasCheckerTest
2021-12-07 09:37:11 +11:00