Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,279 Commits 55 Branches 466 Tags
Commit Graph

18279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Wilkins
b759a50450 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-27 16:54:09 +11:00
Greg Wilkins
1e4be0a98e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-27 15:07:39 +11:00
Greg Wilkins
3d16eba839
Merge pull request #3478 from lachlan-roberts/jetty-10.0.x-3465-extension-negotiation 
Issue #3465 - WebSocket Extension Negotiation
 2019-03-27 09:19:46 +11:00
Lachlan Roberts
46ef94c1b9 Issue #3465 - client/server error handling behavior for ExtensionStack 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-26 16:29:45 +11:00
Greg Wilkins
ed03682071 Issue #3487 WebAppClassLoader does not definePackage 
Added a test to the test-server-spec to demonstrate the issue
 2019-03-26 13:56:00 +11:00
Joakim Erdfelt
65528f76c5
Merge pull request #3467 from eclipse/jetty-9.4.x-3422-wss-close-wait 
Issue #3422 - WebSocket wss CLOSE_WAIT on aborted client connection
 2019-03-22 11:36:40 -05:00
lachan-roberts
0d570dd6b6 Issue #3478 - changes from review 
ExtensionStack.negotiate now differentiates between incorrect
extension config offered or incorrect config from negotiation

adding more BadMessageException cases

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-22 15:42:39 +11:00
olivier lamy
f8f6e21a2d fix jmh jar path which has changed in 10.0.x 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-03-22 12:13:56 +10:00
Joakim Erdfelt
4eb8cb1686 Issue #3422 - Using new Connection.Listener support in websocket server 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-21 14:40:49 -05:00
Joakim Erdfelt
e56ef9d8f8 Backporting Connection.Listener support on WebSocket server connections from jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-21 14:37:41 -05:00
Joakim Erdfelt
aa667562c6
Merge pull request #3172 from eclipse/jetty-10.0.x-integration-testing-websockets 
Adding both WebSocket tests to /test-integration/ to verify behavior that is causing problems from within OSGi.
 2019-03-21 14:32:00 -05:00
Joakim Erdfelt
b351631c0d Adding both WebSocket tests to /test-integration/ to verify behavior 
that is causing problems from within OSGi.

+ Renamed TestableJettyServer to XmlBasedJettyServer to avoid
  it being picked up as a Test class (due it starting with the
  name "Test")
+ Renamed .addConfiguration() to .addXmlConfiguration() to
  reflect true nature, and also to avoid naming confusion
  with new Configuration infrastructure in Jetty.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-21 14:31:23 -05:00
Joakim Erdfelt
10d3ea2548 Merge branch jetty-9.4.x-3427-classpath-with-spaces into jetty-9.4.x 2019-03-21 14:26:00 -05:00
olivier lamy
f51968b4ab Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-03-21 21:43:54 +10:00
olivier lamy
0bd7008fcf fix default jdk when no parameter are used 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-03-21 21:42:34 +10:00
olivier lamy
2fddd25f03 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-03-21 21:41:47 +10:00
olivier lamy
27d9999125 sync with script used by Jenkins 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-03-21 21:38:48 +10:00
Lachlan Roberts
eb4f7c000f Issue #3465 - internal WebSocket extensions 
do not allow internal extensions to be offered by the client
do not validate internal extensions

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-21 12:33:53 +11:00
Lachlan Roberts
26e7881dbd Issue #3465 - Negotiation of WebSocket extensions 
default behaviour of Negotiation no longer includes all of the
offered extensions as the negotiated extensions but it now takes
only the first extension if there are multiple of the same name,
this is now done when the negotiation is created and can be overwritten
by the negotiator

Throw exception on websocket errors so the proper status code can
be reported back to the client

fix to checking for multiple negotiated extensions of the same name

added tests for core and jetty websockets for the negotiation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-21 11:41:01 +11:00
Jan Bartel
e01eefe40e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-03-20 18:39:53 +11:00
Jan Bartel
432fc41a32
Jetty 9.4.x 3456 programmatic authentication (#3472) 
* Issue #3456 Allow multiple programmatic login/logout in same request.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-03-20 18:19:55 +11:00
Simone Bordet
ec8a1bdb23
Merge pull request #3313 from eclipse/jetty-10.0.x-1350-dynamic_client_transport 
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
 2019-03-19 15:31:11 +01:00
Greg Wilkins
f037258725
Merge pull request #3470 from lachlan-roberts/jetty-10.0.x-3462-websocketclient-validation 
Issue #3462 - websocket upgrade request valdiation
 2019-03-19 16:11:09 +11:00
Lachlan Roberts
7e9700fb9a Issue #3462 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-19 14:38:17 +11:00
Greg Wilkins
8427c52c8f
Merge pull request #3461 from eclipse/jetty-9.3.x-gzipRequestCustomizer 
Jetty 9.3.x gzip request customizer
 2019-03-19 13:50:50 +11:00
Lachlan Roberts
403bdb70ea Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3462-websocketclient-validation 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-19 11:54:19 +11:00
Lachlan Roberts
cdd3ed943c Issue #3462 - parse extensions and subprotocols from headers every time 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-19 11:20:49 +11:00
Jan Bartel
441280c9fc Issue #3463 Fix jaas documentation realm and login module names. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-03-19 11:10:05 +11:00
Greg Wilkins
eab971e2cc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-19 09:45:20 +11:00
Greg Wilkins
012b9e526c
Merge pull request #3460 from lachlan-roberts/jetty-10.0.x-3458-jettyWebSocket-API 
Issue #3458 - jetty websocket upgrades without using websocket-servlet classes
 2019-03-19 09:30:20 +11:00
lachan-roberts
96027f5437 Issue #3462 - incorrectly setting websocket extensions and subprotocol 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-18 16:36:16 +11:00
lachan-roberts
dab3b64d70 Issue #3458 - make jetty-websocket-client hide websocket-core 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-18 15:24:23 +11:00
Lachlan Roberts
20e9770b73 Issue #3458 - testing of Jetty WebSocket API ExtensionConfig 
wire up the jetty-api extensions by copying the ExtensionConfig from
the jetty-api upgrade request to the core upgrade request

make UpgradeListener interface methods default for convenience

introduce test to test the functionality of API ExtensionConfig

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-18 15:24:23 +11:00
Lachlan Roberts
62406cdfa2 Issue #3458 - missing licence headers and changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-18 15:24:23 +11:00
Lachlan Roberts
f60534a8ac Issue #3458 - jetty websocket upgrades with only websocket-server 
websocket-servlet exposes core classes as it is used by the jetty and
javax sides, so this introduces a way to add websocket mappings
with jetty-server which does not depend on websocket-servlet

to set websocket mappings through the JettyWebSocketServerContainer
you now need to use the JettyWebSocketCreator which abstracts away
the core classes from use with the jetty websocket api

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-18 15:24:23 +11:00
Lachlan Roberts
86675422a6 Issue #3458 - ExtensionConfig now delegates to core implementation 
ExtensionConfig is now interface in jetty-websocket-api and
implemented in jetty-websocket-common, for its static methods it now
uses a ExtensionConfig.Parser found by the ServiceLoader

the api tests were moved to jetty-websocket-tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-18 15:24:23 +11:00
lachan-roberts
1a20c8cda3 Issue #3462 - fix server validation of websocket upgrade response 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-18 15:12:23 +11:00
olivier lamy
38787f619d fix unit test with read module ack 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-03-18 11:45:33 +10:00
lachan-roberts
53a4a747db Issue #3462 - fix client validation of websocket upgrade response 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-18 12:20:11 +11:00
Joakim Erdfelt
95a6b76851 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
#	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
 2019-03-15 16:00:59 -05:00
WalkerWatch
5c134efaca Updated Windows service documentation. Resolves #3417 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2019-03-15 16:41:10 -04:00
Joakim Erdfelt
d7364e4794 Issue #3422 - Fixing testcase expectations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-15 14:08:33 -05:00
Joakim Erdfelt
4fb1940283 Issue #3422 - Fixing testcase expectation 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-15 12:44:28 -05:00
Joakim Erdfelt
76de1c0f24 Issue #3422 - WebSocket wss CLOSE_WAIT on aborted client connection 
+ Adding testcase to replicate
+ Fixing CLOSE_WAIT by issuing wsclose + disconnect on eof

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-15 11:52:14 -05:00
Simone Bordet
01f2a4e16b
Merge pull request #3431 from eclipse/jetty-9.4.x_3425_upgrade_conscrypt_get_rid_reflect 
Issue #3425 upgrade conscrypt to 2.0.0 and get rid reflect usage
 2019-03-15 09:19:58 +01:00
Simone Bordet
123918018e Issue #3425 - Upgrade conscrypt version to 2.0.0 and remove usage of reflection. 
Small fixes after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-03-15 09:19:16 +01:00
Greg Wilkins
59b026efce Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-14 18:22:29 +11:00
Greg Wilkins
74233d5711
Merge pull request #3441 from eclipse/jetty-9.4.x-3440-StopOnUnavailable 
Issue #3440 Stop on Unavailable
 2019-03-14 11:24:39 +11:00
Greg Wilkins
ffdbbd1821 Issue #3440 Stop failed lifecycle 
check that contexts after error are not started.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-14 09:07:16 +11:00
Joakim Erdfelt
d719dce18c
Merge pull request #3445 from eclipse/jetty-9.4.x-3429-jmx-webappprovider 
Issue #3429 - Adding WebAppProvider.scan() method to JMX
 2019-03-13 16:50:13 -05:00