Commit Graph

23019 Commits

Author SHA1 Message Date
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
Joakim Erdfelt 64c7fe076a
Merge pull request #5957 from eclipse/jetty-9.4.x-5950-remove-logging-during-classloading
Issue #5950 - remove WebAppClassLoader logging during loadClass
2021-02-15 12:22:11 -06:00
Joakim Erdfelt 900b9d52c1
Merge pull request #5967 from eclipse/jetty-10.0.x-5966-remove-webapps-from-jetty-home
Issue #5966 - Remove /webapps from jetty-home
2021-02-15 12:21:20 -06:00
Ludovic Orban 4ec51fbbca abort when onError() fails
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-15 11:28:10 +01:00
Lachlan Roberts b69f470304 Issue #5828 - only use the HttpClient constructor for JavaxWebSocketClientContainer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-15 15:32:18 +11:00
Lachlan Roberts 0e4ed5c7b1 Issue #5828 - cleanups from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-15 15:13:02 +11:00
Ludovic Orban bf9318f2b8 fix HttpOutput.close() hanging forever when client sends TCP RST and GZIP is enabled
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-12 17:43:05 +01:00
Ludovic Orban 8049be5fcb repro test
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-12 17:11:38 +01:00
Ludovic Orban 67b533df87 Merge remote-tracking branch 'origin/jetty-9.4.x-5605-wakeup-blocked-threads' into jetty-10.0.x-5605-wakeup-blocked-threads 2021-02-12 16:57:27 +01:00
Nicolas 358526be04
Fix SampleStatistic.toString: mean dispay the max (#5962)
Signed-off-by: Nicolas Trangosi <nicolas.trangosi@dcbrain.com>
2021-02-12 14:32:54 +10:00
Ludovic Orban 31eedec1ed internalize the lock within the content producer
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-11 16:33:54 +01:00
Ludovic Orban 59b397b1a0 fix deadlock between HttpInput's lock and BlockingContentProducer's semaphore
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-11 15:33:54 +01:00
Joakim Erdfelt d6572823b9
Issue #5966 - Remove /webapps from jetty-home
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-11 08:04:29 -06:00
gregw e2c710e086 updates from review 2021-02-11 15:01:00 +01:00
Ludovic Orban 14108c8e58 set the read listener only after all checks are done
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-11 10:24:48 +01:00
Ludovic Orban 1494a05327 rework HttpInput locking
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-11 10:23:18 +01:00
Ludovic Orban 6d9d5484a7 lock all HttpInput methods to prevents concurrent threads to work on the same ByteBuffer
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-10 18:03:10 +01:00
Ludovic Orban f8bf885686 restore the committee's loop
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-10 18:02:37 +01:00
gregw 769687f773 update from the feedback on the feedback of the feedback from the review.
fix javadoc
2021-02-10 16:38:12 +01:00
Ludovic Orban 03e2789699 Merge remote-tracking branch 'origin/jetty-9.4.x-5605-wakeup-blocked-threads' into jetty-10.0.x-5605-wakeup-blocked-threads 2021-02-10 15:53:38 +01:00
Ludovic Orban 3c46c53d91 fix the committee's loop
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-10 15:49:55 +01:00
gregw 9f2a4f5ad5 Fix #5605 write side
refactored the complete method to consider unrecoverable API states no matter what the httpout state
actually is.  This avoid duplication of OPEN, CLOSING, CLOSED etc. handling.
2021-02-10 15:35:48 +01:00
Simone Bordet 29d48b0de5 Improvements to the Jetty documentation.
Documented the Jetty start mechanism.

Reorganized the documentation to look better on the TOC.

Improved JettyIncludeExtension to support replacements, deletions and callouts.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-10 11:27:30 +01:00
Olivier Lamy 68790d861c
Issue #5933 ClientCertAuthenticator is not using SslContextFactory (#5934)
Added SslClientCertAuthenticator
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>

Co-authored-by: gregw <gregw@webtide.com>
2021-02-10 11:03:54 +10:00
Lachlan 2549df99ce
Merge pull request #5935 from eclipse/jetty-10.0.x-5868-WSUpgradeRequestResponse
Issue #5868 - allow request attributes to be set in websocket upgrade
2021-02-10 10:56:18 +11:00
Lachlan 0fe4e78643
Merge pull request #5951 from eclipse/jetty-10.0.x-4515-WebSocketValidation
Issue #4515 - ValidationExtension should not downcast CoreSession
2021-02-10 10:56:03 +11:00
Ludovic Orban 3c4713db69 nit
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 17:47:11 +01:00
Ludovic Orban 12734b1496 committee loop rewrite
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 17:19:50 +01:00
Ludovic Orban ce29e7cf1c nits
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 17:12:17 +01:00
Ludovic Orban a29a054fe1 fix leak
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 17:02:54 +01:00
Ludovic Orban f81ff1707e move fill interested + pending read check out of upgrade
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 15:26:10 +01: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
Jan Bartel de76d44c97 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-09 09:49:24 +01:00
Jan Bartel 75183e8413
Issue #5909 - Better handling of merged RoleInfo during omitted method constraints (#5917)
* Fix #5909 Better handle merged RoleInfo

Signed-off-by: Jan Bartel <janb@webtide.com>

Co-authored-by: gregw <gregw@webtide.com>
2021-02-09 09:44:53 +01:00
Ludovic Orban 50a379d5cf align HttpInput and HttpOutput on recycle and reopen
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 09:27:26 +01:00