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,183 Commits 55 Branches 466 Tags
Commit Graph

18183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lachan-roberts
265e0be6f7 Issue #3446 - jetty-websocket tests for WebSocketUpgradeFilter 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-11 18:05:44 +11:00
lachan-roberts
a01fc193a1 WebSocket code cleanups and renaming 
rename JettyWSSCI.configure to configureContext, this is more similar
to the javax equivalent version

introduce helper method getMapping in WebSocketMapping

WebSocketServletFactory now implements FrameHandler.Configuration

changed WebSocketMapping Attribute name in WebSocketUpgradeFilter

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-11 18:05:44 +11:00
Greg Wilkins
1160a1c5de
Merge pull request #3439 from lachlan-roberts/jetty-10.0.x-3406-restore-jetty-websocket-tests 
Issue #3406 - restore jetty websocket tests
 2019-03-11 17:19:01 +11:00
lachan-roberts
ddd60f1992 Issue #3406 - changes from review 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-08 14:50:49 +11:00
Jan Bartel
69ea8877f3 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-03-08 10:46:11 +11:00
Jan Bartel
beb4881af4
Issue #3394 Remove unused JAASGroup,RoleCheckPolicy,StrictRoleCheckPolicy (#3433) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-03-08 10:44:39 +11:00
Simone Bordet
d2e13ec5ad Code cleanup and improved toString() and javadocs. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-03-07 12:27:43 +01:00
lachan-roberts
01bc9d3835 Issue #3406 - fix SessionTracker and JettyWebSocketFrameHandlerTest 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-07 14:19:35 +11:00
lachan-roberts
59ec0da768 Issue #3406 - fix jetty websocket tests 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-07 10:52:03 +11:00
lachan-roberts
155974bc07 Issue #3406 - jetty and javax WebSocket FrameHandler fixes 
invoke the close handle in onClosed instead of onCloseFrame in
JettyWebSocketFrameHandler

in both frame handlers replace usage of getClass().getName()
with getClass().getSimpleName() to increase the amount of characters
from the original exception which can fit in the close frame message

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-07 10:27:50 +11:00
lachan-roberts
13f8202c06 Issue #3412 - fix WebSocketClient configuration methods 
WebSocketClient implements WebSocketPolicy but the methods were never
wired through to use the websocket core FrameHandler.Customizer

the WSClient now has a ConfigurationCustomizer which it uses to
configure the WebSocketCoreClient

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-07 10:27:50 +11:00
Lachlan Roberts
16fa1133d7 Issue #3406 - enabling all disabled tests in WebSocket 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-07 10:22:59 +11:00
Greg Wilkins
a31ba98e29 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-07 07:45:28 +11:00
WalkerWatch
7bb1adb798 Fixing typo identified in #3176 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2019-03-06 13:08:10 -05:00
Greg Wilkins
c341928b84
Merge pull request #3390 from lachlan-roberts/jetty-10.0.x-3106-websocketConnectionStats 
Issue #3106 - implement WebSocketConnection stats
 2019-03-06 18:00:41 +11:00
Greg Wilkins
4bb6a920c0
Merge pull request #3432 from lachlan-roberts/jetty-10.0.x-websocket-fixes-from-proxy 
WebSocketChannel bug fixes, cleanup and javadoc updates for FrameHandler
 2019-03-06 17:59:58 +11:00
lachan-roberts
ab304a096e avoid adding NULL UpgradeListeners to WebSocketClient 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-06 17:11:57 +11:00
Greg Wilkins
dbf0d2e6be Issue #3421 Duplicate session set-cookie (#3426) 
Added Response.replaceCookieuse replaceCookie in sessions
unit tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-06 14:44:48 +11:00
lachan-roberts
ebbca84a87 WebSocketChannel bug fixes, cleanup and javadoc updates for FrameHandler 
pass the cause from the AbnormalCloseStatus to closeConnection in
WSChannel

If onOpen throws we now throw a runtime exception in addition to
failing the callback, this is to fail the CompletableFuture in the
ClientUpgradeRequest.

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-06 14:15:04 +11:00
Lachlan Roberts
1160a8d08f Issue #3106 - turn auto fragment off for WebSocketStatsTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-06 10:27:02 +11:00
Lachlan Roberts
6094b3802f Issue #3106 - WebSocketConnectionStats changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-06 10:27:02 +11:00
Lachlan Roberts
46c2941a82 Issue #3106 - implement WebSocketConnection stats 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-06 10:27:02 +11:00
Jan Bartel
11755539e8
Jetty 9.4.x 3337 session serialization tests (#3409) 
* Issue #3337 Session serialization tests

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-03-06 10:13:20 +11:00
Greg Wilkins
c63a578c29
Merge pull request #3413 from lachlan-roberts/jetty-10.0.x-3412-WebSocketSession-Customizer 
Issue #3412 - WebSocket CoreSession Customizer
 2019-03-06 10:09:50 +11:00
Greg Wilkins
ad8b22abf0
Merge pull request #3401 from lachlan-roberts/jetty-10.0.x-3159-permessage-deflate-rsv1 
Issue #3159 - permessage-deflate continuation frame with RSV1 set
 2019-03-06 09:20:50 +11:00
Lachlan Roberts
69822efb45 Issue #3412 - WSChannel only sets idleTimeout on connection if non null 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-05 13:30:34 +11:00
Lachlan Roberts
9cd96c3c93 Issue #3159 - Ensuring we follow permessage-deflate RSV1 rules in RFC7692 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-05 10:43:00 +11:00
Greg Wilkins
aa2064f02f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-05 10:40:52 +11:00
Greg Wilkins
15647a742c
Merge pull request #3407 from lachlan-roberts/jetty-10.0.x-core-test-cleanup 
websocket core test cleanup
 2019-03-05 10:03:19 +11:00
Greg Wilkins
ec28eb6ddd
Merge pull request #3414 from lachlan-roberts/jetty-10.0.x-UpgradeListener 
add support for WebSocket UpgradeListeners in WebSocketClient
 2019-03-05 09:57:55 +11:00
Greg Wilkins
c23303c05a
Merge pull request #3408 from eclipse/jetty-9.4.x-3404-QCSV-Doubles 
Issue #3404 Updated QCSV Double usage
 2019-03-05 09:56:23 +11:00
Greg Wilkins
69f6b3b616 Issue #3404 
updates after review:
 + use ToIntFunction
 + reformat

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-05 08:59:55 +11:00
Greg Wilkins
73e68ac7b5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3404-QCSV-Doubles 2019-03-05 08:52:36 +11:00
Joakim Erdfelt
715bac2660 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageBinaryCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageTextCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/BinaryWholeMessage.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextWholeMessage.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/EchoTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtension.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/FragmentExtensionTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/OutgoingFramesCapture.java
 2019-03-04 09:44:47 -05:00
Joakim Erdfelt
438042e28b
Merge pull request #3418 from eclipse/jetty-9.4.x-3401-websocket-permessage-deflate-rsv1 
Issue #3159 - Ensuring we follow permessage-deflate RSV1 rules in RFC7692
 2019-03-04 09:26:47 -05:00
Joakim Erdfelt
ff6599bf77
Merge pull request #3419 from eclipse/jetty-9.4.x-3389-javax.websocket-willdecode 
Issue #3389 javax.websocket willDecode
 2019-03-04 09:26:34 -05:00
Joakim Erdfelt
6444446652 Issue #3159 - Ensuring we follow permessage-deflate RSV1 rules in RFC7692 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-01 16:56:29 -05:00
Joakim Erdfelt
160842805b Issue #3389 - Fixing testcase expectation 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-01 15:44:42 -05:00
Joakim Erdfelt
3bc3d7514d Issue #3389 - missing willDecode calls in javax.websocket 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-01 14:12:21 -05:00
Joakim Erdfelt
a1567e0149
Merge pull request #3416 from eclipse/jetty-10.0.x-1676-removing-resource-geturl 
Issue #1676 - Removing Deprecated Resource.getURL()
 2019-03-01 10:28:22 -05:00
Joakim Erdfelt
5658bf96f6 Issue #1676 - Removing Deprecated Resource.getURL() 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-01 10:21:42 -05:00
Joakim Erdfelt
ce3f6634b5
Merge pull request #3398 from eclipse/jetty-10.0.x-remove-deprecated 
Issue #1676 - Removing deprecated methods and classes
 2019-03-01 07:55:19 -05:00
lachan-roberts
ddb75984d1 add support for WebSocket UpgradeListeners for jetty WebSocketClient 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-01 18:34:07 +11:00
lachan-roberts
d380012fc9 Issue #3412 - WSChannel delay config of idletimeout on WSConnection 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-01 18:22:18 +11:00
Lachlan Roberts
5ecd512a90 Issue #3412 - always customize WSChannel directly after creation 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-01 15:47:23 +11:00
Greg Wilkins
b925380ede Issue #3404 Updated QCSV Double usage 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-01 10:20:10 +11:00
Greg Wilkins
ca8a10a9d5 Issue #3404 Cleanup QCSV mime ordering 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-01 10:17:02 +11:00
Joakim Erdfelt
e476cec6d3 Issue #1676 - Removing deprecated methods and classes 
+ Changing usages of JVM deprecated classes / methods as well
+ Cleaning up test cases and javadoc
+ Removing test methods that rely on deprecated and now removed concepts

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-02-28 17:54:28 -05:00
Joakim Erdfelt
82cd23f4f0 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2019-02-28 16:13:19 -05:00
Joakim Erdfelt
f5b3ddc1a5 Adding optionalRemoteDebug feature to test-jetty-osgi 2019-02-28 16:10:46 -05:00