Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,836 Commits 72 Branches 465 Tags 374 MiB
Commit Graph

5341 Commits

Author SHA1 Message Date
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 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 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
gregw 096e8b83e9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-04 09:58:39 +01:00
gregw 7235e492c8 Fix #5605 Unblock non container Threads 
Simplification. Always abort on any pending read or write in completion.
 2021-02-04 09:58:24 +01:00
gregw e9315fe51f Fix #5605 Unblock non container Threads 
revert fillInterest cancellation and just abort connection instead.
tested for all transports
 2021-02-03 17:27:25 +01:00
Simone Bordet 0ccaa9f87b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-03 15:25:09 +01:00
Simone Bordet 0bbc9429a1 Fixed javadoc error. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-03 15:21:44 +01:00
gregw 5f4919c45a Fix #5605 Unblock non container Threads 
cleanup debug
 2021-02-03 14:04:29 +01:00
gregw 70056e2c69 Fix #5605 Unblock non container Threads 
fix test
 2021-02-03 13:40:06 +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
gregw 25cbe652a0 Fix #5605 Unblock non container Threads 
reorder
 2021-02-03 11:27:25 +01:00
gregw a100d80d26 Fix #5605 Unblock non container Threads 
Don't consumeAll before upgrade
 2021-02-03 11:03:02 +01:00
gregw a110fc3468 Fix #5605 Unblock non container Threads 
test and fixes for the write side.
 2021-02-02 17:55:15 +01:00
gregw 0d85c7d220 Fix #5605 Unblock non container Threads 
test and fixes for the write side.
 2021-02-02 17:49:17 +01:00
gregw 9cc7be4842 Fix #5605 Unblock non container Threads 
Ensure that HttpInput is always closed to EOF, EarlyEOF or Error, so that non container threads doing blocking reads
will not block forever, even if late.   Delay recycling of HttpInput until next request is received.
 2021-02-02 14:03: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 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 7d167e17fa
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-19 10:41:29 -06:00
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Joakim Erdfelt 25a3d19734
Adding IPv6 Address (non-literal) without port test case 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-14 10:03:06 -06:00
Simone Bordet 7fe8d1d4ad Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-12 10:43:02 +01:00
Lachlan 01c4390808
Merge pull request #5862 from eclipse/jetty-10.0.x-1673-generateTestKeystore 
Issue #1673 - generate test keystore instead of distributing one
 2021-01-12 17:18:24 +11:00
Simone Bordet 69cf23ab28 Improvements to the Jetty documentation. 
Ported the Jetty Server Dump documentation in the troubleshooting section.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-11 16:49:28 +01:00
Simone Bordet 6173e001fb Improvements to the Jetty documentation. 
Updated specific module documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-11 11:31:42 +01:00
Simone Bordet 26d64bd9db Improvements to the Jetty documentation. 
Updated the bytebufferpool module documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-11 11:31:30 +01:00
Simone Bordet d7e5587eee Fixes #5689 - Jetty ssl keystorePath doesn't work with absolute path. 
Introduced new properties jetty.sslContext.keyStoreAbsolutePath
and jetty.sslContext.trustStoreAbsolutePath to default to
${jetty.base}/etc/keystore.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-01-08 21:54:04 +01:00
Lachlan Roberts c2b9d92a2f Issue #1673 - generate keystore when using test-keystore module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-01-06 18:07:42 +11: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 51120b1f0b
Tries improvements (#5736) 
* ArrayTrie handles full alphabet
* TreeTrie handles case sensitive
* improved trie selection from Index builders
* optimisations, cleanups and benchmarks.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-01-05 12:52:34 +01:00
Lachlan 65a908b65d
Merge pull request #5807 from eclipse/jetty-10.0.x-5757-Charsets 
Cleanup of charset usage in Response
 2020-12-21 16:09:49 +11:00
Lachlan Roberts 477a6c0a10 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-15 20:58:33 +11:00
Lachlan Roberts 88a838fb17 Introduce extra enum state for DEFAULT encoding. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-15 13:40:22 +11:00
Lachlan Roberts b13fb8ad1e Resolve TODOs and other changes from review. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-15 12:21:47 +11: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
Greg Wilkins 25ddd6e154
Fix #5794 Close socket on bind failure (#5802) 
* Fix #5794 Close socket on bind failure

Fix #5794 Close socket on bind failure

* Fix #5794 Close socket on bind failure

Fix #5794 Close socket on bind failure

* Fix #5794 Close socket on bind failure

Update fix with IO.close()
 2020-12-14 12:16:44 +01:00
Simone Bordet adbe5c58a1 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-14 11:21:28 +01:00
Lachlan Roberts 908acd5904 The default iso-8859-1 encoding should be set in the Content-Type. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-14 17:22:36 +11: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
Joe Witt f7d4b940a2
Issue #5794 ensuring serverChannel is closed in the event of a failed bind to ensure proper resources are cleaned 
Signed-off-by: Joe Witt <joewitt@apache.org>
 2020-12-10 20:59:09 -07:00
olivier lamy 9b100a5bfb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-11 12:10:35 +10:00
Olivier Lamy 639cad63fe
Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735) 
* enable spotbugs in CI

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

record issues

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

use warning new generation

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

activate errorprone

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

fix Jenkinsfile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

junit should allow empty results

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

maven console can be use only once...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

one liner

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

recordissues only once

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

force id

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

aggregate results

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

configure a name for aggregated reports

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

mo more -T3 no need anymore of remote session test profile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

I want to see what failing tests look like with new report.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

skip spotbugs for jetty-jmh

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

get rid of findbugs as we now have spotbugs

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Revert "I want to see what failing tests look like with new report."

This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9.

activate errorProne parser

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

make pmd quiet for CI

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

remove -fae flag and do not display transfer progress

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

try junitParser() to see what it does

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

junit parser is a bad idea...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

increase timeout

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

no -T2 for javadoc

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

fix skip spotbugs and pmd verbose

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove -T options

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-11 11:47:26 +10: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
Lachlan Roberts f5fab09498 Issue #5757 - cleanup logic around character encoding in Response 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-09 15:25:46 +11:00
Lachlan Roberts 5490b3add4 Issue #5757 - improve javadoc around inferred and assumed charsets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-08 09:32:26 +11:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Simone Bordet a241b9dd5e Improved logging. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-27 13:43:09 +01:00
Ludovic Orban aa8bd5d820 replace Trie interface and impls usage with new *Index interfaces and Builders 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2020-11-26 14:14:16 +01:00
Simone Bordet ac3d492305
Merge pull request #5729 from eclipse/jetty-10.0.x-3080-no_classifier_tests 
Fixes #3080 - Do not create and use jars with "tests" classifier.
 2020-11-26 11:22:03 +01:00
Joakim Erdfelt fe0a4f624e
Merge remote-tracking branch 'origin/release-9.4.35' into jetty-9.4.x 2020-11-25 15:56:09 -06: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
dejpec 22c6b8fced
Access to cookie config with accessor method (#5526) 
With this minimal change one can provide different cookie configs for the same SessionHandler
without coping the whole method into the inherited class.

Signed-off-by: Dejan Pecar <dejan.pecar@abacus.ch>
 2020-11-25 14:24:29 +01:00
gregw 0a70cba8ae Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-24 18:36:24 +01:00
Greg Wilkins 9f82ca0a80
Use File.list and File.walk within a try with resource (#5718) 
* Use File.list and File.walk within a try with resource

The API contract of File.list and File.walk requires them to be closed after use.

* Fix from review

Left out filter

* Fix from review

Factored out deleteFile with better debug

* Fix from review

Can delete files whilst walking

* Fix from review

Restored sweepFile
fixed minor code suggestions
 2020-11-24 18:12:42 +01:00
Ludovic Orban 2d46951bcb remove unnecessary transition to READY in ContentProducer.isReady 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2020-11-23 16:25:35 +01:00
Simone Bordet 1ac0af4a76 Fixes #5691 - HttpInput may skip setting fill interest. 
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-21 16:40:12 +01:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
Simone Bordet 4654335fdb Fixes #5691 - HttpInput may skip setting fill interest. 
HttpInput.run() now uses contentProvider.isReady() to ensure that
if there is no content, the fill interest is set.

AsyncContentProvider.isReady() is now looping if there is content
but it cannot be transformed (e.g. too few gzipped bytes).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-20 16:52:14 +01:00
Simone Bordet 8edb5cfc24 Issue #5691 - HttpInput may skip setting fill interest. 
Code cleanups and logging improvements.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-20 16:50:24 +01:00
Simone Bordet 88c03ac1dc Issue #5605 - java.io.IOException: unconsumed input during http request parsing. 
Fixed test after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-19 16:47:36 +01:00
Simone Bordet cb10c35daf Issue #5605 - java.io.IOException: unconsumed input during http request parsing. 
Fixed detection of EOF in failAllContent().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-19 15:21:58 +01:00
Simone Bordet e3e5c2e25a Issue #5605 - java.io.IOException: unconsumed input during http request parsing. 
Writing content in separate writes may result in the server
only reading partial content, producing a response with
`Connection: close` that would cause the client socket to
stop receiving data for the next response, failing the test.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-18 21:41:08 +01:00