Commit Graph

2432 Commits

Author SHA1 Message Date
Simone Bordet de2d764290 Fixes #6254 - Total timeout not enforced for queued requests.
Fixed logic in HttpDestination.RequestTimeouts, where now a timeout
is scheduled only when the expiration time is less than the existing one.
Various code cleanups.
Renamed HttpDestination.TimeoutTask to RequestTimeouts for clarity.
Improved javadocs, code comments and logging.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 5f23689aa7)
(cherry picked from commit da50e06b64)
(cherry picked from commit 88ac10439a)
2021-05-12 10:19:11 +02:00
Lachlan Roberts a0cca858a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-6106-WebSocketCDI 2021-04-27 16:15:52 +10:00
Lachlan 3b88b4713c
Merge pull request #6176 from eclipse/jetty-10.0.x-5817-CustomRequestLogFiltering
Issue #5817 - allow CustomRequestLog to be filtered with BiPredicate
2021-04-27 16:04:54 +10:00
Simone Bordet 1b6fb39867 Re-enabled ConnectionStatisticsTest.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-22 15:49:15 +02:00
Ludovic Orban 25467f8904 Improve handling of HttpInput.Interceptor behavior
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-04-19 10:32:23 +02:00
Lachlan Roberts 61ead137b2 Fix intellij warnings in CustomRequestLogTest.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-15 19:04:30 +10:00
Lachlan Roberts 382aed8374 Issue #5817 - allow CustomRequestLog to be filtered with BiPredicate
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-15 19:03:50 +10:00
Jan Bartel 6a074bc2cf
Issue #5684 Reduce intensity and rename SameNodeLoadTest (#6143) (#6162)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-04-15 11:12:27 +10:00
Lachlan Roberts 045bc72c92 Disable test for WebSocket CDI HttpSession injection and link to issue.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-15 09:40:11 +10:00
Simone Bordet 1e3f3a3cbb
Fixes #6049 - Default provider [files] section always executed (#6051)
* Fixes #6049 - Default provider [files] section always executed

Keeping only enabled modules when processing the modules,
so that default provider modules don't get processed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-12 10:41:51 +02:00
Simone Bordet e163b001c3 Fixes #6105 - HttpConnection.getBytesIn() incorrect for requests with chunked content
Moved recording of bytes to fillRequestBuffer(),
so they are accounted also for async reads.
Added test case.
Fixed test that was too strictly comparing HttpConnection.bytesIn,
that now report a correct, but larger value.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit aed20abcbe)
2021-04-10 18:51:54 +02:00
Lachlan Roberts 0d84f35b0d Issue #6106 - Decorate javax.websocket components during the websocket upgrade.
Decoration should not be delayed until onOpen it should be during the call to
the WebSocketUpgradeFilter or WebSocketServlet.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-07 16:43:10 +10:00
Lachlan Roberts bda4c21bcb Issue #6106 - add testing for CDI with javax.websocket Encoder & Decoder
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 22:58:23 +10:00
Lachlan Roberts f858aa653c Issue #6106 - always decorate javax.websocket Configurators
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 22:39:15 +10:00
Lachlan Roberts ac5eb54e1e Issue #6106 - fix WebSocket/CDI integration
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-31 18:49:31 +11:00
Lachlan Roberts c29bad2301 Issue #6106 - add tests for WebSocket/CDI integration.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-31 18:36:15 +11:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-26 06:10:47 +00:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:02:45 +01:00
Simone Bordet 43562774a8 Issue #6085 Fix duplicate valid session cookies to pick first valid.
Signed-off-by: Jan Bartel <janb@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 15:53:03 +01:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
Jan Bartel fd05a3d19c
Issue #6085 Fix reference counts for multiple valid cookies for sessions (#6088) (#6096)
* Issue #6085 Fix reference counts for multiple valid cookies for sesssions

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-25 09:37:17 +11:00
Greg Wilkins 303e031235
Added before dependents to Modules (#6080)
Added `before` section to a module to control ordering
rename `options` section to `after`

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-24 13:31:36 +01:00
Simone Bordet 217a97b952 Fixes #6037 - Review logging modules for j.u.l.
Fixed mistakes in logging-jul-capture.mod.
Introduced java-util-logging-bridge.properties for the bridge module configuration.
Added [exec] sections to specify the jul config file.
Removed logging-jul-capture.xml, not necessary.
Added tests to verify that the fixed modules work fine.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-05 19:18:19 +01: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
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 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
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
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 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
Joakim Erdfelt c80eac0386
Fixing checkstyle issue
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-26 11:13:09 -06:00
olivier lamy b214837c78 use local repo to download mod files
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-26 21:03:56 +10:00
olivier lamy da7fd63d98 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-01-26 18:26:18 +10:00
Joakim Erdfelt 4c51591407
Remove PMD from build (#5900)
* Remove PMD from build

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

* Attempt to fix log4j2 distribution test

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

* Fixing jetty-start tests to use configured maven.repo.uri property

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

* Using ${env.MAVEN_REPO_URI} configured at Jenkins.

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

* no need of this

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

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-26 18:17:29 +10: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 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
Simone Bordet 9fe5700260
Fixes #5880 - Move test-simple-webapp to demos. (#5881)
* Fixes #5880 - Move test-simple-webapp to demos.

Moved test-simple-webapp to demos under demo-simple-webapp.
Moved the JSP demos into their own module: out of demo-jetty-webapp into demo-jsp-webapp.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-21 15:27:03 +01: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
Jan Bartel 03ae75f407 Add reason for @Disabled.
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 12:20:28 +01:00