Commit Graph

19785 Commits

Author SHA1 Message Date
Simone Bordet e7322a79b2 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-13 23:44:22 +01:00
Simone Bordet 89a4f92411
Merge pull request #4302 from eclipse/jetty-9.4.x-4301-demand_beforecontent_not_forwarded
Fixes #4301 - Demand beforeContent is not forwarded.
2019-11-14 01:42:28 +03:00
Simone Bordet 75e4ccc7ba Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-13 23:39:35 +01:00
Simone Bordet c8d98459c0
Merge pull request #4270 from eclipse/jetty-9.4.x-4258-ratecontrol_per_connection
Fixes #4258 - RateControl should be per-connection.
2019-11-14 01:20:05 +03:00
Joakim Erdfelt a44a46f3f1
Adding stalebot integration
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-13 15:43:48 -06:00
Joakim Erdfelt 6b96e3db21
Adding stalebot integration
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-13 15:42:07 -06:00
Lachlan ef0dc735bb
Merge pull request #4308 from eclipse/jetty-9.4.x-4236-RedirectCode
Issue #4236 - move redirect code calculation to utility method
2019-11-14 07:38:39 +11:00
Joakim Erdfelt 1edff35676
Merge branch 'jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
2019-11-13 10:58:48 -06:00
Joakim Erdfelt 9c9e842cd7
Merge pull request #4300 from eclipse/jetty-9.4.x-4296-websocketclient-double-decode
Fixes #4296 - WebSocketClient cannot connect with "%25" in query
2019-11-13 10:54:07 -06:00
Simone Bordet a9299b2426 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-13 17:03:57 +01:00
Simone Bordet 9e18e9e0ab
Merge pull request #4309 from eclipse/jetty-9.4.x-4305-no_application_protocol
Fixes #4305 - Jetty server shall alert fatal no_application_protocol …
2019-11-13 18:58:49 +03:00
Simone Bordet e3f31a86a2 Fixed flaky test testUpload_Multipart().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-13 16:46:11 +01:00
Simone Bordet e7e7a30e11 Fixes #4305 - Jetty server shall alert fatal no_application_protocol if no client application protocol is supported.
Now catching any exception and returning null so JSSE returns the
no_application_protocol to the client.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-13 10:28:51 +01:00
Simone Bordet 1b686eaba4 Fixed test failures after merge.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-13 08:39:51 +01:00
Lachlan Roberts 4e43258785 Issue #4236 - move redirect code to utility method
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-13 17:19:09 +11:00
Greg Wilkins 5cda291196 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-11-13 16:11:36 +11:00
Greg Wilkins c64bd7d2f0 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-13 16:11:16 +11:00
Greg Wilkins 4f6585562f
Issue #4161 WriteLifeCycle
Removed PersistentFileUploadDownloadTest as issue was replicated with DelayedServerTest
2019-11-13 15:37:31 +11:00
Greg Wilkins 46a3368f3b
Issue #2578 - Listener behavior cleanup (Jetty 10.0.x) (#3966)
* Avoid creating listener list for rarely used requestAttributeListener

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964

Keep a list of EventListeners in the AbstractConnector to make it
more efficient to add and iterate over them.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

Use addEventListener rather than bespoke listener methods.
Support getEventListenerBeans at Container level for fast lookup
improve javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

fixed test
more javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

fixed tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964

Don't use null for empty lists of listeners

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* fix merge

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

Resolve differences between eventListeners added as beans and beans
added as EventListeners.   The behaviour should now be the same
regardless of how they listener is added and all listeners are now
beans.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

Add only SelectorManager listeners to manager from connector

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

Fixed javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

removed old TODO

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

connector cannot be null

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964

AbstractConnector keeps a specific list of HttpChannel.Listeners
to avoid Connection.Listeners and MBean listeners being added to
the HttpChannel listener list.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

fixed merge

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* fixed javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

removed the ability to set/clear context listeners
Instead just remove non-durable ones.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964 Listeners

Simplified listener handling by avoiding null connector, previously
only needed for testing.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* fixed bad merge

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964 Listeners

Fixed test that assumed HttpChannel listeners were not cleared by a recycle

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964 Listeners

Separated out durable vs cyclic HttpChannel.Listeners, so as to
simplify handling.

Deprecated cyclic HttpChannel.Listeners, as I'm not sure the channel is
the right place for them.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* removed deprecated cyclic HttpChannel listeners

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* removed deprecated cyclic HttpChannel listeners - import

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4003 Cleanup quickstart

* Fixed tests that scan for "Started" on console

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-13 11:04:38 +11:00
Greg Wilkins 24df8c59a3
Issue #4279 Writer close deadlock (#4288)
Do not close the actual writer from closed.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-13 11:03:17 +11:00
Greg Wilkins fe4b9cf366
Issue #4161 Write LifeCycleViolation (#4294)
* Issue #4161 - TestCase that can replicate problem on OSX

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

* Issue #4161 - Naming Server threadpool (to help with debugging)

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

* Issue #4161 - bumping up test file size to 10 MB

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

* Issue #4161 Write LifeCycleViolation

Do not callback on write completion until after state has been changed and notifications made.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4161 Write LifeCycleViolation

Added a unit test that replicated the problem.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4161 - `EofException: request lifecycle violation` in stderr.

Moved notifications of commit and content listeners back to succeeded().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Issue #4161 - Improved Logging for test-integration

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

* Issue #4161 - Reducing size of test file

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-13 11:02:12 +11:00
Simone Bordet aa57463175 Fixes #4301 - Demand beforeContent is not forwarded.
Now correctly handling no demand before the content
in FCGI and HTTP2 transports.

Fixed HttpRequest to correctly forward onBeforeContent()
to wrapped listeners.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-12 23:33:21 +01:00
Joakim Erdfelt 774160c7ec
Merge branch 'jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebInfConfigurationTest.java
2019-11-12 14:53:38 -06:00
Joakim Erdfelt 3def3415ed
Merge pull request #4289 from eclipse/jetty-9.4.x-4287-move-getUriLastPathSegment
Issue #4287 - Move getUriLastPathSegment() to URIUtil
2019-11-12 14:51:23 -06:00
Simone Bordet ba1724ae34 Fixes #4258 - RateControl should be per-connection.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-12 17:46:19 +01:00
Joakim Erdfelt 2d50c92979
Fixes #4296 - WebSocketClient cannot connect with "%25" in query
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-12 10:22:19 -06:00
Simone Bordet e2ccf8a1bc Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-12 17:06:14 +01:00
Simone Bordet 4825832a53
Merge pull request #4286 from eclipse/jetty-9.4.x-4277-httpclient_async_gzip
Fixes #4277 - Reading streamed gzipped body never terminates.
2019-11-12 19:04:05 +03:00
Simone Bordet 408a416fa3 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-12 17:03:19 +01:00
Simone Bordet d22f5b1d9d Issue #4282 - Review HttpParser handling in case of no content.
Removed TODOs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-12 17:02:05 +01:00
Simone Bordet 5f9edb1361 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-12 16:41:33 +01:00
Simone Bordet 454175af1a
Merge pull request #4293 from eclipse/jetty-9.4.x-4282-review_httpparser_nocontent
Issue #4282 - Review HttpParser handling in case of no content.
2019-11-12 17:55:40 +03:00
Simone Bordet b1d231b9e7 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-11 16:45:12 +01:00
Simone Bordet 4f98bf0f2e
Merge pull request #4291 from eclipse/jetty-9.4.x-4283-wrong_package_openjdk8_client_alpn_processor
Fixes #4283 - Wrong package for OpenJDK8ClientALPNProcessor.
2019-11-11 17:16:29 +03:00
Greg Wilkins ca72a8fd71 Issue #4282 HttpParser no content
Added HTTP/0.9 test

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-11 17:27:56 +11:00
Greg Wilkins 3fd1daa5c8 Merge branch 'jetty-9.4.x' into jetty-9.4.x-4282-review_httpparser_nocontent 2019-11-11 17:15:13 +11:00
Lachlan 7b9f7ab37e
Merge pull request #4207 from eclipse/jetty-9.4.x-4189-OpenIdHttpClient
Issue #4138 - use HttpClient for OpenID Authentication
2019-11-11 13:52:41 +11:00
Lachlan Roberts 39aac30137 Issue #4138 - Changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-11 13:51:48 +11:00
Greg Wilkins ee0f9fc1d0
Issue #4033 Percent Encoded Bad Requests (#4272)
* Modernizing testcase

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

* Issue #4033 Percent Encoded Bad Requests

Added test to demonstrate bad percent encoded request

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4033 - adding sanity test for percent paths and checkAlias()

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

* Eliminating 9.3.0.RC0 dependency

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

* Issue #4033 - More tests for Resource checkAlias() behavior

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

* Issue #4033 - Splitting badDecodePath

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

* Issue #4033 - More badDecodePath tests

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

* Issue #4033 Percent Encoded Bad Requests

reverted decodePathBehaviour

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* testing pull request building

* Issue #4033

updates after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-11 12:01:26 +11:00
Simone Bordet 47447b5cf5 Issue #4282 - Review HttpParser handling in case of no content.
Fixed handling of returning true from headerComplete() and
contentComplete().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-11 01:13:13 +01:00
Chris Walker d043cf6318
Fixed links for linking separate guides 2019-11-08 12:23:17 -05:00
Lachlan c336616c96
Issue #2709 - reduce default headerCacheSize to 1024 (#4292)
make headerCacheSize on HttpReceiverOverHTTP configurable

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-08 21:57:49 +11:00
Lachlan Roberts 089dd479c7 add module-info lines to use ServiceLoader with Authenticator.Factory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-08 21:06:51 +11:00
Simone Bordet 1b0e252a83 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-08 09:59:51 +01:00
Simone Bordet 1d8a2fe03a Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-08 09:56:36 +01:00
Simone Bordet 1ea9108141 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-08 08:59:27 +01:00
Simone Bordet e37524c8a7 Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-08 08:54:49 +01:00
Simone Bordet 39867b28fc Fixes #4283 - Wrong package for OpenJDK8ClientALPNProcessor.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-07 23:03:15 +01:00
Joakim Erdfelt 4ab910bdc0
Issue #4287 - Move getUriLastPathSegment() to URIUtil
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-07 15:52:00 -06:00
Joakim Erdfelt cc58a74662
Merge branch 'jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
#	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebInfConfigurationTest.java
2019-11-07 15:37:30 -06:00