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
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
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
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
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
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
9f8df9a1a8
485969 - WebSocket upgrade response should honor HttpConfiguration server version settings
2016-01-15 13:23:43 -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
a8193c0eb8
485063 After stopping JettyWebAppContext, it still contains reference to old WebAppClassLoader via ServerContainer bean
2016-01-07 11:12:11 +11:00
a934db118d
485063 After stopping JettyWebAppContext, it still contains reference to old WebAppClassLoader via ServerContainer bean
2016-01-07 11:11:10 +11: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
60d09bc958
Merge branch 'jetty-9.3.x'
2015-12-17 15:32:59 -07:00
9908910c3b
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2015-12-17 15:32:43 -07:00
5f27a62aae
484397 - Unavoidable NullPointerException in onMessage-Handler for PongMessages
2015-12-17 15:31:50 -07:00
31cd3fee84
Merge branch 'jetty-9.3.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
2015-12-17 12:51:57 -07:00
3bec195d08
484440 - Swap WebSocket PathMappings for new jetty-http PathMappings
...
+ Deprecated jetty-server ServletPathSpec and RegexPathSpec
+ Moved all other code to using new jetty-http versions
2015-12-17 11:42:27 -07:00
3527c6a71b
StringUtil.csvSplit(String)
...
Conflicts:
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
2015-12-08 14:54:33 -07:00
9aa6dc1e7d
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-08 13:02:55 +01:00
9c673e542d
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2015-12-08 13:02:20 +01:00
e6f23a692e
482270 - Expose upgrade request locales.
...
Exposed as a user property.
2015-12-08 12:04:22 +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
97722aeea8
Merge branch 'jetty-9.3.x'
2015-12-02 12:20:06 -07:00
bae1138211
Fixing test expectations on Decorator counts
2015-12-02 12:19:52 -07:00
a311c8bde1
480904 - jetty-util Loader simplification
...
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader. Multiple loaders will never be tried.
A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).
The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
2015-11-19 12:14:05 +11:00
ff0d1b4c14
481903 Module Descriptions
2015-11-12 10:48:04 +11: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
7843b7348e
480827 Implemented Unix Domain Socket Connector
...
Squashed commit of the following:
commit fbb680ba7cdb73495524ea9e5b0f49caee7f68d8
Merge: ed2550b 64ea0dbde137ab3e2658a92cc44c303f98efa53b11de7ac729fe73328b2748439768f8c39bfa2
2015-11-06 11:17:46 +11:00
4dfd68b315
Merge branch 'jetty-9.3.x'
...
Conflicts:
aggregates/jetty-all-compact3/pom.xml
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/cdi-core/pom.xml
jetty-cdi/cdi-full-servlet/pom.xml
jetty-cdi/cdi-servlet/pom.xml
jetty-cdi/cdi-websocket/pom.xml
jetty-cdi/pom.xml
jetty-cdi/test-cdi-webapp/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http2/http2-alpn-tests/pom.xml
jetty-http2/http2-client/pom.xml
jetty-http2/http2-common/pom.xml
jetty-http2/http2-hpack/pom.xml
jetty-http2/http2-http-client-transport/pom.xml
jetty-http2/http2-server/pom.xml
jetty-http2/pom.xml
jetty-infinispan/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-http-client-transport/pom.xml
tests/test-integration/pom.xml
tests/test-jmx/jmx-webapp-it/pom.xml
tests/test-jmx/jmx-webapp/pom.xml
tests/test-jmx/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-infinispan-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2015-10-13 08:53:35 -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
e6ffa35b2c
479584 - WS Session does not contain UpgradeRequest information in WebSocketAdapter.onWebSocketConnect callback
...
+ Adding missing testcase
+ Adding missing request information
2015-10-12 11:19:50 -07:00
b4456d96dd
Disabling flappy test
2015-10-09 10:14:35 -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
3901fcbb60
474936 - WebSocketSessions are not always cleaned out from openSessions
...
+ Adding additional testcase to verify behavior
2015-09-22 14:54:18 -07:00
03a601f2b2
477385 Make jetty osgi manifests only resolve jetty packages against a single distro version
2015-09-16 19:13:47 +10:00
f2cf574035
Removing JsrBasicRemote.sendText() info message
2015-09-09 16:01:57 -07:00
20ffd0dd0b
Merge branch 'release-9.3.3'
2015-08-31 13:41:21 -05:00
6fad345161
475209 - WebSocketServerFactory should not hand null object to DecoratedObjectFactory
2015-08-27 15:36:57 -07: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
be35fd72cd
ignore
2015-08-27 09:40:45 -05:00
3a975426bf
@Ignore for release
2015-08-27 09:17:45 -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
5c0906ed6c
474454 - Backport permessage-deflate from Jetty 9.3.x to 9.2.x
...
+ post cherry-pick merge cleanup
2015-08-06 15:55:24 -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
47d81db015
474455 - Enable permessage-deflate WebSocket extension
2015-08-06 15:10:55 -07:00
5324d367c5
Merged branch 'jetty-9.2.x' into 'master'.
2015-08-06 17:33:30 +02:00
020cbe1172
Removed redundant logging statement.
2015-08-06 17:31:23 +02: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
Jesse McConnell
Greg Wilkins
Ben Duffield
Jan Bartel
Joakim Erdfelt
Simone Bordet
Joakim Erdfelt
Pavel Baranchikov
Raman Gupta