Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,028 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

2275 Commits

Author SHA1 Message Date
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 23753759bb Merged branch 'jetty-9.4.x' into 'master'. 2016-11-23 12:19:31 +01: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
Greg Wilkins bf3ea9ae44 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-18 11:19:40 +11:00
Joakim Erdfelt 1003969468 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-17 11:04:40 -07:00
Joakim Erdfelt 7930a3dac8 Fixing merge 9.2.x -> 9.3.x 2016-11-16 18:31:33 -07:00
Joakim Erdfelt 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 fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -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 2c7964d9c9 Issue #207 - fixing EchoTest 2016-10-21 13:53:31 -07:00
Joakim Erdfelt ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Christoph Dreis 82a6eff20c Precompile pattern for checking of classes in javax package in ReflectUtils 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
 2016-10-14 01:11:56 +02:00
Joakim Erdfelt 4202a98ec5 Issue #207 - @PathParam support fixes 
+ Arg.tag is now exposed for general use
+ JsrEndpointFunctions now decode (into primitives) the URI template
  exposed @PathParam static arguments
+ JsrEndpointFunctions simplified tracking of static args
+ ServerContainer.assertValidEndpoint() now validates
  added endpoints with @PathParam immediately (per spec)
  using a UriTemplate where each variable is an empty string
 2016-10-13 15:58:34 -07:00
Joakim Erdfelt a0b7bc4623 Issue #207 - prevent overlapping websocket streaming dispatch 
+ when FIN==true, wait for dispatch to return before processing
  more frames
 2016-10-13 14:42:08 -07:00
Joakim Erdfelt f920c65bcc Issue #207 - ensuring WebSocketServerFactory init occurs earlier 2016-10-13 14:41:53 -07:00
Joakim Erdfelt 681bddc728 Removing eclipse detrius 2016-10-13 14:40:29 -07:00
Joakim Erdfelt 8fce2727ca Issue #207 - improving errors for Encoders/Decoders 2016-10-13 14:39:52 -07:00
Joakim Erdfelt 3ee2e4ab7b Issue #207 - javax.websocket.DeploymentException thrown at addEndpoint now 2016-10-12 12:07:08 -07:00
Joakim Erdfelt 82942cb3a4 Merge branch 'jetty-9.4.x' into issue-207 2016-10-12 11:36:28 -07:00
Joakim Erdfelt 512e0ec076 Issue #207 - Using connection idle-timeout declared in annotation 2016-10-12 11:14:15 -07:00
Joakim Erdfelt 0e9841a3cc Issue #207 - correcting lifecycle of WebSocketSession and EndpointFunctions 2016-10-12 11:13:35 -07:00
Joakim Erdfelt 34f0007153 Fixing up testcase reporting 2016-10-12 11:11:58 -07:00
Jesse McConnell 863913b64e set for dev 2016-09-30 19:05:47 +00:00
Jesse McConnell b91cc8a4ea set for release 2016-09-30 18:01:20 +00:00
Simone Bordet 8dc18fe088 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-28 11:56:24 +02:00
Simone Bordet 7e376fd9da Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-28 11:53:54 +02:00
Simone Bordet 0f97c3df5d Fixes #966 - Remove usages of ConcurrentArrayQueue. 2016-09-28 11:40:39 +02:00
Simone Bordet efe339e246 Code cleanup. 2016-09-28 11:40:39 +02:00
Joakim Erdfelt 6cf10172ca Updating to version 9.3.13-SNAPSHOT 2016-09-15 07:34:52 -07:00
Joakim Erdfelt 8b35fdc5a5 Updating to version 9.3.12.v20160915 2016-09-15 06:48:16 -07:00
Joakim Erdfelt fb7da26ad2 Updating to version 9.2.20-SNAPSHOT 2016-09-08 13:04:11 -07:00
Joakim Erdfelt 7b94bc32f4 Updating to version 9.2.19.v20160908 2016-09-08 12:11:44 -07:00
Joakim Erdfelt 36f657165f Issue #207 - Support javax.websocket version 1.1 
+ More testcase improvements
 2016-08-25 11:03:42 -07:00
Joakim Erdfelt 1bb25adbdc Issue #207 - Support javax.websocket version 1.1 
+ Correcting tests
 2016-08-23 18:34:17 -07:00
Joakim Erdfelt 0a99c20a73 Issue #207 - Support javax.websocket version 1.1 
+ Cleaning up WebSocketPolicy usage
 2016-08-23 16:57:09 -07:00
Joakim Erdfelt 9c1ac5fedd Issue #207 - Support javax.websocket version 1.1 
+ Correcting jsr server PathParam static args sort issue
 2016-08-19 19:28:16 -07:00
Joakim Erdfelt 1cf61d6df7 Issue #207 - Support javax.websocket version 1.1 
+ Removing more EventDriver references
+ Fixing bad implementation exposed by testcases
 2016-08-19 17:59:07 -07:00
Joakim Erdfelt 1d341398da Fixing up javadoc 2016-08-19 15:45:43 -07:00
Joakim Erdfelt de7c7ca7af Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:21:33 -07:00
Joakim Erdfelt f1a8bafabe Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt fc9adbb391 Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 795246c785 Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 2175625537 Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 390c6924dd Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt a4f3ef3483 Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 39f2ba3b56 Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt e50cabf305 Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt b079fba842 Issue #207 - Support javax.websocket version 1.1 2016-08-19 15:03:32 -07:00
Joakim Erdfelt b71be7c808 Trailing merge fixes 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 57bbf67735 Issue #207 - Support javax.websocket version 1.1 
WIP
 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 3198d12127 Issue #207 - Support javax.websocket version 1.1 
WIP
 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 8784a1f850 Issue #207 - Support javax.websocket version 1.1 
WIP
 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 31328b8f66 Issue #207 - Support javax.websocket version 1.1 
WIP
 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 89f45830bc Issue #207 - Support javax.websocket version 1.1 
WIP
 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 5f6cf96fa5 Issue #207 - Support javax.websocket version 1.1 
WIP
 2016-08-19 15:03:32 -07:00
Joakim Erdfelt f23d921ae3 Issue #207 - Support javax.websocket version 1.1 
WIP
 2016-08-19 15:03:32 -07:00
Joakim Erdfelt d60d6363b4 467246 - Support javax.websocket version 1.1 
WIP
 2016-08-19 15:03:32 -07:00
Joakim Erdfelt 39f1d7332c 467246 - Support javax.websocket version 1.1 
+ WIP
 2016-08-19 15:03:32 -07:00
Joakim Erdfelt b966ebc6bc Merge branch 'jetty-9.4.x' 2016-08-16 06:30:46 -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 9b6af31dce merge from 9.4.x after M1 release 2016-08-16 08:18:27 -05: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
Greg Wilkins 764307b9a7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-02 13:59:01 +10: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 525fabd9aa Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-28 15:12:36 +10: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 8f5985e0e1 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-21 18:16:01 +02: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 237502932a Merged branch 'jetty-9.4.x' into 'master'. 2016-06-23 13:04:06 +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 0a196e2123 Merge branch 'jetty-9.4.x' 2016-06-22 10:43:58 -07: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 45a0c0f38d Merge branch 'jetty-9.4.x' 2016-06-20 17:56:30 -07: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 8dd61c6d1c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-15 18:07:01 +10: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 93b6dddae1 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-14 11:05:33 +02: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 e6210e1a43 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-13 23:39:47 +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 e79c4d582b Merge branch 'jetty-9.4.x' 2016-06-07 11:57:39 -05: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 473c8f0c09 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-07 10:24:15 +02: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 2d1d3fe6e9 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-06 21:39:31 +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 502f27f43e Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-03 16:22:17 +10: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 a6f35be4d6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-01 16:53:28 +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 b1ccba2285 Merged branch 'jetty-9.3.x' into 'master'. 2016-05-31 18:32:42 +02: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 e5a05bca0a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-20 15:18:26 +10: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 a5ad291add Squashed commit of the following: (#528) 
commit 4bf6b7c951
Merge: a50e882 301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 27 12:12:08 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 23 09:38:00 2016 +1000

    work in progress

commit 4e286266c0
Merge: 5ae7da0 f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 16:34:12 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 12:12:24 2016 +1000

    Work in progress on Features

commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 22:05:55 2016 +1000

    Refactor Configurations.isEnabledByDefault, enable all configurations by default.

commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 17:32:22 2016 +1000

    Fix features for jsp with osgi

commit 22d2b251e9
Merge: 571d503 2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 14 16:19:43 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 13 15:36:36 2016 +1000

    code comment

commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 9 21:24:22 2016 +1000

    fixed quickstart validation

commit 154d58bf62
Merge: 8e54aad ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:25:17 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:21:30 2016 +1000

    general cleanup of Configuration and ClasspathPattern usage

commit 65f8e5dbd0
Merge: ea1deda 2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 09:15:28 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit ea1deda4f9
Merge: cfe9c83 f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 18:21:56 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 17:57:23 2016 +1100

    work in progress

commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 10:11:49 2016 +1100

    work in progress

commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 14:01:00 2016 +1100

    progress on OSGi

commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:52:33 2016 +1100

    Fixed plugin

commit f08b84ba0e
Merge: f19bd2c 8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:55 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:06 2016 +1100

    work in progress... all but OSGi

commit 2f15c3e4f9
Merge: 36b5687 7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 16:52:43 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 36b5687329
Merge: 13d914a e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 07:20:05 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 04:41:30 2016 +1100

    Work in progress on Features

    Moved jar discovery to META-INF

commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 17:48:15 2016 +0100

    Work in progress towards new quickstart arch

commit c5c23698c4
Merge: fd34007 692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:29:18 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:04:35 2016 +0100

    Work in progress on Features for QuickStart

commit c5f0c80cd2
Merge: 0e6d886 b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 4 16:05:23 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 0e6d886b01
Merge: d150405 2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 17:32:36 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit d1504055de
Merge: 22a6cd0 3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 15:21:20 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 20:53:17 2016 +0100

    Features work in progress

    convert more server/system classes to Configurations

commit 037e04bfe5
Merge: add9876 bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 17:11:04 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit add9876f83
Merge: 5263f15 eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Feb 25 10:11:08 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5263f15acd
Merge: 89803ae 21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 23 14:35:31 2016 +0100

    Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature

commit 89803aec95
Merge: 5fed7c7 779317d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 16:09:38 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 11:21:13 2016 +0100

    fixed merge

commit ec22a1ba0b
Merge: 4c8257d d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 10:53:16 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 17 09:34:28 2015 +1100

    Do not default quickstart

commit 57ce87770a
Merge: 14bde1f 96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 16 17:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 16:26:58 2015 +1100

    work in progress on Configurations as services

commit 46ce2aef3a
Merge: 9e82fa0 ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 10:11:09 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 08:52:37 2015 +1100

    work in progress to Configurations as ServiceLoader

commit 6e11f22de4
Merge: 120e330 5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 18:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 120e33034f
Merge: 6c5b95d 384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 14:20:52 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 6c5b95d6b8
Merge: 722eb60 5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 2 11:16:37 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 13:58:16 2015 +1100

    Configurations can add server/system classes

commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 11:47:03 2015 +1100

    Self ordering WebApp Configurations

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2016-05-02 17:55:54 +10:00
Joakim Erdfelt c09f31a51d Bumping up master to version 10.0.0-SNAPSHOT 2016-04-29 11:47:15 -07: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
Joakim Erdfelt 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
Joakim Erdfelt 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
Jan Bartel a8193c0eb8 485063 After stopping JettyWebAppContext, it still contains reference to old WebAppClassLoader via ServerContainer bean 2016-01-07 11:12:11 +11:00
Jan Bartel a934db118d 485063 After stopping JettyWebAppContext, it still contains reference to old WebAppClassLoader via ServerContainer bean 2016-01-07 11:11:10 +11:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Joakim Erdfelt e0ea078db2 Merge branch 'jetty-9.3.x' 2015-12-17 16:16:04 -07:00
Joakim Erdfelt 88945478f7 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2015-12-17 16:15:49 -07:00
Joakim Erdfelt 1543601968 484612 - Restore WebSocket Session.close() sending 1000/Normal status code 2015-12-17 16:15:06 -07:00
Joakim Erdfelt 60d09bc958 Merge branch 'jetty-9.3.x' 2015-12-17 15:32:59 -07:00
Joakim Erdfelt 9908910c3b Merge branch 'jetty-9.2.x' into jetty-9.3.x 2015-12-17 15:32:43 -07:00
Joakim Erdfelt 5f27a62aae 484397 - Unavoidable NullPointerException in onMessage-Handler for PongMessages 2015-12-17 15:31:50 -07:00
Joakim Erdfelt 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
Joakim Erdfelt 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
Greg Wilkins 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
Simone Bordet 9aa6dc1e7d Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 13:02:55 +01:00
Simone Bordet 9c673e542d Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 13:02:20 +01:00
Simone Bordet e6f23a692e 482270 - Expose upgrade request locales. 
Exposed as a user property.
 2015-12-08 12:04:22 +01:00
Joakim Erdfelt 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
Joakim Erdfelt 97722aeea8 Merge branch 'jetty-9.3.x' 2015-12-02 12:20:06 -07:00
Joakim Erdfelt bae1138211 Fixing test expectations on Decorator counts 2015-12-02 12:19:52 -07:00
Greg Wilkins 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
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Greg Wilkins 7843b7348e 480827 Implemented Unix Domain Socket Connector 
Squashed commit of the following:

commit fbb680ba7cdb73495524ea9e5b0f49caee7f68d8
Merge: ed2550b 64ea0db
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 6 10:44:00 2015 +1100

    Merge branch 'master' into unix-socket

commit ed2550b50f978e1984e19fbda642baf450dbe6a1
Merge: 88d7b35 de137ab
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 18:41:25 2015 +1100

    Merge branch 'master' into unix-socket

commit 88d7b35f885de2da7dec836e6e4ae2b522d517f0
Merge: 7d4155f 3e2658a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 17:38:27 2015 +1100

    Merge branch 'master' into unix-socket

commit 7d4155fe4a407d493683b66709bc638879b0b422
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 17:24:48 2015 +1100

    Unix socket configuration

commit 2737b19f73ad153c20e1762874558a5d62849f90
Merge: cd0cc2e 92cc44c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Nov 4 15:13:40 2015 +1100

    Merge branch 'master' into unix-socket

    Conflicts:
    	jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java

commit cd0cc2ef36a558d948bf26aff4f9e3519da2f823
Merge: 639753b 303f98e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 2 12:21:19 2015 +1100

    Merge branch 'master' into unix-socket

commit 639753b5ed37778d7231acfe9d52039aed66351e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 15:42:58 2015 +1100

    local connectors report NOIP address

commit 6d38c4195f145b99f775a06d546960b119094b0c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 12:11:13 2015 +1100

    Gentler ssl close test

commit 40b46b66a738c9187f859d522a0165bb09b113c8
Merge: b7eb082 fa53b11
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 11:09:42 2015 +1100

    Merge branch 'master' into unix-socket

commit b7eb082be44864c058b6f01b10364013596d3650
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 08:34:30 2015 +1100

    SecureRequestCustomizer for UnixSockets

commit edbb3c080200b4c6aa2836eff6c81bf31a73a8c1
Merge: 90e8cc0 de7ac72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 19:47:05 2015 +1100

    Merge branch 'master' into unix-socket

commit 90e8cc060ff6dc4b249818db38334ffa543f002f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 19:31:50 2015 +1100

    use proxy connection

commit b1772ef5dcac9ddf9bb5ecda1cda6d038ca21755
Merge: e95a932 9fe7332
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 16:46:29 2015 +1100

    Merge branch 'master' into unix-socket

commit e95a932bda5a96bf98ada4fb47664790af2aa0a2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Oct 28 15:58:25 2015 +1100

    fixed config

commit f8963b2ed6b6b4b96f1d9403194c9d50ab1f12fd
Merge: 9c56b53 8b27484
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Oct 28 15:34:28 2015 +1100

    Merge branch 'master' into unix-socket

commit 9c56b53cbec20d98e5cb05cf8d1f668fe84b95e0
Merge: 298a311 39768f8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Oct 26 13:04:34 2015 +1100

    Merge branch 'master' into unix-socket

commit 298a311af952ad3ef5d1c7635deabf47bddaa1c6
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 15:24:19 2015 +1100

    Async accepting

commit 8266753d124c04ec8bca8aa02be1ef3d826d6769
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 14:45:35 2015 +1100

    set acceptors

commit 6a56c5b9e19063fcb95cdc1228adf723c0d41362
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 11:44:54 2015 +1100

    licence

commit d80e5748e6c4327bae57de2af01983990dd2afe0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 11:24:14 2015 +1100

    unixsocket work in progress adding modules

commit cf0c1153d9966cc7182ba29411527b4341c34da6
Merge: 645b671 c39bfa2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 08:52:01 2015 +1100

    Merge branch 'master' into unix-socket

commit 645b6712d37282c26011a95c8c98e45c249b2e5f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 08:49:52 2015 +1100

    IP headers

commit 67b210b9ea81af68ce3848a114bbbd1b80a8ca52
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 23:48:57 2015 +1100

    working with haproxy

commit e4fce9cf5d896a9a29a7c6280fcaa0336dfcc0f2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 18:25:09 2015 +1100

    unixsocket working

commit 6f013788cad44e6641cd89720c5e7f3652cdc257
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 15:39:55 2015 +1100

    work in progress
 2015-11-06 11:17:46 +11:00
Joakim Erdfelt 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
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Joakim Erdfelt 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
Joakim Erdfelt b4456d96dd Disabling flappy test 2015-10-09 10:14:35 -07:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Joakim Erdfelt 9cf0e34a1d Updating to version 9.4.0-SNAPSHOT 2015-10-07 15:41:32 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00