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

5460 Commits

Author SHA1 Message Date
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 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
Simone Bordet 9b28a4a5c9 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-17 19:20:23 +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
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
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
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
gregw 071584668c updates from review 2021-02-16 18:42:28 +01:00
gregw 6b1a8c376f updates from review 2021-02-16 17:48:49 +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
Joakim Erdfelt 01fb5769f4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-15 14:18:34 -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 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
Ludovic Orban 4ec51fbbca abort when onError() fails 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-02-15 11:28:10 +01: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
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
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
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
Jan Bartel ec143aa0c5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-09 09:55:50 +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
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
Ludovic Orban d297e9c473 unblock readers after consumeAll 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-02-09 09:26:34 +01:00
Ludovic Orban 9611a252a5 Merge remote-tracking branch 'origin/jetty-9.4.x-5605-wakeup-blocked-threads' into jetty-10.0.x-5605-wakeup-blocked-threads 2021-02-08 10:52:57 +01:00
gregw ed534b84ef Fix #5937 
updates from review.
 2021-02-05 15:36:34 +01:00
Greg Wilkins f768e2ed68
Fix #5937 (#5949) 
Remove size limit on async static content.
 2021-02-05 14:50:14 +01:00
gregw 39f6f87ca7 Fix #5605 Unblock non container Threads 
Simplification. Always abort on any pending read or write in completion.
 2021-02-04 10:26:11 +01:00