Joakim Erdfelt
5638f7b25b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-16 14:33:01 -07:00
Joakim Erdfelt
9e0fd7faa0
Issue #1625 - Support new IANA declared websocket close status codes
2017-06-16 14:23:29 -07:00
Joakim Erdfelt
d02a14eeed
WebSocket SuspendResume updated tests and notes from review
2017-06-14 11:14:59 -07:00
Joakim Erdfelt
00beb607fc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-13 10:40:02 -07:00
Joakim Erdfelt
bd751b6ce2
Issue #1599 - WebSocketClient early close scenarios
...
+ Connection timeout results in:
endpoint.onError(WebSocketTimeoutException)
localSession.close(SHUTDOWN)
2017-06-13 09:47:44 -07:00
Joakim Erdfelt
67022482e5
Issue #1605 - common executor and bufferpool for jsr356 client
2017-06-12 09:23:23 -07:00
Joakim Erdfelt
bc0fd4e1ef
No more websocket test errors (need to work on issues)
2017-06-05 14:16:48 -07:00
Joakim Erdfelt
5d7e97993c
Merge remote-tracking branch 'origin/master' into issue-207-master
2017-06-05 10:05:05 -07:00
Joakim Erdfelt
99fbc30f92
Issue #207 - Close Handshake Test refactor
2017-06-05 09:48:07 -07:00
Joakim Erdfelt
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
Joakim Erdfelt
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
Greg Wilkins
ab4d300ae7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-30 17:43:19 +02:00
Joakim Erdfelt
296050dfc4
Issue #1568 - Fixing improper query encoding in WebSocket ServletUpgradeRequest
2017-05-23 10:32:22 -07:00
Joakim Erdfelt
1ba61e8e0c
Issue #207 - removing scheduler
2017-05-15 13:38:45 -07:00
Joakim Erdfelt
04b6afe879
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-05-15 09:48:41 -07:00
Joakim Erdfelt
873c3554e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-12 14:06:21 -07:00
Joakim Erdfelt
5701de4fd8
Issue #207 - Improved Close notification and testing
2017-05-11 11:07:41 -07:00
Joakim Erdfelt
92741b2116
Issue #207 - Adding toString()
2017-05-11 10:59:32 -07:00
Joakim Erdfelt
c75e3c19d9
Issue #1516 - making WebSocket started thread pools have identifying names
2017-05-11 09:52:02 -07:00
Joakim Erdfelt
500ae69409
Issue #207 - stabilizing testing of Dispatched MessageSinks
2017-05-11 06:05:37 -07:00
Greg Wilkins
cbe857de01
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-11 10:08:36 +02:00
Joakim Erdfelt
2043a923cf
Issue #207 - All websocket tests moved to /websocket-tests/ module
2017-05-10 16:56:03 -07:00
Joakim Erdfelt
f1a89ce3b2
Issue #207 - MessageOutputStream fix
2017-05-09 17:17:07 -07:00
Joakim Erdfelt
869ccf4421
Issue #207 - javadoc fix
2017-05-09 15:27:15 -07:00
Joakim Erdfelt
753ed9e603
Issue #1516 - Delay starting of WebSocketClient
2017-05-09 12:58:22 -07:00
Joakim Erdfelt
4bae04b623
Issue #207 - cleaning up dispatched MessageSink threading
2017-05-09 12:20:46 -07:00
Joakim Erdfelt
d0c7f822f7
Issue #207 - CommonEndpointFunctionsTest needs started WebSocketContainerScope
2017-05-08 07:18:58 -07:00
Joakim Erdfelt
b73b531d62
Issue #207 - Restoring fillAndParse callback
2017-05-08 05:19:11 -07:00
Joakim Erdfelt
55e435c741
Issue #207 - more test fixes
2017-05-05 12:37:44 -07:00
Joakim Erdfelt
3b31ecc2b1
Issue #207 - more test induced fixes
2017-05-04 13:37:29 -07:00
Joakim Erdfelt
c2626cf1f2
Issue #207 - More test fixes
2017-05-03 16:59:54 -07:00
Joakim Erdfelt
e36ffe1f86
Issue #207 - more testing updates and mainline code fixes
2017-05-02 17:06:53 -07:00
Joakim Erdfelt
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
Joakim Erdfelt
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
Joakim Erdfelt
89f76e0037
Issue #207 - simplifying OnUpgradeTo prefill + parse, with test
2017-04-28 17:11:56 -07:00
Joakim Erdfelt
94182b7134
Issue #207 - common test cleanup
2017-04-28 13:16:43 -07:00
Joakim Erdfelt
ae51344582
Issue #207 - Final removal of BlockheadClient
2017-04-27 11:21:04 -07:00
Joakim Erdfelt
7f345fc2d4
Issue #207 - Removing BlockheadServer
2017-04-26 18:25:06 -07:00
Joakim Erdfelt
38e0976513
Issue #207 - allowing untrusted sessions to have non-validating generators
2017-04-21 17:21:47 -07:00
Joakim Erdfelt
6e797f5e7d
Issue #207 - websocket-common test fixes
2017-04-21 16:39:27 -07:00
Joakim Erdfelt
683509be60
Issue #207 - more review rework
2017-04-21 16:21:07 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
849ad7c917
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-04-21 09:00:54 -07:00
Joakim Erdfelt
ce9cd8d168
Issue #207 - more testing updates
2017-04-21 09:00:30 -07:00
Greg Wilkins
ca2423985c
tidy up close
2017-04-21 17:14:26 +10:00
Joakim Erdfelt
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
Joakim Erdfelt
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
Joakim Erdfelt
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
Joakim Erdfelt
7e2e64e856
Issue #207 - testcase rework due to new async behaviors
2017-04-11 15:46:47 -07:00
Joakim Erdfelt
9620d5c5e8
Issue #207 - ongoing testing improvements
2017-04-07 16:24:12 -07:00
Joakim Erdfelt
2d01d1431a
Issue #207 - fixing compilation error
2017-04-07 14:34:35 -07:00
Joakim Erdfelt
9199ec8843
Issue #207 - Improved Error Handling
2017-04-07 14:30:15 -07:00
Joakim Erdfelt
c59afd70f0
Issue #207 - remove IncomingFrames#incomingError(throwable)
2017-04-07 13:20:50 -07:00
Joakim Erdfelt
9adbf2b361
Issue #207 - more work on policy / buffer behaviors
2017-04-07 12:03:05 -07:00
Joakim Erdfelt
73ca336014
Issue #207 - reworking I/O to allow streaming backpressure
2017-04-06 15:58:35 -07:00
Joakim Erdfelt
893b153cb3
Issue #207 - initial pass through for Stream backpressure
2017-04-05 17:30:51 -07:00
Joakim Erdfelt
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
Joakim Erdfelt
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
Joakim Erdfelt
9273d99a99
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-03-15 15:07:17 -07:00
Joakim Erdfelt
f6b4b7b3e3
Issue #207 - Cleaning up Args vs Signature classes
2017-03-07 14:33:12 -07:00
Greg Wilkins
05f05520eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-07 07:55:36 +11:00
Greg Wilkins
0a2da4822d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-06 14:20:23 +11:00
Joakim Erdfelt
261f83f8cd
Issue #329 - Removing unused WS classes
2017-03-01 10:40:45 -07:00
Joakim Erdfelt
d34f126ecb
Issue #207 - Cannot catch PING in JSR356
2017-02-28 15:44:08 -07:00
Joakim Erdfelt
acf743fa6b
Issue #207 - Careful distinction between container policy, vs session policy
2017-02-28 13:05:29 -07:00
Joakim Erdfelt
0316e18f91
Issue #207 - working @PathParam support
2017-02-23 15:38:57 -07:00
Joakim Erdfelt
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
Joakim Erdfelt
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
Jesse McConnell
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
Jesse McConnell
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
Jesse McConnell
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
Jesse McConnell
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
Simone Bordet
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
Simone Bordet
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
Simone Bordet
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd
, reversing
changes made to 4565c186d7
.
2017-01-19 18:26:43 +01:00
Jesse McConnell
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
Jesse McConnell
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
Simone Bordet
b7b3dfdc77
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-12 17:53:09 +01:00
Simone Bordet
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
Joakim Erdfelt
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
Joakim Erdfelt
487748cd8f
Issue #1207 - Making EventDriver use WebSocketContainerScope instead
2017-01-10 16:27:49 +01:00
Violeta Georgieva
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
Joakim Erdfelt
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
Joakim Erdfelt
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
Joakim Erdfelt
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
Joakim Erdfelt
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -07:00
Jesse McConnell
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
Jesse McConnell
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
Jesse McConnell
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
Jesse McConnell
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
Jesse McConnell
2bb88f566f
Merge branch 'jetty-9.4.x'
2016-12-02 15:50:52 -06:00
Greg Wilkins
d7aa079365
Issue #117 fixed javadoc errors
2016-12-02 15:33:30 +11:00
Greg Wilkins
4046ef26d3
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-02 13:35:16 +11:00
Joakim Erdfelt
b70101b93f
Fixes #117 - working build of WebSocketClient with HttpClient
...
+ Proxy support exists now
2016-12-01 15:00:41 -07:00
Joakim Erdfelt
709938e02b
Merge branch 'issue-117' into jetty-9.4.x
2016-12-01 13:06:08 -07:00
Jan Bartel
4d7a629e1b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-01 12:07:07 +11:00
Joakim Erdfelt
47fd7e1bd2
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-30 14:41:43 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
e329e386f0
Issue #117 - Carrying over the work from features/wsclient-httpclient
2016-11-28 15:45:38 -07:00
Simone Bordet
23753759bb
Merged branch 'jetty-9.4.x' into 'master'.
2016-11-23 12:19:31 +01:00
Greg Wilkins
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
Greg Wilkins
bf3ea9ae44
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-18 11:19:40 +11:00
Joakim Erdfelt
1003969468
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-17 11:04:40 -07:00
Joakim Erdfelt
7930a3dac8
Fixing merge 9.2.x -> 9.3.x
2016-11-16 18:31:33 -07:00
Joakim Erdfelt
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
Jesse McConnell
9a6f68be78
Merge branch 'release-9.3.14' into jetty-9.3.x
2016-11-07 10:45:04 -06:00
Joakim Erdfelt
bc1f53a692
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-04 10:25:25 -07:00
Joakim Erdfelt
bc67969135
Fixes #1054 - NPE in Jetty WebSocketListener on PING frame with empty payload
2016-11-04 10:24:06 -07:00
Joakim Erdfelt
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
Joakim Erdfelt
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
Joakim Erdfelt
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
Joakim Erdfelt
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
Christoph Dreis
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
82942cb3a4
Merge branch 'jetty-9.4.x' into issue-207
2016-10-12 11:36:28 -07:00
Joakim Erdfelt
512e0ec076
Issue #207 - Using connection idle-timeout declared in annotation
2016-10-12 11:14:15 -07:00
Joakim Erdfelt
0e9841a3cc
Issue #207 - correcting lifecycle of WebSocketSession and EndpointFunctions
2016-10-12 11:13:35 -07:00
Jesse McConnell
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
Jesse McConnell
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
Simone Bordet
8dc18fe088
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-28 11:56:24 +02:00
Simone Bordet
7e376fd9da
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-28 11:53:54 +02:00
Simone Bordet
0f97c3df5d
Fixes #966 - Remove usages of ConcurrentArrayQueue.
2016-09-28 11:40:39 +02:00
Simone Bordet
efe339e246
Code cleanup.
2016-09-28 11:40:39 +02:00
Joakim Erdfelt
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
Joakim Erdfelt
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
Joakim Erdfelt
fb7da26ad2
Updating to version 9.2.20-SNAPSHOT
2016-09-08 13:04:11 -07:00
Joakim Erdfelt
7b94bc32f4
Updating to version 9.2.19.v20160908
2016-09-08 12:11:44 -07:00
Joakim Erdfelt
36f657165f
Issue #207 - Support javax.websocket version 1.1
...
+ More testcase improvements
2016-08-25 11:03:42 -07:00
Joakim Erdfelt
0a99c20a73
Issue #207 - Support javax.websocket version 1.1
...
+ Cleaning up WebSocketPolicy usage
2016-08-23 16:57:09 -07:00
Joakim Erdfelt
1d341398da
Fixing up javadoc
2016-08-19 15:45:43 -07:00
Joakim Erdfelt
de7c7ca7af
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:21:33 -07:00
Joakim Erdfelt
fc9adbb391
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
795246c785
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
2175625537
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
390c6924dd
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
a4f3ef3483
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
39f2ba3b56
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
e50cabf305
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
b079fba842
Issue #207 - Support javax.websocket version 1.1
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
b71be7c808
Trailing merge fixes
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
57bbf67735
Issue #207 - Support javax.websocket version 1.1
...
WIP
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
3198d12127
Issue #207 - Support javax.websocket version 1.1
...
WIP
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
8784a1f850
Issue #207 - Support javax.websocket version 1.1
...
WIP
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
31328b8f66
Issue #207 - Support javax.websocket version 1.1
...
WIP
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
89f45830bc
Issue #207 - Support javax.websocket version 1.1
...
WIP
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
5f6cf96fa5
Issue #207 - Support javax.websocket version 1.1
...
WIP
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
f23d921ae3
Issue #207 - Support javax.websocket version 1.1
...
WIP
2016-08-19 15:03:32 -07:00
Joakim Erdfelt
d60d6363b4
467246 - Support javax.websocket version 1.1
...
WIP
2016-08-19 15:03:32 -07:00