19823 Commits

Author SHA1 Message Date
Joakim Erdfelt
324b387107
Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-11-15 15:21:21 -06:00
Joakim Erdfelt
46dbfda52e
Introducing stalebot.yml anew (again)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-15 15:19:47 -06:00
Joakim Erdfelt
3c42bbedbc
Removing stalebot.yml temporarily
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-15 15:19:13 -06:00
Joakim Erdfelt
19cc2f02c0
Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-11-14 11:42:45 -06:00
Joakim Erdfelt
b5a430fbf9
Dropping colons
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-14 11:42:19 -06:00
Joakim Erdfelt
2bc5cacd49
Updating template for os/type
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-14 11:42:19 -06:00
Joakim Erdfelt
8c05e4385e
Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-11-14 11:32:47 -06:00
Joakim Erdfelt
f89f81a363
Updating templates based on feedback
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-14 11:32:33 -06:00
Joakim Erdfelt
428987f070
Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-11-14 11:17:29 -06:00
Joakim Erdfelt
402f499f19
Adding TCK to skipped labels
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-14 11:17:08 -06:00
Joakim Erdfelt
d66fe9ac0c
Adding ISSUE_TEMPLATE
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-14 11:17:08 -06:00
Joakim Erdfelt
1f2312ef70
Merge branch 'jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-14 09:44:45 -06:00
Joakim Erdfelt
c44e7c5eb1
Merge pull request #4299 from eclipse/jetty-9.4.x-4248-websocketclient-success-flag
Fixes #4248 - WebSocketClient UpgradeResponse.isSuccess never set true
2019-11-14 09:42:45 -06:00
Simone Bordet
58abb6c6f0
Merge pull request #4017 from eclipse/jetty-10.0.x-3951-http2_demand
Fixes #3951 - Consider adding demand API to HTTP/2.
2019-11-14 13:50:02 +03:00
Simone Bordet
50cf51c369 Made test more stable.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-14 10:52:08 +01:00
Simone Bordet
2ffed618aa Fixed logging statement.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-14 10:13:04 +01:00
Simone Bordet
7add2cbc30 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-14 09:49:14 +01:00
Simone Bordet
0d0b346140 Updated ALPN modules for Java >= 11 so that
they can be easily merged to Jetty 10.0.x.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-14 09:48:28 +01:00
Simone Bordet
b248a86c5e Fixed ALPN module dependencies for Java 13 and 14.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-14 09:35:40 +01:00
Simone Bordet
13e40c8b33 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3951-http2_demand'. 2019-11-14 09:14:49 +01:00
Greg Wilkins
8fef35c573 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-14 13:30:23 +11:00
Greg Wilkins
32931fac7b
Issue #4247 SameSite Session Cookie (#4271)
* Issue #4247 SameSite Session Cookie

Allows sameSite cookie settings to be configured in SessionCookieConfig comments

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

* Issue #4247 SameSite Session Cookies

Use non versioned cookie

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

* Issue #4247 SameSite Session Cookies

Added test and fixed getCommentWithAttributes

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

* Issue #4247 - Updating unit tests for HttpCookie

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

* Issue #4247 SameSite Session Cookie

While it may be best practise to always use Secure cookies when SameSite is None, there is nothing in the RFC that mandates it and thus I don't believe we should prevent such a configuration.  If browsers enforce this, then users will find out soon enough... and if browsers change, then we are not required to do a new release to match.

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

* Issue #4247 SameSite Session Cookie

For cookie comments with multiple SameSite attributes, the most strict
value is used. So `Strict` has precedence over `Lax` which has
precedence over `None`.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-14 11:56:40 +11:00
Greg Wilkins
b24c6ce68d
Issue #2340 ServletContext cleanup (#4307)
* Issue #2340 ServletContext cleanup

A minor cleanup of the ServletContext implementation classes.

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

* Issue #2340 ServletContext cleanup

cleanup after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-14 11:52:03 +11:00
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
Joakim Erdfelt
5479ed030f
Issue #4248 - Using ServletUpgradeResponse.setSuccess(true) for servlet side
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-13 15:33:00 -06:00
Joakim Erdfelt
6a6206d8e4
Issue #4248 - Deprecating UpgradeResponse setSuccess / isSuccess
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-13 15:32:23 -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
6577a8b9dc Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3951-http2_demand'. 2019-11-13 15:12:40 +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
99efbf57c7 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3951-http2_demand'. 2019-11-12 23:53:58 +01: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