4731470188
Issue #1568 - fixing accidental NPE with no query
2017-05-23 11:59:39 -07:00
296050dfc4
Issue #1568 - Fixing improper query encoding in WebSocket ServletUpgradeRequest
2017-05-23 10:32:22 -07:00
d3e50f8f80
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-22 23:37:51 +02:00
e3bab3df22
Issue #1528 - Use WebSocketContainer out of current context
...
+ Interrogate ServletContext, ContextHandler, and Context
for an active ServerContainer before returning a new ClientContainer
2017-05-19 13:50:40 -07:00
e001fe0355
Issue #1528 - pull preconfigured HttpClient from attributes
...
+ Search ServletContext attributes first
+ Search Server attributes next
2017-05-19 08:27:53 -07:00
7b2a0e380d
Using ThreadClassLoaderScope
2017-05-18 16:13:16 -07:00
75101dfa0c
Issue #1528 - WebSocketClient can use jetty-websocket-httpclient.xml
...
+ Will use XML resource (if jetty-xml is present, and resource found)
to load the HttpClient configuration that should be used by the
new WebSocketClient() instance.
2017-05-18 15:06:22 -07:00
9b4bfbc680
Issue #1544 - Identifying context that JSR-356 was disabled for in configuration
2017-05-18 14:03:16 -07:00
1ba61e8e0c
Issue #207 - removing scheduler
2017-05-15 13:38:45 -07:00
4e2f6265eb
Issue #207 - stabilizing testcase
2017-05-15 13:16:54 -07:00
77252270ff
Post-merge cleanup
2017-05-15 10:06:47 -07:00
04b6afe879
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-05-15 09:48:41 -07:00
873c3554e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-12 14:06:21 -07:00
016cbfa5f4
Issue #207 - UntrustedWSServlet should have a slightly higher then default max message size
2017-05-11 13:26:03 -07:00
2ed56d4142
Issue #207 - Improved testing reliability
2017-05-11 13:20:31 -07:00
5701de4fd8
Issue #207 - Improved Close notification and testing
2017-05-11 11:07:41 -07:00
92741b2116
Issue #207 - Adding toString()
2017-05-11 10:59:32 -07:00
6cfcbeffad
Issue #207 - Identify non-echo client endpoint options for testing
2017-05-11 10:59:16 -07:00
e84e875e14
Issue #207 - Change in test expectation
2017-05-11 10:57:31 -07:00
c75e3c19d9
Issue #1516 - making WebSocket started thread pools have identifying names
2017-05-11 09:52:02 -07:00
b1f8f492b9
Issue #207 - better client connect/upgrade error handling
2017-05-11 07:06:18 -07:00
500ae69409
Issue #207 - stabilizing testing of Dispatched MessageSinks
2017-05-11 06:05:37 -07:00
cbe857de01
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-11 10:08:36 +02:00
27f03dbc25
Issue #207 - test compilation fix
2017-05-10 18:12:31 -07:00
2043a923cf
Issue #207 - All websocket tests moved to /websocket-tests/ module
2017-05-10 16:56:03 -07:00
2679715a30
Silencing bogus JSR356 IdleTimeoutTest warning
2017-05-10 12:13:24 -07:00
427408c251
JSR356 ClientContainer testing fix
2017-05-10 09:48:51 -07:00
a7b164e6b9
Fixing JSR356 Client tests
2017-05-10 07:46:56 -07:00
f1a89ce3b2
Issue #207 - MessageOutputStream fix
2017-05-09 17:17:07 -07:00
869ccf4421
Issue #207 - javadoc fix
2017-05-09 15:27:15 -07:00
753ed9e603
Issue #1516 - Delay starting of WebSocketClient
2017-05-09 12:58:22 -07:00
4bae04b623
Issue #207 - cleaning up dispatched MessageSink threading
2017-05-09 12:20:46 -07:00
d0c7f822f7
Issue #207 - CommonEndpointFunctionsTest needs started WebSocketContainerScope
2017-05-08 07:18:58 -07:00
546ccf5814
Issue #207 - testing JsrSessionTest needs started ClientContainer
2017-05-08 07:16:36 -07:00
d1281565ff
Issue #207 - testing JsrEndpointFunctions need started ClientContainer
2017-05-08 07:15:03 -07:00
b73b531d62
Issue #207 - Restoring fillAndParse callback
2017-05-08 05:19:11 -07:00
55e435c741
Issue #207 - more test fixes
2017-05-05 12:37:44 -07:00
3b31ecc2b1
Issue #207 - more test induced fixes
2017-05-04 13:37:29 -07:00
c2626cf1f2
Issue #207 - More test fixes
2017-05-03 16:59:54 -07:00
e36ffe1f86
Issue #207 - more testing updates and mainline code fixes
2017-05-02 17:06:53 -07:00
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
89f76e0037
Issue #207 - simplifying OnUpgradeTo prefill + parse, with test
2017-04-28 17:11:56 -07:00
e200f66ded
Issue #207 - removing ignoreBrokenPipe
2017-04-28 13:18:13 -07:00
a2a2aac6ad
Issue #207 - websocket-client test cleanup
2017-04-28 13:17:04 -07:00
94182b7134
Issue #207 - common test cleanup
2017-04-28 13:16:43 -07:00
081663e522
Issue #207 - more test fixes
2017-04-28 09:41:58 -07:00
002ba9cf00
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
...
Conflicts:
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/AltFilterTest.java
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeAnnotatedTest.java
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeContainerTest.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/DecoratorsTest.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/TestABCase3.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/WebSocketCloseTest.java
2017-04-28 06:01:06 -07:00
56fac5fdb1
Issue #207 - more test failure fixes
2017-04-27 16:26:32 -07:00
d216206fcd
Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier
2017-04-27 13:18:14 -07:00
ae51344582
Issue #207 - Final removal of BlockheadClient
2017-04-27 11:21:04 -07:00
7f345fc2d4
Issue #207 - Removing BlockheadServer
2017-04-26 18:25:06 -07:00
641d051e97
Issue #207 - moved some JSR356 tests to websocket-tests
2017-04-26 18:13:56 -07:00
e276705948
Issue #207 - moved client tests to websocket-tests
2017-04-26 16:01:07 -07:00
0195812f18
Disabling more flaky tests that are fixed in issue-207 branch
2017-04-26 11:34:57 -07:00
240b82be70
Disabling currently flaky tests that are fixed in issue-207 branch
2017-04-26 08:45:59 -07:00
ee6d495af4
Issue #207 - fixing javadoc
2017-04-25 12:41:16 -07:00
4c5dd93b30
Issue #1502 - Changing WSUF target creation used by PathMappings match
2017-04-24 16:08:37 -07:00
38e0976513
Issue #207 - allowing untrusted sessions to have non-validating generators
2017-04-21 17:21:47 -07:00
6e797f5e7d
Issue #207 - websocket-common test fixes
2017-04-21 16:39:27 -07:00
683509be60
Issue #207 - more review rework
2017-04-21 16:21:07 -07:00
f9e2f5f96e
Merge remote-tracking branch 'origin/jetty-9.4.x-websocket-review' into issue-207
...
Conflicts:
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java
2017-04-21 09:04:56 -07:00
849ad7c917
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-04-21 09:00:54 -07:00
ce9cd8d168
Issue #207 - more testing updates
2017-04-21 09:00:30 -07:00
ca2423985c
tidy up close
2017-04-21 17:14:26 +10:00
a8d4c68bdc
Issue #207 - Simplifying Connection and Close states
...
+ Removing IOState
+ Adding AtomicConnectionState
+ Adding AtomicClose
+ Reworking AbstractWebSocketConnection to be focused solely on
low level Connection handling, with little to none websocket
specifics.
+ WebSocketSession simplified
2017-04-14 16:19:05 -07:00
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
7e2e64e856
Issue #207 - testcase rework due to new async behaviors
2017-04-11 15:46:47 -07:00
d2d5c0e4a4
Issue #207 - improve port handling in URI conversions
2017-04-11 09:11:53 -07:00
9620d5c5e8
Issue #207 - ongoing testing improvements
2017-04-07 16:24:12 -07:00
2d01d1431a
Issue #207 - fixing compilation error
2017-04-07 14:34:35 -07:00
9199ec8843
Issue #207 - Improved Error Handling
2017-04-07 14:30:15 -07:00
c59afd70f0
Issue #207 - remove IncomingFrames#incomingError(throwable)
2017-04-07 13:20:50 -07:00
9adbf2b361
Issue #207 - more work on policy / buffer behaviors
2017-04-07 12:03:05 -07:00
73ca336014
Issue #207 - reworking I/O to allow streaming backpressure
2017-04-06 15:58:35 -07:00
f2c09d5388
Issue #207 - removing unused section
2017-04-06 12:23:59 -07:00
893b153cb3
Issue #207 - initial pass through for Stream backpressure
2017-04-05 17:30:51 -07:00
dd084b4e74
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-30 17:20:22 +11:00
b8ddef08d6
Merge remote-tracking branch 'origin/release-9.4.3' into jetty-9.4.x
2017-03-22 09:31:44 -07:00
83fbd5bf0d
Issue #1411 - Use short-circuit operator in websocket Frame
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-03-19 19:31:36 +01:00
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
9273d99a99
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-03-15 15:07:17 -07:00
ab5e94f86b
Fixing system locale dependent test
...
Signed-off-by: Stefan Schmidt <stefanschmidt@web.de>
2017-03-11 12:22:02 +01:00
01d539e2be
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-09 14:20:19 -07:00
1eeac2af6b
Fixing test
2017-03-09 14:17:05 -07:00
9ea4f128d4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-09 15:59:58 +11:00
6cf0663fe8
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-03-08 17:47:27 -07:00
298de714f6
More windows build fixes
2017-03-08 15:29:54 -07:00
f6b4b7b3e3
Issue #207 - Cleaning up Args vs Signature classes
2017-03-07 14:33:12 -07:00
daf79bf4a9
Issue #207 - adding addMessageHandler(<lambda>) tests
2017-03-07 12:45:41 -07:00
05f05520eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-07 07:55:36 +11:00
64c2529fb9
fixed merge
2017-03-06 15:00:14 +11:00
0a2da4822d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-06 14:20:23 +11:00
261f83f8cd
Issue #329 - Removing unused WS classes
2017-03-01 10:40:45 -07:00
11b6e8ab49
Issue #609 - fixing testcase
2017-03-01 09:57:23 -07:00
d34f126ecb
Issue #207 - Cannot catch PING in JSR356
2017-02-28 15:44:08 -07:00
acf743fa6b
Issue #207 - Careful distinction between container policy, vs session policy
2017-02-28 13:05:29 -07:00
0316e18f91
Issue #207 - working @PathParam support
2017-02-23 15:38:57 -07:00
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
6adfa3c0a2
Fixing master tests (no longer need to specify Configuration)
2017-02-07 16:21:36 -07:00
1338de9cfa
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-02-02 16:27:22 -07:00
7f3ddf4edb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:26:43 -07:00
35b94fffd3
Improving touchy timeouts on slow machines
2017-02-02 16:25:42 -07:00
c5c7be2bc5
Merge branch 'jetty-9.4.x'
2017-02-02 16:23:13 -07:00
5e57b9562f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:14:10 -07:00
9a8f22d5dd
Testing Updates
...
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
84b57c5f07
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-20 12:32:18 +01:00
ee17396cee
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-20 12:27:29 +01:00
9ae93c19ca
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-20 12:20:21 +01:00
51f68dc57e
Issue #1229 - ClassLoader constraint issue when using NativeWebSocketConfiguration with WEB-INF/lib/jetty-http.jar present.
...
Introduced String-based APIs to specify mappings, to avoid the
classloader issue.
2017-01-20 11:34:29 +01:00
a205fb3aae
Fixes #1276 - Remove org.eclipse.jetty.websocket.server.WebSocketServerFactory from SPI.
2017-01-20 09:55:01 +01:00
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
b7b3dfdc77
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-12 17:53:09 +01:00
11d669092a
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
611e79945c
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-11 18:10:50 +11:00
7e3d3604ac
Merge pull request #1219 from violetagg/ws-suspend-resume
...
Issue #1218 - When resuming a suspended connection do not register a …
2017-01-10 17:24:12 -04:00
487748cd8f
Issue #1207 - Making EventDriver use WebSocketContainerScope instead
2017-01-10 16:27:49 +01:00
25a1864de7
Issue #1229 - Adding testcase for WAR (expanded) with WEB-INF/lib/jetty-http.jar
2017-01-10 11:12:14 -04:00
a51f800054
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-10 15:07:26 +01:00
eaa51be083
Issue #1218 - When resuming a suspended connection do not register a read interest if currently in filling mode.
...
Signed-off-by: Violeta Georgieva <vgeorgieva@pivotal.io>
2017-01-05 14:58:06 +02:00
0fc897233a
Fixes #1216 to prevent duplicate SCI initialization of WSUF
2017-01-04 11:30:19 -04:00
9324971d20
Issue #1216 improving init/destroy in WSUF
2017-01-04 10:42:51 -04:00
ecc3c57dd1
Issue #1214 - Ensure all response headers are present
2017-01-04 10:10:23 -04:00
755de58ab6
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-03 11:01:05 +01:00
cb7ef89619
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-27 14:07:29 -07:00
bf80d822c0
Issue #1202 - Adding testcase and fix for NPE in Sec-WebSocket-Extensions use
2016-12-27 14:06:33 -07:00
f3c4424722
Fixes #1197 - Copying headers into upgrade facade more consistently
2016-12-27 13:41:45 -07:00
bfc21f23e0
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-27 13:33:41 -07:00
03a283235c
Issue #1197 - adding testcase for Authorization use in WSClient
2016-12-27 13:32:21 -07:00
77c63a1648
Merge branch 'release-9.3.15' into jetty-9.3.x
2016-12-21 14:56:08 -07:00
243c24338f
Merge branch 'jetty-9.4.x'
2016-12-20 15:38:51 -07:00
64f714689e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-20 15:38:36 -07:00
b9fd70f5ad
Bumping up test timeouts
2016-12-20 14:31:56 -07:00
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
d3ce624d9a
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-17 18:38:52 +01:00
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -07:00
1441a1495b
Fixes #1138 - Adding jetty-client dependency to websocket.mod
2016-12-16 09:27:56 -07:00
1c16964118
Merge branch 'jetty-9.4.x'
2016-12-16 08:38:16 -07:00
44596a7714
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-16 08:38:01 -07:00
c698c95e9b
Issue #1114 - removing redundant exportConfiguration
2016-12-15 10:44:34 -07:00
bd104d59f9
Issue #1114 - persisting NativeWebSocketConfiguration mappings
...
+ Mappings are persisted if added to the NativeWebSocketConfiguration
before that configuration is started. Otherwise they are cleared
out on configuration.stop() lifecycle (like before)
2016-12-14 15:31:23 -07:00
05f397caa4
Issue #1114 - Adding initial stop/start test logic
2016-12-14 13:20:28 -07:00
b6c4e5b7c9
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-14 11:53:48 +01:00
dd3a73e57a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-12-14 11:19:49 +01:00
9b609e0f6d
Issue #1161 - Leaving CookieStore alone HttpClient and WebSocketClient are stopped
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-12-14 09:00:12 +01:00
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
19333b8b3b
Merge branch 'jetty-9.4.x' into release-9.4.0
2016-12-08 08:50:15 -06:00
8ea15f4214
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-08 20:17:20 +11:00
5186c1e6d0
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-12-08 18:35:40 +11:00
c7e139a8a6
fix typo in PathParamServerEndpointConfig javadoc ( #1145 )
...
Signed-off-by: Ben Duffield <bduffield@palantir.com>
2016-12-08 18:08:06 +11:00
fe493c2c06
Issue #1124
...
Fix classloading of WebSocketServerFactory for osgi.
2016-12-08 17:25:18 +11:00
c02dec5654
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-08 11:31:00 +11:00
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
a4884f0c2d
Issue #117
...
Fixed Upgrade Response to make a distinction between when headers are available from a response and when they are copied to and copied from the real response.
This exposed the fact that the extension header was being set twice. Fixed that and now test webapp works again.
2016-12-05 17:43:47 +11:00
936fd09a18
Issue #1124
...
Fix classloading of WebSocketServerFactory for osgi.
2016-12-05 09:42:44 +11:00
2bb88f566f
Merge branch 'jetty-9.4.x'
2016-12-02 15:50:52 -06:00
d7aa079365
Issue #117 fixed javadoc errors
2016-12-02 15:33:30 +11:00
4b82f54ad3
Issue #117 fixed javadoc errors
2016-12-02 14:34:37 +11:00
4046ef26d3
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-02 13:35:16 +11:00
b70101b93f
Fixes #117 - working build of WebSocketClient with HttpClient
...
+ Proxy support exists now
2016-12-01 15:00:41 -07:00
709938e02b
Merge branch 'issue-117' into jetty-9.4.x
2016-12-01 13:06:08 -07:00
4d7a629e1b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-01 12:07:07 +11:00
47fd7e1bd2
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-30 14:41:43 -07:00
4b5e5566e8
Issue #117 - minor code review changes
2016-11-30 10:50:05 -07:00
63d93160f1
Issue #1124 - post review cleanup of changes with @sbordet
2016-11-30 10:16:25 -07:00
70247d74d9
Issue #1124 - Fixing up merge issues
...
+ Making WebSocketServletFactory always load a new
WebSocketServerFactory
+ Making WebSocketServerFactory need a ServletContext
to construct it, if appropriate (the WebSocketHandler
approach doesn't use a ServletContext)
+ NativeWebSocketConfiguration is now a bean of
ServerContainer
+ Removed WebSocketServletFactory.init(ServletContext) method
+ Renamed WebSocketServletFactory.init() to .start()
+ Renamed WebSocketServletFactory.cleanup() to .stop()
+ CDI & Websocket now works
+ Using a ServletContextListener now works
+ DecoderFactory and EncoderFactory now work
2016-11-29 15:46:03 -07:00
f54938178e
Merge branch 'jetty-9.2.x' into 'jetty-9.3.x'
2016-11-29 14:29:33 -07:00
e329e386f0
Issue #117 - Carrying over the work from features/wsclient-httpclient
2016-11-28 15:45:38 -07:00
c509a83d3b
Issue #1124 - adding more web.xml test cases
2016-11-25 07:38:20 -07:00
fb509eefe4
Resetting the field that marks the filter exported as a context attribute.
2016-11-25 15:10:32 +01:00
a3f32911fa
Issue #1124 - WebSocketUpgradeFilter + ServletContextListener
...
+ Now Spring and its initialization of WebSocketUpgradeFilter
can work.
+ Improves life for cometd 3.1.0 as well
2016-11-23 19:55:36 -07:00
23753759bb
Merged branch 'jetty-9.4.x' into 'master'.
2016-11-23 12:19:31 +01:00
c5c0cc71d0
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-11-23 12:18:29 +01:00
a9817d7ac2
Fixes #1123 - Broken lifecycle for WebSocket's mappings.
...
Now resetting the mappings in the lifecycle callbacks of the
enclosing classes.
2016-11-23 12:14:01 +01:00
2ef23a6725
Issue #572
...
Improved to the toString and dump output of connections, endpoints and channel to assist with debugging
made the SSL callbacks and runnables Invocable to avoid thread starvation.
2016-11-23 16:58:35 +11:00
d361786e43
Issue #1118 - Eliminating .destroy() conflict
...
+ extending from AbstractLifeCycle instead of ContainerLifeCycle
2016-11-22 09:48:01 -07:00
bf3ea9ae44
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-18 11:19:40 +11:00
1003969468
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-17 11:04:40 -07:00
7930a3dac8
Fixing merge 9.2.x -> 9.3.x
2016-11-16 18:31:33 -07:00
bfadca49b5
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-11-16 13:56:31 -07:00
e6b3216708
Issue #1090 - Delaying role of WebSocketUpgradeFilter till .init()
...
+ WebSocketServerContainerInitializer now initializes the
MappedWebSocketCreator, WebSocketServerFactory, and
ServerContainer directly, but puts the components needed
by WebSocketUpgradeFilter into ServletContext attributes
that it can obtain in its own init()
+ Added optional org.eclipse.jetty.websocket.jsr356.addDynamicFilter
init-param/attribute key to disable/enable the automatic addition
of the WebSocketUpgradeFilter during JSR356 init (to allow
WEB-INF/web.xml specified filter to operate instead)
+ Added WebSocketServerContainerINitializer.isEnabledViaContext()
to make testing the init-param and attributes more generic
2016-11-16 13:43:06 -07:00
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
2295bd59e3
Issue #1090 - Use WebSocketUpgradeFilter from WEB-INF/web.xml if present
2016-11-10 14:26:04 -07:00
9a6f68be78
Merge branch 'release-9.3.14' into jetty-9.3.x
2016-11-07 10:45:04 -06:00
bc1f53a692
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-04 10:25:25 -07:00
bc67969135
Fixes #1054 - NPE in Jetty WebSocketListener on PING frame with empty payload
2016-11-04 10:24:06 -07:00
996253c971
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-02 11:33:57 -07:00
3a8cdc93d8
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-11-02 11:33:43 -07:00
c665106fc5
Issue #1057 - Improve WebSocketUpgradeFilter performance
...
+ Tests for WebSocket upgrade now evaluates the request
from least common feature to most common feature, so as
minimize the testing of the request object on every request
2016-11-02 11:28:56 -07:00
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
2c7964d9c9
Issue #207 - fixing EchoTest
2016-10-21 13:53:31 -07:00
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
82a6eff20c
Precompile pattern for checking of classes in javax package in ReflectUtils
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2016-10-14 01:11:56 +02:00
4202a98ec5
Issue #207 - @PathParam support fixes
...
+ Arg.tag is now exposed for general use
+ JsrEndpointFunctions now decode (into primitives) the URI template
exposed @PathParam static arguments
+ JsrEndpointFunctions simplified tracking of static args
+ ServerContainer.assertValidEndpoint() now validates
added endpoints with @PathParam immediately (per spec)
using a UriTemplate where each variable is an empty string
2016-10-13 15:58:34 -07:00
a0b7bc4623
Issue #207 - prevent overlapping websocket streaming dispatch
...
+ when FIN==true, wait for dispatch to return before processing
more frames
2016-10-13 14:42:08 -07:00
f920c65bcc
Issue #207 - ensuring WebSocketServerFactory init occurs earlier
2016-10-13 14:41:53 -07:00
681bddc728
Removing eclipse detrius
2016-10-13 14:40:29 -07:00
8fce2727ca
Issue #207 - improving errors for Encoders/Decoders
2016-10-13 14:39:52 -07:00
3ee2e4ab7b
Issue #207 - javax.websocket.DeploymentException thrown at addEndpoint now
2016-10-12 12:07:08 -07:00
82942cb3a4
Merge branch 'jetty-9.4.x' into issue-207
2016-10-12 11:36:28 -07:00
512e0ec076
Issue #207 - Using connection idle-timeout declared in annotation
2016-10-12 11:14:15 -07:00
0e9841a3cc
Issue #207 - correcting lifecycle of WebSocketSession and EndpointFunctions
2016-10-12 11:13:35 -07:00
34f0007153
Fixing up testcase reporting
2016-10-12 11:11:58 -07:00
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
8dc18fe088
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-28 11:56:24 +02:00
7e376fd9da
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-28 11:53:54 +02:00
0f97c3df5d
Fixes #966 - Remove usages of ConcurrentArrayQueue.
2016-09-28 11:40:39 +02:00
efe339e246
Code cleanup.
2016-09-28 11:40:39 +02:00
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
fb7da26ad2
Updating to version 9.2.20-SNAPSHOT
2016-09-08 13:04:11 -07:00
7b94bc32f4
Updating to version 9.2.19.v20160908
2016-09-08 12:11:44 -07:00
36f657165f
Issue #207 - Support javax.websocket version 1.1
...
+ More testcase improvements
2016-08-25 11:03:42 -07:00
1bb25adbdc
Issue #207 - Support javax.websocket version 1.1
...
+ Correcting tests
2016-08-23 18:34:17 -07:00
0a99c20a73
Issue #207 - Support javax.websocket version 1.1
...
+ Cleaning up WebSocketPolicy usage
2016-08-23 16:57:09 -07:00
9c1ac5fedd
Issue #207 - Support javax.websocket version 1.1
...
+ Correcting jsr server PathParam static args sort issue
2016-08-19 19:28:16 -07:00
1cf61d6df7
Issue #207 - Support javax.websocket version 1.1
...
+ Removing more EventDriver references
+ Fixing bad implementation exposed by testcases
2016-08-19 17:59:07 -07:00
1d341398da
Fixing up javadoc
2016-08-19 15:45:43 -07:00
de7c7ca7af
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:21:33 -07:00
f1a8bafabe
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
fc9adbb391
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
795246c785
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
2175625537
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
390c6924dd
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
a4f3ef3483
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
39f2ba3b56
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
e50cabf305
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
b079fba842
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
b71be7c808
Trailing merge fixes
2016-08-19 15:03:32 -07:00
57bbf67735
Issue #207 - Support javax.websocket version 1.1
...
WIP
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
Greg Wilkins
dreis2211
Stefan Schmidt
Jesse McConnell
Simone Bordet
Violeta Georgieva
Jan Bartel
Ben Duffield
Joakim Erdfelt
Christoph Dreis