Commit Graph

2212 Commits

Author SHA1 Message Date
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 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
Greg Wilkins 611e79945c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-11 18:10:50 +11: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
Joakim Erdfelt 25a1864de7 Issue #1229 - Adding testcase for WAR (expanded) with WEB-INF/lib/jetty-http.jar 2017-01-10 11:12:14 -04: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 0fc897233a Fixes #1216 to prevent duplicate SCI initialization of WSUF 2017-01-04 11:30:19 -04:00
Joakim Erdfelt 9324971d20 Issue #1216 improving init/destroy in WSUF 2017-01-04 10:42:51 -04:00
Joakim Erdfelt ecc3c57dd1 Issue #1214 - Ensure all response headers are present 2017-01-04 10:10:23 -04:00
Joakim Erdfelt cb7ef89619 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-27 14:07:29 -07:00
Joakim Erdfelt bf80d822c0 Issue #1202 - Adding testcase and fix for NPE in Sec-WebSocket-Extensions use 2016-12-27 14:06:33 -07:00
Joakim Erdfelt f3c4424722 Fixes #1197 - Copying headers into upgrade facade more consistently 2016-12-27 13:41:45 -07:00
Joakim Erdfelt bfc21f23e0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-27 13:33:41 -07:00
Joakim Erdfelt 03a283235c Issue #1197 - adding testcase for Authorization use in WSClient 2016-12-27 13:32:21 -07:00
Joakim Erdfelt 77c63a1648 Merge branch 'release-9.3.15' into jetty-9.3.x 2016-12-21 14:56:08 -07:00
Joakim Erdfelt 64f714689e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-20 15:38:36 -07:00
Joakim Erdfelt b9fd70f5ad Bumping up test timeouts 2016-12-20 14:31:56 -07: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
Joakim Erdfelt 1441a1495b Fixes #1138 - Adding jetty-client dependency to websocket.mod 2016-12-16 09:27:56 -07:00
Joakim Erdfelt 44596a7714 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-16 08:38:01 -07:00
Joakim Erdfelt c698c95e9b Issue #1114 - removing redundant exportConfiguration 2016-12-15 10:44:34 -07:00
Joakim Erdfelt 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
Joakim Erdfelt 05f397caa4 Issue #1114 - Adding initial stop/start test logic 2016-12-14 13:20:28 -07:00
Simone Bordet dd3a73e57a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-14 11:19:49 +01:00
Joakim Erdfelt 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
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 19333b8b3b Merge branch 'jetty-9.4.x' into release-9.4.0 2016-12-08 08:50:15 -06:00
Greg Wilkins 5186c1e6d0 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-12-08 18:35:40 +11:00
Ben Duffield c7e139a8a6 fix typo in PathParamServerEndpointConfig javadoc (#1145)
Signed-off-by: Ben Duffield <bduffield@palantir.com>
2016-12-08 18:08:06 +11:00
Jan Bartel fe493c2c06 Issue #1124
Fix classloading of WebSocketServerFactory for osgi.
2016-12-08 17:25:18 +11: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
Greg Wilkins 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
Jan Bartel 936fd09a18 Issue #1124
Fix classloading of WebSocketServerFactory for osgi.
2016-12-05 09:42:44 +11:00
Greg Wilkins d7aa079365 Issue #117 fixed javadoc errors 2016-12-02 15:33:30 +11:00
Greg Wilkins 4b82f54ad3 Issue #117 fixed javadoc errors 2016-12-02 14:34:37 +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
Joakim Erdfelt 47fd7e1bd2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-30 14:41:43 -07:00
Joakim Erdfelt 4b5e5566e8 Issue #117 - minor code review changes 2016-11-30 10:50:05 -07:00
Joakim Erdfelt 63d93160f1 Issue #1124 - post review cleanup of changes with @sbordet 2016-11-30 10:16:25 -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 f54938178e Merge branch 'jetty-9.2.x' into 'jetty-9.3.x' 2016-11-29 14:29:33 -07:00
Joakim Erdfelt e329e386f0 Issue #117 - Carrying over the work from features/wsclient-httpclient 2016-11-28 15:45:38 -07:00
Joakim Erdfelt c509a83d3b Issue #1124 - adding more web.xml test cases 2016-11-25 07:38:20 -07:00
Simone Bordet fb509eefe4 Resetting the field that marks the filter exported as a context attribute. 2016-11-25 15:10:32 +01:00
Joakim Erdfelt 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
Simone Bordet c5c0cc71d0 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-23 12:18:29 +01:00
Simone Bordet 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
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
Joakim Erdfelt d361786e43 Issue #1118 - Eliminating .destroy() conflict
+ extending from AbstractLifeCycle instead of ContainerLifeCycle
2016-11-22 09:48:01 -07: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 bfadca49b5 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-11-16 13:56:31 -07:00
Joakim Erdfelt 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
Joakim Erdfelt 2295bd59e3 Issue #1090 - Use WebSocketUpgradeFilter from WEB-INF/web.xml if present 2016-11-10 14:26:04 -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 996253c971 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-02 11:33:57 -07:00
Joakim Erdfelt 3a8cdc93d8 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-11-02 11:33:43 -07:00
Joakim Erdfelt 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
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
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 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 9a8ed0340c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-16 06:30:26 -07:00
Joakim Erdfelt 988e34489b Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-08-16 06:29:58 -07:00
Joakim Erdfelt 526d1415a4 Ignoring flappy test 2016-08-16 06:29:41 -07:00
Jesse McConnell 984dd7ed3c [maven-release-plugin] prepare for next development iteration 2016-08-15 23:04:15 +00:00
Jesse McConnell e38e6b5a7f [maven-release-plugin] prepare release jetty-9.4.0.M1 2016-08-15 23:04:10 +00:00
Joakim Erdfelt 3ea5c29ea6 Fixes #749 - Invalid WebSocket Upgrade should result in error 400, not 405 2016-08-01 10:06:22 -07:00
Joakim Erdfelt 28f557b0e1 Using maven-shade-plugin 2.4.3 now 2016-07-29 12:47:37 -07:00
Joakim Erdfelt 2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Jan Bartel e45e649761 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-28 15:06:12 +10:00
Joakim Erdfelt b3d25183b5 Fixes #780 - The moved websocket PathSpec is incompatible with cometd 3.0.x 2016-07-27 09:31:11 -07:00
Joakim Erdfelt 6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt 9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
Joakim Erdfelt 0b18340179 Updating to version 9.2.19-SNAPSHOT 2016-07-21 13:10:23 -07:00
Joakim Erdfelt d3ff3423f0 Updating to version 9.2.18.v20160721 2016-07-21 12:35:26 -07:00
Simone Bordet 823ba4add6 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 18:15:38 +02:00
Simone Bordet 6a15bbfb2b Issue #751 - Remove usages of ArrayQueue. 2016-07-21 17:55:48 +02:00
Simone Bordet ab45979a13 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-23 13:02:53 +02:00
Simone Bordet 9d9df416af Fixes #643 - NPE in passing websocket client test. 2016-06-23 13:00:04 +02:00
Jesse McConnell ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell 2b947e8f72 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 13:22:27 -05:00
Joakim Erdfelt 8157a4533c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-22 10:43:43 -07:00
Joakim Erdfelt b3635df543 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-06-22 10:43:27 -07:00
Joakim Erdfelt b2d6d06b48 Fixes #661 -JsrExtension is missing hashCode() and equals() 2016-06-22 10:42:31 -07:00
Jesse McConnell 030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell 9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell f2264c96a6 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 08:40:46 -05:00
Jesse McConnell e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell 16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Joakim Erdfelt 1418892d4f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-20 17:56:17 -07:00
Joakim Erdfelt 78c9010400 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-06-20 17:55:49 -07:00
Joakim Erdfelt 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
Greg Wilkins e607acfa4e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-15 18:06:32 +10:00
Greg Wilkins 0e5de87d49 Issue #663 Cleanup
Increased websocket tests timeouts
2016-06-15 18:04:33 +10:00
Simone Bordet 876f20006d Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-14 11:04:54 +02:00
Simone Bordet dc7bd636d0 Increased timeouts to avoid failures on slower machines. 2016-06-14 11:04:18 +02:00
Simone Bordet fb76491ea0 Code cleanups. 2016-06-14 11:04:01 +02:00
Simone Bordet 3dca610f7b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-13 23:39:23 +02:00
Simone Bordet 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
Simone Bordet df2af60710 Fixes #640 - ClientContainer should store WebSocket sessions as beans. 2016-06-13 23:23:14 +02:00
Simone Bordet 77de314ce1 Fixes #639 - ServerContainer stores WebSocket sessions twice.
ServerContainer now delegates session storage to WebSocketServerFactory.
2016-06-13 23:23:14 +02:00
Simone Bordet 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
Simone Bordet e578c79b41 Code cleanups. 2016-06-13 23:23:14 +02:00
Jesse McConnell 20c1301203 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 11:56:27 -05:00
Simone Bordet 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
Simone Bordet 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
Joakim Erdfelt dd8afc34b9 Merge branch 'jetty-9.3.x' into bugs/388 2016-06-06 08:37:36 -07:00
Joakim Erdfelt 8758cbb607 Fixes #388 - Provide pluggable RemoteEndpoint service 2016-06-06 07:44:46 -07:00
Greg Wilkins 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
Greg Wilkins 82921382a7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-01 16:52:56 +10:00
Greg Wilkins e9bb364eb2 Issue #609 ignore failing test 2016-06-01 16:16:39 +10:00
Jesse McConnell b4c958e68c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-31 20:38:31 -05:00
Simone Bordet 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
Simone Bordet 2e21234328 Code cleanups. 2016-05-31 18:23:51 +02:00
Greg Wilkins b53f2eca7f longer test await time 2016-05-20 13:28:17 +10:00
Jesse McConnell dc4574f380 [maven-release-plugin] prepare for next development iteration 2016-05-17 17:30:17 -05:00
Jesse McConnell 0bbebec1e0 [maven-release-plugin] prepare release jetty-9.3.9.v20160517 2016-05-17 17:30:13 -05:00
Jesse McConnell d5c6793e6a [maven-release-plugin] prepare for next development iteration 2016-05-17 15:33:46 -05:00
Jesse McConnell 0bab7e6616 [maven-release-plugin] prepare release jetty-9.2.17.v20160517 2016-05-17 15:33:42 -05:00
Greg Wilkins 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
Joakim Erdfelt 939505c342 Updating to version 9.2.17-SNAPSHOT 2016-04-14 14:03:21 -07:00
Joakim Erdfelt 778fac638d Updating to version 9.2.16.v20160414 2016-04-14 13:21:34 -07:00
Joakim Erdfelt 47bbd9364d Revert "Updating to version 9.2.16.v20160414"
This reverts commit 29ae63855b.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt 29ae63855b Updating to version 9.2.16.v20160414 2016-04-14 13:17:21 -07:00
Greg Wilkins 6163ee7293 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-14 16:32:51 +10:00
Joakim Erdfelt 5cd89d9efc Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-04-13 13:42:23 -07:00
Joakim Erdfelt f28c58044e Fix #437 - updates to NPE prevention 2016-04-13 13:40:14 -07:00
Joakim Erdfelt 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
Pavel Baranchikov 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
Joakim Erdfelt 6fb338e50d Updating to version 9.3.9-SNAPSHOT 2016-04-11 16:20:50 -07:00
Joakim Erdfelt bb4f3c4882 Updating to version 9.3.9.M1 2016-04-11 15:35:22 -07:00
Greg Wilkins e51a3b5d09 Issue #473 SessionTest.testBasicEcho_FromClient frequently failing 2016-04-01 14:08:33 +11:00
Greg Wilkins 3590abc534 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-30 20:05:59 +11:00
Greg Wilkins 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
Joakim Erdfelt 0fe1bbcd91 Merge branch 'jetty-9.3.x' 2016-03-25 13:25:22 -07:00
Joakim Erdfelt 80eefb5257 Improving WebSocketAdapter test reliability 2016-03-25 13:25:08 -07:00
Jan Bartel 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
Joakim Erdfelt 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
Pavel Baranchikov 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
Joakim Erdfelt 3624339ec6 Merge branch 'jetty-9.3.x' 2016-03-16 10:29:29 -07:00
Joakim Erdfelt 13fde643ed Merge branch 'release-9.3.8' into jetty-9.3.x 2016-03-16 10:03:29 -07:00
Greg Wilkins 1c5a1fc6a2 Issue #431
Suppress stack traces from unit tests
2016-03-16 18:19:40 +11:00
Joakim Erdfelt 132307e604 Merge branch 'jetty-9.3.x' 2016-03-15 11:50:31 -07:00
Joakim Erdfelt eb5d8b2f77 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-03-15 11:22:50 -07:00
Raman Gupta 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
Joakim Erdfelt 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
Joakim Erdfelt 464c46a757 Issue #427 - Squelch intentional exceptions seen during websocket testing 2016-03-15 09:20:34 -07:00
Joakim Erdfelt dcfa0b8910 Merge branch 'jetty-9.3.x' 2016-03-15 07:49:28 -07:00
Joakim Erdfelt 684c96a156 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-03-15 07:47:52 -07:00
Joakim Erdfelt 032e984674 Issue #424 - Jetty impl. of Websocket ServerEndpointConfig.Configurator lifecycle out of spec 2016-03-15 07:44:46 -07:00
Joakim Erdfelt c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt 1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Raman Gupta 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
Joakim Erdfelt e7081d7b84 Merge branch 'jetty-9.3.x' 2016-03-08 15:53:50 -07:00
Joakim Erdfelt db4b920ae4 Issue #407 - JSR356 Server WebSocket Sessions no longer being tracked 2016-03-08 15:15:21 -07:00
Joakim Erdfelt 98448262ea Making servlet context base resource discovery more robust 2016-03-08 15:14:54 -07:00
Simone Bordet d4cd34d2ba Merged branch 'jetty-9.3.x' into 'master'. 2016-03-07 17:01:20 +01:00
Simone Bordet 3b0f577aed Removed DEBUG logging during tests. 2016-03-07 16:40:34 +01:00
Joakim Erdfelt d6bbe9ab12 Issue #388 - Provide pluggable RemoteEndpoint service 2016-03-03 09:28:05 -07:00
Greg Wilkins 779317dc30 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-16 16:03:34 +01:00
Greg Wilkins 1585dc1c20 Issue #83 Ignored 2016-02-16 16:00:51 +01:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Simone Bordet cb79379b79 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-05 18:14:56 +01:00
Joakim Erdfelt 06fa8370fb removing debugging output 2016-02-04 11:25:18 -07:00
Joakim Erdfelt 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
Greg Wilkins df79ad689a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-04 07:00:13 +01:00
Joakim Erdfelt 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
Simone Bordet 56c0bc768c Merged branch 'jetty9.3.x' into 'master'. 2016-01-21 17:52:37 +01:00
Joakim Erdfelt e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Joakim Erdfelt 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
Joakim Erdfelt 9f8df9a1a8 485969 - WebSocket upgrade response should honor HttpConfiguration server version settings 2016-01-15 13:23:43 -07:00
Greg Wilkins c5cbc64e77 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-01-14 11:00:06 +11:00
Joakim Erdfelt b7f9c9aca9 Updating to version 9.3.7-SNAPSHOT 2016-01-13 08:21:01 -07:00
Joakim Erdfelt 21ca3f6690 Updating to version 9.3.7.RC1 2016-01-13 07:30:24 -07:00
Joakim Erdfelt 30308f2316 Javadoc updates 2016-01-13 07:25:15 -07:00