4b82f54ad3
Issue #117 fixed javadoc errors
2016-12-02 14:34:37 +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
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
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
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
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
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
9a8ed0340c
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-08-16 06:30:26 -07:00
988e34489b
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-08-16 06:29:58 -07:00
526d1415a4
Ignoring flappy test
2016-08-16 06:29:41 -07:00
984dd7ed3c
[maven-release-plugin] prepare for next development iteration
2016-08-15 23:04:15 +00:00
e38e6b5a7f
[maven-release-plugin] prepare release jetty-9.4.0.M1
2016-08-15 23:04:10 +00:00
3ea5c29ea6
Fixes #749 - Invalid WebSocket Upgrade should result in error 400, not 405
2016-08-01 10:06:22 -07:00
28f557b0e1
Using maven-shade-plugin 2.4.3 now
2016-07-29 12:47:37 -07:00
2830e51e04
Merge branch 'jetty-9.3.x' into release-9.3.11
2016-07-28 12:20:36 -07:00
e45e649761
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-28 15:06:12 +10:00
b3d25183b5
Fixes #780 - The moved websocket PathSpec is incompatible with cometd 3.0.x
2016-07-27 09:31:11 -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
2b947e8f72
Merge branch 'jetty-9.3.x' into release-9.3.10
2016-06-22 13:22:27 -05:00
8157a4533c
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-22 10:43:43 -07:00
b3635df543
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-06-22 10:43:27 -07:00
b2d6d06b48
Fixes #661 -JsrExtension is missing hashCode() and equals()
2016-06-22 10:42:31 -07: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
f2264c96a6
Merge branch 'jetty-9.3.x' into release-9.3.10
2016-06-22 08:40:46 -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
1418892d4f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-20 17:56:17 -07:00
78c9010400
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-06-20 17:55:49 -07:00
bcc57d161a
Fixes #425 - Removing duplicate Decoder affecting lifecycle
...
+ Duplicate Decoder was created and used in OnMessageCallable.
Now using DecoderFactory to obtain already instantiated
Decoder instead.
2016-06-20 17:47:29 -07: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
876f20006d
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-14 11:04:54 +02:00
dc7bd636d0
Increased timeouts to avoid failures on slower machines.
2016-06-14 11:04:18 +02:00
fb76491ea0
Code cleanups.
2016-06-14 11:04:01 +02: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
df2af60710
Fixes #640 - ClientContainer should store WebSocket sessions as beans.
2016-06-13 23:23:14 +02:00
77de314ce1
Fixes #639 - ServerContainer stores WebSocket sessions twice.
...
ServerContainer now delegates session storage to WebSocketServerFactory.
2016-06-13 23:23:14 +02:00
4f0741ac29
Temporarily commented out buggy clirr plugin.
...
Relevant issues:
+ mojohaus/clirr-maven-plugin#3 (fixed in 2.7)
+ mojohaus/clirr-maven-plugin#7
2016-06-13 23:23:14 +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
73fe6715de
Issue #306 - Merge jetty-parent into jetty-project.
...
Moved more plugin version declarations into jetty.project's pom.
2016-06-07 10:23:38 +02: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
82921382a7
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-01 16:52:56 +10:00
e9bb364eb2
Issue #609 ignore failing test
2016-06-01 16:16:39 +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
b53f2eca7f
longer test await time
2016-05-20 13:28:17 +10: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
f3b3741a58
Issue #533 Do not hide file resource exception
...
Throw IOException rather than MUE for file exception
2016-04-23 09:43:21 +10: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
6163ee7293
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-04-14 16:32:51 +10:00
5cd89d9efc
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-04-13 13:42:23 -07:00
f28c58044e
Fix #437 - updates to NPE prevention
2016-04-13 13:40:14 -07:00
76476b6d28
Issue #437 - Avoid NPE on receiving empty message though MessageHandler.Partial
...
Minor updates to use features elsewhere in Jetty.
2016-04-13 11:40:13 -07:00
3630f623d8
Fix #437 Avoid NPE on receiving empty message though MessageHandler.Partial
...
Signed-off-by: Pavel Baranchikov <p.a.baranchikov@gmail.com>
2016-04-13 11:39:56 -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
e51a3b5d09
Issue #473 SessionTest.testBasicEcho_FromClient frequently failing
2016-04-01 14:08:33 +11:00
3590abc534
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-03-30 20:05:59 +11:00
c768828703
Issue #458 Improve Quality list handling
...
Added QuotedCSV and QuotedQualityCSV that are up to date with RFC7230
2016-03-30 19:07:11 +11:00
0fe1bbcd91
Merge branch 'jetty-9.3.x'
2016-03-25 13:25:22 -07:00
80eefb5257
Improving WebSocketAdapter test reliability
2016-03-25 13:25:08 -07:00
4ca9e3b149
Merge remote-tracking branch 'origin/jetty-9.3.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionManager.java
tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/AttributeNormalizerTest.java
2016-03-24 11:38:44 +11:00
f2216ad108
Issue #437 - Avoid NPE on receiving empty message though MessageHandler.Partial
...
Minor updates to use features elsewhere in Jetty.
2016-03-22 12:51:04 -07:00
beccc5ee80
Fix #437 Avoid NPE on receiving empty message though MessageHandler.Partial
...
Signed-off-by: Pavel Baranchikov <p.a.baranchikov@gmail.com>
2016-03-22 16:33:38 +03:00
3624339ec6
Merge branch 'jetty-9.3.x'
2016-03-16 10:29:29 -07:00
13fde643ed
Merge branch 'release-9.3.8' into jetty-9.3.x
2016-03-16 10:03:29 -07:00
1c5a1fc6a2
Issue #431
...
Suppress stack traces from unit tests
2016-03-16 18:19:40 +11:00
132307e604
Merge branch 'jetty-9.3.x'
2016-03-15 11:50:31 -07:00
eb5d8b2f77
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-03-15 11:22:50 -07:00
f8626ecb3d
Issue #418 - Add osgi capability for endpoint configurator
...
Signed-off-by: Raman Gupta <rocketraman@gmail.com>
2016-03-15 11:22:34 -07:00
9d9a3668f2
Merge pull request #419 from rocketraman/javax-websocket-capability-fix
...
Issue #418 - Add osgi capability for endpoint configurator
2016-03-15 11:20:45 -07:00
464c46a757
Issue #427 - Squelch intentional exceptions seen during websocket testing
2016-03-15 09:20:34 -07:00
dcfa0b8910
Merge branch 'jetty-9.3.x'
2016-03-15 07:49:28 -07:00
684c96a156
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-03-15 07:47:52 -07:00
032e984674
Issue #424 - Jetty impl. of Websocket ServerEndpointConfig.Configurator lifecycle out of spec
2016-03-15 07:44:46 -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
ccb526d6bc
Issue #418 - Add osgi capability for endpoint configurator
...
Signed-off-by: Raman Gupta <rocketraman@gmail.com>
2016-03-10 10:52:02 -05:00
e7081d7b84
Merge branch 'jetty-9.3.x'
2016-03-08 15:53:50 -07:00
db4b920ae4
Issue #407 - JSR356 Server WebSocket Sessions no longer being tracked
2016-03-08 15:15:21 -07:00
98448262ea
Making servlet context base resource discovery more robust
2016-03-08 15:14:54 -07:00
d4cd34d2ba
Merged branch 'jetty-9.3.x' into 'master'.
2016-03-07 17:01:20 +01:00
3b0f577aed
Removed DEBUG logging during tests.
2016-03-07 16:40:34 +01:00
d6bbe9ab12
Issue #388 - Provide pluggable RemoteEndpoint service
2016-03-03 09:28:05 -07:00
779317dc30
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-02-16 16:03:34 +01:00
1585dc1c20
Issue #83 Ignored
2016-02-16 16:00:51 +01: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
Greg Wilkins
Joakim Erdfelt
Simone Bordet
Jesse McConnell
Joakim Erdfelt
Jan Bartel
Pavel Baranchikov
Raman Gupta