Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,050 Commits 67 Branches 465 Tags 359 MiB
Commit Graph

1223 Commits

Author SHA1 Message Date
Joakim Erdfelt fdc210f382
Remove unused imports 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-07-27 08:03:00 -05:00
Joakim Erdfelt fd7a399e78
Issue #6487 - expose ServletHolder in ChainEnd 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-07-08 16:21:20 -05:00
Lachlan 3c32afa05c
Issue #6473 - canonicalPath refactor & fix alias check in PathResource (Jetty-10) (#6478) 
Issue #6473 - canonicalPath refactor & fix alias check in PathResource

* Reverted %-escape handling for URI query parts.
* Performing canonicalization in ServletContext.getResource(),
  and improving alias checking in ContextHandler.getResource().
* Performing canonicalization checks in Resource.addPath() to avoid
  navigation above of the root.
* Test added and fixed.
* Various cleanups.
* Improved javadoc and comments
* Compliance mode HttpURI uses UriCompliance.Violation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
 2021-06-29 15:42:39 +02:00
Joakim Erdfelt 9945225e30
Issue #6451 - Request.getServletPath returns null for root mapping 
Issue #6451 - Request.getServletPath not following spec
Force a pathInContext for ROOT servlet matches.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
 2021-06-22 08:43:15 +10:00
Lachlan cd73338b84
Remove WebSocketComponents & HouseKeeper on Server restart. (#6218) 
* Remove WebSocketComponents & HouseKeeper on Server restart.
* Add testing for cleanup of websocket when stopping server.
* Add removeFilterHolder and removeFilterMapping methods on ServletHandler.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-05-20 14:48:23 +02:00
Greg Wilkins 804630d41e
Jetty 10.0.x servletholder copy #6280 (#6281) 
Copy ServletHolder class/instance properly during startWebapp (#6214)
ServletHolder.copyClassServlet() method added to correctly copy held class.
Cherry picked from 9.4

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-05-16 20:01:03 +10: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
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 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
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
gregw 2001f9f963 fixed bad merge 2021-02-24 12:33:29 +01: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
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
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 5857496ef2 fix header 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-02-18 09:50:14 +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
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
Greg Wilkins 20ef71fe5d
Fix #4275 fail URIs with ambiguous segments (#5954) 
Handle URIs by first resolving relative paths and then decoding.
Added compliance mode to return 400 if there are ambiguous path segments.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-02-16 14:47:41 +01:00
Joakim Erdfelt d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 14:18:08 -06:00
Joakim Erdfelt 5dd987779c
Adding `WhitespaceAfter` checkstyle rule. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-02-15 12:48:24 -06:00
Greg Wilkins 3321ae71be
Fix #5939 unwrap ServletException (#5958) 
* Fix #5939 unwrap ServletException

Fix #5939 unwrap ServletException

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Fix #5939 unwrap ServletException

reverted default to false

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-02-09 10:03:00 +01:00
Ludovic Orban 421ed6bf8d implementation of HttpServletRequest.upgrade 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-02-03 13:10:38 +01:00
Greg Wilkins 5497eb5017 TCK work around for #5803 
TCK work around for #5803

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-01-27 13:49:15 +01:00
Joakim Erdfelt d8e410bbff
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-22 09:13:12 -06:00
Joakim Erdfelt 1701b83fd5
Merge pull request #5903 from eclipse/jetty-9.4.x-path-normalization-testing 
Fix DefaultServletTest cases which deal with filesystem path name normalization
 2021-01-22 09:11:36 -06:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-21 15:05:57 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-21 12:31:00 -06:00
Joakim Erdfelt 51d93f0771
Attempt to satisfy Filesystem behaviors in testcase. 
+ Not relying on OS type
 2021-01-18 09:03:03 -06:00
Jan Bartel 87a2cc2698 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-13 22:41:32 +01:00
Jan Bartel b99eb3f76c
Issue #5684 Fix and re-enable ServletRequestLogTest. (#5877) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-01-13 22:35:36 +01:00
gregw 7dfb44f7ad Revert TCK work around 
Revert temporary fix for challenged TCK test (#5803)
 2021-01-05 13:55:33 +01:00
Greg Wilkins 9edbd56ffb
Temporary fix for challenged TCK test (#5803) 
This is to pass the current TCK.  This has been challenged in https://github.com/eclipse-ee4j/jakartaee-tck/issues/585
 2020-12-14 15:12:11 +01:00
Joakim Erdfelt 2662be0a05
Merge pull request #5795 from eclipse/jetty-10.0.x-5784-fix-dual-license-text 
Issue #5784 - fix dual license text
 2020-12-11 11:37:58 -06:00
Greg Wilkins f17a5fb3fe
Fixes #5779 Include should not set pathInContext (#5780) 
Fixes #5779 by ensuring that ContextHandler does not set pathInContext for include.
 2020-12-11 10:04:31 +01:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-12-10 16:04:50 -06:00
Simone Bordet 8131bb2f85 Fixes #3080 - Do not create and use jars with "tests" classifier. 
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-26 11:20:36 +01:00
Simone Bordet 3ca8ef0297 Fixes #3080 - Do not create and use jars with "tests" classifier. 
Reinstated ServletTester in src/main/java for backwards compatibility.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-26 10:48:19 +01:00
Simone Bordet 5d83f6670a Fixes #3080 - Do not create and use jars with "tests" classifier. 
Removed the jetty-server and jetty-servlet test-jar artifacts.
The only one left is the jetty-maven-plugin test-jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-25 19:16:50 +01:00
Lachlan Roberts 7bc4ee6509 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketUpgradeFilter 2020-11-19 07:48:16 +11:00
Lachlan Roberts 6a83a261e1 Always add the default WebSocketUpgradeFilter as the first filter. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-18 21:27:25 +11:00
Joakim Erdfelt e9c6c942ea
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-17 09:12:50 -06:00
Joakim Erdfelt 314c65fb14
Issue #5539 - Adding StatisticsServlet tests in test-distribution 
+ Updating module definition for JSON

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 12:31:28 -06:00
Joakim Erdfelt 683d9a9349
Issue #5539 - Updating StatisticsServlet accept processing per review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:24 -06:00
Joakim Erdfelt c9440357a7
Issue #5539 - Fixing javadoc 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:23 -06:00
Joakim Erdfelt cc952f3a3a
Issue #5539 - Adding query parameter accept variation 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:22 -06:00