Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,953 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

22953 Commits

Author SHA1 Message Date
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
Joakim Erdfelt a5c8fee872
Merge pull request #5976 from eclipse/jetty-9.4.x-new-header-rules 
Adding requested Rewrite Rule to force request header values
 2021-02-18 07:27:59 -06:00
gregw 1113b15110 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-18 14:18:31 +01:00
Joakim Erdfelt 10e531756b
Merge pull request from GHSA-m394-8rww-3jr7 
Use comparator based sort
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: gregw <gregw@webtide.com>

Co-authored-by: gregw <gregw@webtide.com>
 2021-02-18 14:14:38 +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
Simone Bordet 938d7d8e88 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-17 19:15:09 +01:00
gregw 97ee0fd527 fixed bad merge 2021-02-17 18:49:37 +01:00
Simone Bordet 70d6724d93
Merge pull request #5974 from eclipse/jetty-9.4.x-5973-proxy_client_tls_auth_example 
Fixes #5973 - Proxy client TLS authentication example.
 2021-02-17 18:32:35 +01:00
gregw 349b89d7e4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2021-02-17 18:11:02 +01:00
gregw ea3f3a5b93 Update merge to 10 comment 2021-02-17 18:09:37 +01:00
Greg Wilkins ad6fc62bb5
Cleanup setPathQuery from #5954 (#5981) 
Cleanup setPathQuery from #5954 so that it does not retain an old query if the passed string does not contain a query
 2021-02-17 18:05:12 +01:00
Simone Bordet 322d1018a7 Improvements to the Jetty documentation. 
Documented the Jetty modules.

Improved the TOC javascript, as it was not working if the link had sub-elements.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-17 15:58:36 +01:00
Simone Bordet 25d90380c7 Fixes #5973 - Proxy client TLS authentication example. 
Examples, in form of test cases for a proxy that uses TLS client authentication
both towards the remote client and towards the server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-17 14:48:47 +01:00
Ludovic Orban 4cfe7b9e3b
Merge pull request #5953 from eclipse/jetty-10.0.x-5605-wakeup-blocked-threads 
Jetty 10.0.x Fix #5605 Unblock non container Threads
 2021-02-17 14:46:56 +01:00
Ludovic Orban b3bebca034
Merge pull request #5936 from eclipse/jetty-9.4.x-5605-wakeup-blocked-threads 
Fix #5605 Unblock non container Threads
 2021-02-17 14:46:32 +01:00
Joakim Erdfelt 30c1b467c8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-new-header-rules 2021-02-17 06:40:03 -06:00
gregw 379d06901f Merge branch 'jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-17 12:42:18 +01:00
gregw 1e364eccf8 Re re Fix rewrite tests for #5954 
Re re Fix rewrite tests for #5954. Restore setPathQuery behaviour to preserve queries if none are set.
 2021-02-17 12:41:55 +01:00
gregw 07c59ce410 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2021-02-17 12:16:59 +01:00
gregw bbf26a30fb Merge branch 'jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-17 12:14:08 +01:00
gregw dd5a565c08 Re re Fix rewrite tests for #5954 
Re re Fix rewrite tests for #5954. Restore setPathQuery behaviour to preserve queries if none are set.
 2021-02-17 12:12:56 +01:00
gregw 5a2df2349e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2021-02-17 10:56:00 +01:00
gregw 83496141a6 Merge branch 'jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-17 10:52:24 +01:00
gregw 3d19679d10 Fix setQueryString issue from #5954 
Rewrite rule depending on probably bug that setURIPathQuery did not actually set query if none was passed.
This is a bit of a work around, but further review is needed to see if anything else relied on that behaviour.
 2021-02-17 10:51:55 +01:00
gregw 78ed082d59 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-17 10:28:06 +01:00
Joakim Erdfelt 7e1de5e9fa
Adding requested rewrite rule to force request header value 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-02-16 13:58:42 -06:00
gregw 071584668c updates from review 2021-02-16 18:42:28 +01:00
gregw 73f8af19f1 Fixed bad merge 2021-02-16 18:18:46 +01:00
gregw 6b1a8c376f updates from review 2021-02-16 17:48:49 +01:00
gregw 472f04c1eb fix checkstyle 2021-02-16 17:01:46 +01:00
gregw 8c2a6992f4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2021-02-16 16:56:34 +01:00
gregw 7769f61242 Fixed checkstyle 2021-02-16 16:55:14 +01:00
gregw ff3d5656a2 fix test style 2021-02-16 16:54:05 +01:00
gregw ccfec2fc4f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2021-02-16 16:40:11 +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
Ludovic Orban ace019ab2d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5605-wakeup-blocked-threads 2021-02-16 13:35:18 +01:00
olivier lamy 19c32d6087 fix compilation 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-02-16 21:01:13 +10:00
Joakim Erdfelt e3760b8126
Fixing accidentally doubled line in license header 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-02-15 14:27:02 -06:00
Joakim Erdfelt 7ed68d0681
Issue #5492 - Updating jetty-start property test expectations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-02-15 14:25:09 -06: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 1b15c1e4a3
Issue #5492 - Changing from "java.feature.*" to "runtime.feature.*" 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-02-15 13:09:24 -06:00
Joakim Erdfelt de5b8bc84a
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5492-java-features-start-properties 2021-02-15 12:59:48 -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
Ludovic Orban f70a76651d replace semaphore with cond variable + counter 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-02-15 19:29:21 +01:00
Joakim Erdfelt a8597e07fe
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 12:25:15 -06:00