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
47fd7e1bd2
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-30 14:41:43 -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
e329e386f0
Issue #117 - Carrying over the work from features/wsclient-httpclient
2016-11-28 15:45:38 -07: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
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
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
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
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
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00: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
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
823ba4add6
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-21 18:15:38 +02:00
6a15bbfb2b
Issue #751 - Remove usages of ArrayQueue.
2016-07-21 17:55:48 +02:00
ab45979a13
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-23 13:02:53 +02:00
9d9df416af
Fixes #643 - NPE in passing websocket client test.
2016-06-23 13:00:04 +02:00
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
e607acfa4e
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-15 18:06:32 +10:00
0e5de87d49
Issue #663 Cleanup
...
Increased websocket tests timeouts
2016-06-15 18:04:33 +10:00
3dca610f7b
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-13 23:39:23 +02:00
ebee9f12f9
Fixed SessionTrackingTest.
...
Introduced WebSocketSession.Listener that can be used to be notified
of session opening and close, so that tests can be written more reliably.
2016-06-13 23:23:15 +02:00
e578c79b41
Code cleanups.
2016-06-13 23:23:14 +02:00
20c1301203
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-07 11:56:27 -05:00
a8f25b550f
Fixes #487 - JDK 9 build compatibility.
...
Fixes #306 - Merge jetty-parent into jetty-project.
- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
2016-06-06 21:28:51 +02:00
dd8afc34b9
Merge branch 'jetty-9.3.x' into bugs/388
2016-06-06 08:37:36 -07:00
8758cbb607
Fixes #388 - Provide pluggable RemoteEndpoint service
2016-06-06 07:44:46 -07:00
98c328fb23
Jetty 9.4.x 572 ( #614 )
...
* Issue #572 Scheduling Strategy Deadlocks
Implemented dual strategy idea from #572 discussion
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixed http2 strategy choice
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* code cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* clean up seelctor actions/products
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* cleanups
2016-06-03 09:07:00 +10:00
b4c958e68c
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-05-31 20:38:31 -05:00
89232a6207
Fixes #605 - Guard concurrent calls to WebSocketSession.close().
...
Introduced an AtomicBoolean to guard AbstractWebSocketConnection.close().
Made IOState code more robust with respect to synchronization.
2016-05-31 18:28:12 +02:00
2e21234328
Code cleanups.
2016-05-31 18:23:51 +02:00
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
d5c6793e6a
[maven-release-plugin] prepare for next development iteration
2016-05-17 15:33:46 -05:00
0bab7e6616
[maven-release-plugin] prepare release jetty-9.2.17.v20160517
2016-05-17 15:33:42 -05:00
939505c342
Updating to version 9.2.17-SNAPSHOT
2016-04-14 14:03:21 -07:00
778fac638d
Updating to version 9.2.16.v20160414
2016-04-14 13:21:34 -07:00
47bbd9364d
Revert "Updating to version 9.2.16.v20160414"
...
This reverts commit 29ae63855b
2016-04-14 13:19:59 -07:00
29ae63855b
Updating to version 9.2.16.v20160414
2016-04-14 13:17:21 -07:00
6fb338e50d
Updating to version 9.3.9-SNAPSHOT
2016-04-11 16:20:50 -07:00
bb4f3c4882
Updating to version 9.3.9.M1
2016-04-11 15:35:22 -07:00
c68d3b1d8d
Updating to version 9.3.9-SNAPSHOT
2016-03-14 09:07:52 -07:00
1f3b3f31f4
Updating to version 9.3.8.v20160314
2016-03-14 08:30:20 -07:00
d6bbe9ab12
Issue #388 - Provide pluggable RemoteEndpoint service
2016-03-03 09:28:05 -07:00
f98dde5e5b
Updating to version 9.2.16-SNAPSHOT
2016-02-10 15:36:41 -07:00
9b6890d3c1
Updating to version 9.2.15.v20160210
2016-02-10 14:49:12 -07:00
cb79379b79
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-05 18:14:56 +01:00
06fa8370fb
removing debugging output
2016-02-04 11:25:18 -07:00
cfe823a7d6
487197 - Deflater/Inflater memory leak with WebSocket permessage-deflate extension
...
+ CompressExtension implementations are now part of the Jetty LifeCycle
+ Deflater and Inflater implementations are only instantiated when
needed.
+ CompressExtension.doStop() LifeCycle will call .end() on instantiated
Deflater and Inflater implementations
2016-02-04 11:03:45 -07:00
df79ad689a
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-02-04 07:00:13 +01:00
2902a13463
485469 - permessage-deflate extension causes protocol error in Firefox/Chrome
...
+ Ensure that CONTINUATION frames are marked without RSV1 bit set
during all code paths for permessage-deflate
2016-01-29 12:46:58 -07:00
56c0bc768c
Merged branch 'jetty9.3.x' into 'master'.
2016-01-21 17:52:37 +01:00
e0ce545ad7
Updating to version 9.3.8-SNAPSHOT
2016-01-15 17:15:14 -07:00
c0b191119b
Updating to version 9.3.7.v20160115
2016-01-15 16:40:15 -07:00
6808953561
485469 - permessage-deflate extension causes protocol error in Firefox/Chrome
...
+ Correcting behavior for RFC7692: Section 7.2.3.6 (permessage-deflate
empty fin)
2016-01-15 16:26:02 -07:00
c5cbc64e77
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-01-14 11:00:06 +11:00
b7f9c9aca9
Updating to version 9.3.7-SNAPSHOT
2016-01-13 08:21:01 -07:00
21ca3f6690
Updating to version 9.3.7.RC1
2016-01-13 07:30:24 -07:00
30308f2316
Javadoc updates
2016-01-13 07:25:15 -07:00
a7b3a9f481
485663 - NullPointerException in WebSocketSession during upgrade with DEBUG logging
...
+ Defaulting session policy to container policy on session creation
2016-01-12 16:21:43 -07:00
57224ec3ca
481986 - Dead JSR 356 Server Session still being tracked after Session/Connection closure
...
+ Removing SessionListener
+ Work in CDI layer for WebSocketContainerScope is reused for
session tracking on the parent scope of the WebSocketSession only.
no more multi-listener behavior
+ Reworked JsrSession ID behavior to not be based on AtomicLong
+ AbstractWebSocketConnection now has .hashCode and .equals
2016-01-12 16:15:51 -07:00
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
e0ea078db2
Merge branch 'jetty-9.3.x'
2015-12-17 16:16:04 -07:00
88945478f7
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2015-12-17 16:15:49 -07:00
1543601968
484612 - Restore WebSocket Session.close() sending 1000/Normal status code
2015-12-17 16:15:06 -07:00
9aa6dc1e7d
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-08 13:02:55 +01:00
b9c1535552
481567 - permessage-deflate causing data-dependent ju.zip.DataFormatException: invalid stored block lengths
...
+ Reworked PerMessageDeflateExtensionTest to test with different
modes (http/ws vs https/wss), different messages sizes, and
input buffer sizes (these various configurations do trigger
the reported bug)
+ Made CompressExtension loop over the input buffer if the buffer
happens to not be entirely consumed.
2015-12-07 13:15:29 -07:00
edf686fe0a
Updating to version 9.3.7-SNAPSHOT
2015-11-06 12:13:00 -07:00
d737e1c638
Updating to version 9.3.6.v20151106
2015-11-06 11:09:32 -07:00
ec8f8d3e4f
Updating to version 9.2.15-SNAPSHOT
2015-11-06 11:06:48 -07:00
ecba378f5c
Updating to version 9.2.14.v20151106
2015-11-06 10:32:14 -07:00
dde32787c4
Updating to version 9.3.6-SNAPSHOT
2015-10-12 15:47:37 -07:00
29722bd880
Updating to version 9.3.5.v20151012
2015-10-12 15:10:39 -07:00
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
9cf0e34a1d
Updating to version 9.4.0-SNAPSHOT
2015-10-07 15:41:32 -07:00
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
6aae1265bd
Removing redudant close reason trim (handled elsewhere now)
2015-10-02 10:47:10 -07:00
64d5718e9e
Removing System.out
2015-10-02 10:43:47 -07:00
cd17ff932a
478829 - WebsocketSession not cleaned up / memory leak
...
+ WebSocket Connection objects no longer need to
hold a reference to the WebSocketSession object
eliminating another reference to the WebSocketSession
that could hold GC efforts to clean it up
2015-10-02 10:33:32 -07:00
1e8d0db743
478829 - WebsocketSession not cleaned up / memory leak
...
+ Reducing looping references Session -> otherObj -> Session
+ Using Container LifeCycle bean management more consistently
+ All sessions are now child beans
+ A stopped session that hasn't been closed, will auto-close now
+ Using SessionListener more consistently
+ Client ConnectionManager no longer tracks Sessions
+ EventDriver stop cleans up its Session references
+ Moving all DummyConnection test classes to websocket-common:tests
2015-10-01 18:18:20 -07:00
8946badbed
Extracting IBlockheadServerConnection for refactoring prep
2015-09-30 12:47:31 -07:00
b865b50cb6
Extracting IBlockheadClient for refactoring prep
2015-09-30 12:47:31 -07:00
f22fcde971
474936 - WebSocketSessions are not always cleaned out from openSessions
...
+ Calling onSessionOpen() before App.onOpen()
This helps, as there is a race for the onSessionOpen()
in the original behavior with short lived sockets.
The short lived socket could handle onSessionClosed()
before onSessionOpen() had a chance, making the close
fail to remove the session from openSessions, and then
the slower add occurs later, adding it into the openSession
+ Minor cleanup in IOState
2015-09-25 09:49:29 -07:00
1bca608b48
Breaking out close logging into child logger of AbstractWebSocketConnection
2015-09-25 09:49:29 -07:00
20ffd0dd0b
Merge branch 'release-9.3.3'
2015-08-31 13:41:21 -05:00
5312f2c0d7
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
2015-08-27 15:34:45 -07:00
25cfffbe1e
428474 - Expose batch mode in the Jetty WebSocket API
2015-08-27 14:53:21 -07:00
11b5d320f8
472082 - isOpen returns true on CLOSING Connection
...
+ Minor tweak to test for isOutputAvailable() instead of connection
state.
2015-08-27 12:52:52 -07:00
ef067b2624
476023 - Incorrect trimming of WebSocket close reason
...
+ Fixed CloseStatus.trimMaxReasonLength() to perform trim correctly
+ Deprecated CloseStatus.trimMaxReasonLength() because it creates
to many objects
+ Removed use of CloseStatus.trimMaxReasonLength() in implementation
code
+ Improved CloseInfo ...
+ tracks reason via utf8 byte array (not String object)
+ trims utf8 byte array as-needed
+ All non-jsr implementations use CloseInfo logic
2015-08-27 11:12:51 -07:00
54e3d0a2e8
476049 - When using WebSocket Session.close() there should be no status code or reason sent
2015-08-27 09:33:44 -07:00
9c855bee76
474936 - WebSocketSessions are not always cleaned out from openSessions
...
+ Adding testcase
+ Enabling Connection.onClose() -> ioState.onDisconnected()
Conflicts:
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketCloseTest.java
2015-08-27 09:33:28 -07:00
cb0852c53c
476049 - When using WebSocket Session.close() there should be no status code or reason sent
2015-08-27 09:27:28 -07:00
6409366499
[maven-release-plugin] prepare for next development iteration
2015-08-27 10:11:29 -05:00
3086adc965
[maven-release-plugin] prepare release jetty-9.3.3.v20150827
2015-08-27 10:11:21 -05:00
f5d1fb1058
Merge branch 'master' into release-9.3.3
2015-08-27 08:31:22 -05:00
c07f11a1fd
474936 - WebSocketSessions are not always cleaned out from openSessions
...
+ Adding testcase
+ Enabling Connection.onClose() -> ioState.onDisconnected()
2015-08-26 17:08:14 -07:00
f8734f23ce
[maven-release-plugin] prepare for next development iteration
2015-08-25 14:10:01 -05:00
e9edf4c24b
[maven-release-plugin] prepare release jetty-9.3.3.v20150825
2015-08-25 14:09:54 -05:00
2f4f4a2247
Minor improvements in WebSocketConnection.toString()
2015-08-14 14:48:51 -07:00
25b692046f
Merge branch 'jetty-9.2.x'
2015-08-07 09:40:11 -07:00
55862e229e
471055 - Restore legacy/experimental WebSocket extensions (deflate-frame)
2015-08-07 09:39:12 -07:00
a71c543a7e
Revert "Removing old websocket extensions x-webkit-deflate-frame and deflate-frame"
...
This reverts commit ec9504aab8
2015-08-07 07:37:06 -07:00
c424b58153
474453 - Tiny buffers (under 7 bytes) fail to compress in permessage-deflate
...
+ Ensure compress() is sanely using Deflater.deflate()
+ Ensure output buffer in .deflate() is always a minimum
of 256 bytes
2015-08-06 15:16:32 -07:00
ffcedde60a
474068 - Update WebSocket Extension for permessage-deflate draft-22
...
+ Copying inflated byte buffers
+ Simplifying Accumulator of buffer/chunks
+ Removing references to frame compression extensions
2015-08-06 15:16:32 -07:00
aac9568a30
Work on permessage-deflate continues
...
Conflicts:
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/FrameCompressionExtensionTest.java
2015-08-06 15:16:30 -07:00
39f9f3ad44
Removing old websocket extensions x-webkit-deflate-frame and deflate-frame
...
Conflicts:
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
2015-08-06 15:16:11 -07:00
2a1e0659d1
474453 - Tiny buffers (under 7 bytes) fail to compress in permessage-deflate
...
+ Ensure compress() is sanely using Deflater.deflate()
+ Ensure output buffer in .deflate() is always a minimum
of 256 bytes
2015-08-06 15:10:55 -07:00
3c99c9c9b9
Merge branch 'release-9.3.2'
2015-08-03 10:27:52 -07:00
bf81ac9d50
474068 - Update WebSocket Extension for permessage-deflate draft-22
...
+ Copying inflated byte buffers
+ Simplifying Accumulator of buffer/chunks
+ Removing references to frame compression extensions
2015-07-31 14:05:50 -07:00
a3684f7fb8
[maven-release-plugin] prepare for next development iteration
2015-07-30 09:47:57 -07:00
798fc8118b
[maven-release-plugin] prepare release jetty-9.2.13.v20150730
2015-07-30 09:47:48 -07:00
4b3879845d
[maven-release-plugin] prepare for next development iteration
2015-07-30 07:02:10 -07:00
6b7e9ac4b0
[maven-release-plugin] prepare release jetty-9.3.2.v20150730
2015-07-30 07:02:02 -07:00
607239028c
470727 - Thread Starvation of selector wakeups.
...
Changed the CallBack.NonBlocking to a default Callback.isNonBlocking, so that wrapping callbacks can determine if they are NonBlocking or not.
2015-07-22 17:31:54 +10:00
9b790c38ce
[maven-release-plugin] prepare for next development iteration
2015-07-14 11:42:34 -05:00
b35d32f2b8
[maven-release-plugin] prepare release jetty-9.3.1.v20150714
2015-07-14 11:42:28 -05:00
7204707902
[maven-release-plugin] prepare for next development iteration
2015-07-09 12:14:38 -05:00
3b1533673e
[maven-release-plugin] prepare release jetty-9.2.12.v20150709
2015-07-09 12:14:30 -05:00
60e45a940e
[maven-release-plugin] prepare for next development iteration
2015-06-15 15:34:11 -05:00
d3dec8d513
[maven-release-plugin] prepare release jetty-9.2.12.M0
2015-06-15 15:34:03 -05:00
cf6c4a914e
Updating version to 9.3.1-SNAPSHOT
2015-06-15 10:25:49 -07:00
1a9da9f9e4
Updating versions to 9.3.0.v20150612
2015-06-12 09:34:24 -07:00
496b4dfc83
[maven-release-plugin] prepare for next development iteration
2015-06-11 15:08:36 -07:00
f53c5d8fac
[maven-release-plugin] prepare release jetty-9.3.0.v20150611
2015-06-11 15:08:29 -07:00
bfe6c2638e
[maven-release-plugin] prepare for next development iteration
2015-05-29 09:06:42 -05:00
71e0f4d8ce
[maven-release-plugin] prepare release jetty-9.2.11.v20150529
2015-05-29 09:06:36 -05:00
a7087cbfbf
[maven-release-plugin] prepare for next development iteration
2015-05-28 10:06:51 -05:00
913c63e597
[maven-release-plugin] prepare release jetty-9.2.11.v20150528
2015-05-28 10:03:44 -05:00
Joakim Erdfelt
Greg Wilkins
Jesse McConnell
Joakim Erdfelt
Simone Bordet