Commit Graph

3654 Commits

Author SHA1 Message Date
Greg Wilkins 8bd4a9fad8
Fix #5999 ArrayIndexOutOfBounds for unicode in HttpURI segment (#6000)
Fixed ArrayTrie to not throw if passed a unicode character.
2021-02-23 20:03:45 +01:00
Simone Bordet 530c14e7b3 Issue #5994 - QueuedThreadPool "free" threads
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-23 18:12:55 +01:00
Simone Bordet 64e01beeeb Fixes #5994 - QueuedThreadPool "free" threads
Introduced to QueuedThreadPool:

* getMaxReservedThreads()
* getAvailableReservedThreads()
* getAvailableThreads()
* getReadyThreads()
* getLeasedThreads()

Also few small code cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-22 23:02:12 +01:00
Joakim Erdfelt 3f0f57cefc Updating to version 11.0.2-SNAPSHOT 2021-02-19 16:20:48 -06:00
Joakim Erdfelt e98092c179 Updating to version 11.0.1 2021-02-19 16:02:24 -06:00
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
Joakim Erdfelt ea2a76ed3b Updating to version 9.4.38-SNAPSHOT 2021-02-19 09:44:28 -06:00
Joakim Erdfelt 27afab2bd3 Updating to version 9.4.37.v20210219 2021-02-19 09:03:57 -06: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 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
olivier lamy 451cd24de2 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-12 16:53:35 +10: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
olivier lamy 538bf872a3 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-10 11:21:12 +10: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
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 0d85c7d220 Fix #5605 Unblock non container Threads
test and fixes for the write side.
2021-02-02 17:49:17 +01:00
Jan Bartel 2b259354f2 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-01 17:21:05 +01:00
Jan Bartel 49098e6302 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-01 17:15:35 +01:00
Jan Bartel 4bf250fbaa
Jetty 9.4.x 5859 classloader leak queuedthreadpool (#5894)
* Issue #5859 Fix Classloader leak from QueuedThreadPool

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-01 16:58:02 +01:00
Simone Bordet 31d5ea58ca Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-25 14:23:23 +01:00
Simone Bordet 95b5cfd532
Fixes #5902 - Grab Jetty startup output in documentation. (#5906)
* Fixes #5902 - Grab Jetty startup output in documentation.

Implemented an Asciidoctor extension that uses `JettyHomeTester` to run
Jetty and capture its output.
This extension is triggered by the `ServiceLoader` mechanism, so the
documentation jar is now in the plugin classpath.

Introduced `jetty-halt.xml` so that the JVM can be halted.
In this way, Jetty does not produce the "stopping" log lines and
therefore they won't be grabbed and included in the documentation.

Used the new `include::jetty[]` directive in the documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
2021-01-25 14:21:17 +01:00
Joakim Erdfelt 10136235b2
Happy New Year 2021 (Jetty 11 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:22:28 -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 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
Simone Bordet 510d203761 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 17:17:15 +01:00
Simone Bordet 4b775525ff Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 17:16:47 +01:00
Simone Bordet 03ec5bb773
Merge pull request #5825 from rk1165/issue_5786
Issue #5786 : Revisit Statistics classes
2021-01-12 17:15:44 +01:00
Jan Bartel 483203ff16 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-12 16:53:35 +01:00
Jan Bartel 8cd0d45ed0 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 16:52:47 +01:00
Ludovic Orban 53c064db3e Merge remote-tracking branch origin/jetty-10.0.x into jetty-11.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-12 16:46:12 +01:00
Ludovic Orban e9832492b3 Add missing files to previous merge of remote-tracking branch origin/jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-12 16:31:13 +01:00
Ludovic Orban 058a488c30 Merge remote-tracking branch origin/jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-12 16:22:11 +01:00
Jan Bartel 46031c225a Re-enable PathWatcherTest after fix for 5830
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 16:13:50 +01:00
Ludovic Orban 0dec883fda implement connection pool max duration 2021-01-12 15:41:56 +01:00
Jan Bartel 8152fe312e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-12 12:01:09 +01:00
Jan Bartel 34f71cf036 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 12:00:38 +01:00
Jan Bartel e1e16ae54b
Issue #5870 Windows URI case comparison fails (#5873)
* Issue #5870 Windows URI case comparison fails

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

* Issue #5870 - Updating Windows tests

+ Eliminating OS.MAC (as it doesn't support drive letters)
+ Adding alt URI syntax version as well

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-12 11:44:56 +01:00
Jan Bartel 18b9cd6e5e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-12 11:39:55 +01:00
Jan Bartel 798337a3f6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 11:39:17 +01:00
Jan Bartel 1a7c3deb09
Issue #5830 Remove com.sun.nio.file import. (#5838)
* Issue #5830 Remove native classes from PathWatcher.

Removed use of com.sun.nio.file.SensitivityWatchEventModifier, no longer needed.
This has the desirable side-effect of getting rid of com.sun.nio.file package imports.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 11:30:04 +01:00
Simone Bordet 931eea40e6 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 11:27:15 +01:00
Simone Bordet f836f87754 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 11:23:12 +01:00
Simone Bordet 403d5ec318
Fixes #5855 - HttpClient may not send queued requests. (#5856)
Changed the AbstractConnectionPool.acquire() logic to call tryCreate() even
when create=false.

This is necessary when e.g. a sender thread T2 with create=true steals a
connection whose creation was triggered by another sender thread T1.
In the old code, T2 did not trigger the creation of a connection, possibly
leaving a request queued.
In the new code, T2 would call tryCreate(), possibly triggering
the creation of a connection.

This change re-introduces the fact that when sending e.g. 20 requests
concurrently, 20+ connections may be created.

However, it is better to err on creating more than creating less and leaving
requests queued.

Further refactoring moved field pending from Pool to AbstractConnectionPool.
As a consequence, AbstractConnectionPool.tryCreate() now performs a 
demand/supply calculation to decide whether to create a new connection.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
2021-01-07 16:05:24 +01:00
gregw 002043f42f Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-01-05 12:57:34 +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 Roberts 6ab9b97dab Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-28 16:36:27 +11:00
Lachlan Roberts cbdfaaa335 fix licence header from merge
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-28 16:28:31 +11:00
Lachlan Roberts e340227066 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-12-28 16:27:29 +11:00
Lachlan 3d11d4e071
Merge pull request #5789 from eclipse/jetty-9.4.x-5783-ConnectionStatisticsRates
Fix the calculation of rates in ConnectionStatistics
2020-12-28 16:26:55 +11:00
Jan Bartel bf8155ff09 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-24 15:55:40 +01:00
Jan Bartel 84cff978ee Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-12-24 15:54:48 +01:00
Jan Bartel 29c00ebdf5
Issue #5725 Review preventers. (#5839)
Note that any Preventer that is documented as being fixed prior to jdk11
should be deleted from jetty-10/11 when this change is merged through.

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-24 15:29:31 +01:00
Lachlan Roberts 4e9e9b8d19 Remove the total count from the RateCounter.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-21 15:55:54 +11:00
Ravi Kumar be8d57e3cb replaced the missed set() call
Signed-off-by: Ravi Kumar <kumarravi1165@gmail.com>
2020-12-18 18:31:41 +05:30
Ravi Kumar 69a2558883 fixed the getTasks method and replaced the usage of deprecated set method
Signed-off-by: Ravi Kumar <kumarravi1165@gmail.com>
2020-12-18 17:54:09 +05:30
Ravi Kumar 433f612793 Made changes as per the review comments
Signed-off-by: Ravi Kumar <kumarravi1165@gmail.com>
2020-12-18 08:31:04 +05:30
Ravi Kumar a4dc95aa79 Added JMX annotations for ScheduledExecutorScheduler
Signed-off-by: Ravi Kumar <kumarravi1165@gmail.com>
2020-12-17 21:27:03 +05:30
Ludovic Orban 447823316d backport fix for ArithmeticException 2020-12-17 14:16:42 +01:00
olivier lamy be8a6195cb Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-16 20:04:05 +10:00
olivier lamy 6769a83d3d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-16 20:03:28 +10:00
Olivier Lamy 3730dd4064
execute isAlias test only on linux (#5813)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-16 19:38:39 +10:00
olivier lamy aa150d395c Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-14 09:24:50 +10:00
olivier lamy 0c1f9636b3 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-14 09:24:17 +10:00
Olivier Lamy 9343844f15
Jetty 9.4.x spotbug issue map iteration using entrySet(), diamond list creation (#5804)
* fix some spotbug performance map iterations

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

* cannot use computeIfAbsent because it is a PathMap

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-14 08:46:35 +10:00
Joakim Erdfelt d5b08ea9f2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-11 11:40:10 -06: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
olivier lamy efe4f5e5ea Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-11 12:11:53 +10: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 8a940fc181 Issue #5783 - start _rateCheckTimeStamp at current time
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-10 22:22:31 +11:00
Lachlan Roberts ffe3aa4459 Issue #5783 - fix getRate() methods on ConnectionStatistics
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-10 22:15:59 +11:00
Joakim Erdfelt 30bd8b9fba Updating to version 11.0.1-SNAPSHOT 2020-12-02 15:59:13 -06:00
Joakim Erdfelt 432f896d7a Updating to version 11.0.0 2020-12-02 15:35:56 -06: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
Joakim Erdfelt cc9b41cf17
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 14:53:52 -06:00
Simone Bordet 9c882ee796 Improved KeyStoreScanner.scan().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-02 19:24:19 +01:00
Simone Bordet fe0e076055 Using capital case for static final field.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-02 17:47:56 +01:00
Simone Bordet 97b3f262ab Fixed scan(Callback) bug, returning early in case of failures.
More cleanups in code adding more privateness, getting rid of unnecessary exceptions, making fields final, etc.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-02 12:53:23 +01:00
Jan Bartel 8fe8cb8c27 Issue #5086 Add blocking method for immediate scan.
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-02 10:27:08 +01:00
Jan Bartel c776eeb838 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5086-review-scanner 2020-12-02 09:03:46 +01:00
Jan Bartel e39ec6cab4 Issue #5086 Fix error on addFile
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-02 08:02:09 +01:00
Jan Bartel 31cc298987 Issue #5086 Changes after review
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-01 22:05:33 +01:00
Jan Bartel 90e48ba0b5 Issue #5086 Fix javadoc
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-01 17:44:33 +01:00
Jan Bartel 115a72da65 Issue #5086 Fix checkstyle in test
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-01 17:19:46 +01:00
Jan Bartel 4304c7861c Issue #5086 Improve ScannerTest
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-01 15:55:45 +01:00
Ludovic Orban bd269f72e4 merge jetty-10.0.x into jetty-11.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-12-01 15:32:01 +01:00
Ludovic Orban 845c6b457a merge jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-12-01 15:26:25 +01:00
Ludovic Orban a26731c5ea merge jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-12-01 15:25:25 +01:00