Jesse McConnell
856a24b65a
[maven-release-plugin] prepare for next development iteration
2013-09-30 14:46:09 -05:00
Jesse McConnell
f466f03c6a
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
2013-09-30 14:46:00 -05:00
Jesse McConnell
0b3f431d27
set version back to 9.0.6-SNAPSHOT
2013-09-30 12:33:06 -05:00
Jesse McConnell
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
Jesse McConnell
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
Joakim Erdfelt
7f85842666
417134 - WebSocket / Jsr ServerEndpointConfig.Configurator.getNegotiatedExtensions() is never used
...
+ Extensions pre-negotiated via
ServerEndpointConfig.Configurator.getNegotiatedExtensions are not
properly handled.
+ Added JsrBrowserDebugTool (Jsr version of BrowserDebugTool)
2013-09-12 15:25:02 -07:00
Joakim Erdfelt
5445c42ffe
417133 - WebSocket / deflate-frame should accumulate decompress byte buffers properly
...
+ Adding ByteAccumulator to make job easier and more sane (with a
minimum of byte buffer copying.
2013-09-12 13:59:15 -07:00
Joakim Erdfelt
4b3541b7d1
WebSocket / making sure that filter always sees the correct target path, regardless of servlets
2013-09-11 08:56:19 -07:00
Joakim Erdfelt
dc59080fca
WebSocket / Fixing pathmap matching when query parameters are provided
2013-09-11 07:24:25 -07:00
Joakim Erdfelt
be2385276f
WebSocket / Fixing support for permessage-deflate extension
2013-08-28 11:49:54 -07:00
Joakim Erdfelt
20fbd95bf1
395444 - Websockets not working with Chrome (deflate problem)
...
+ Hopefully final fix to deflate-frame
+ Splitting out extension named 'deflate-frame' (last spec'd standard) from
'x-webkit-deflate-frame' (standard in use by chrome + safari)
2013-08-27 14:20:07 -07:00
Greg Wilkins
e4235ea070
415744 - Reduce Future usage in websocket
2013-08-23 19:58:46 +10:00
Joakim Erdfelt
4d9cb44536
WebSocket - Calling setPayload() outside of ContinuationFrame
2013-08-20 16:51:11 -07:00
Joakim Erdfelt
e56fddfc4a
WebSocket - Calling setPayload() outside of TextFrame and BinaryFrame
2013-08-20 16:45:26 -07:00
Joakim Erdfelt
a089780701
WebSocket - Calling setPayload() outside of PingFrame and PongFrame
2013-08-20 16:39:26 -07:00
Joakim Erdfelt
975d9870d2
WebSocket - more code cleanup
2013-08-20 16:28:51 -07:00
Joakim Erdfelt
c548cba71c
WebSocket - fixing windowed parse issue with masked frames
2013-08-20 12:56:32 -07:00
Joakim Erdfelt
34f03cb0e8
WebSocket / releasing (header) buffer acquired during generation
2013-08-20 09:57:57 -07:00
Joakim Erdfelt
3dbcc04b73
Breaking apart WebSocketFrame into sub-frame types
...
+ Performance improvements?
+ Less copying of data
2013-08-19 15:26:07 -07:00
Joakim Erdfelt
4016ba571c
JSR-356 working javax.websocket demo in the distribution.
2013-08-15 12:20:06 -07:00
Jan Bartel
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
Jan Bartel
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
Jan Bartel
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
Jan Bartel
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
Jan Bartel
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
Joakim Erdfelt
e39b48c90d
Fixing up javadoc issues in WebSocket classes
2013-08-14 10:54:07 -07:00
Jesse McConnell
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
Joakim Erdfelt
980effaede
WebSocket - reducing memory footprint of WebSocketFrame by not using boolean fields
2013-08-13 12:09:43 -07:00
Joakim Erdfelt
1e39b7d476
WebSocket / Performance - cleaning up tests from fallout on bug 414913
...
+ Copying payload in test cases for comparison reasons, as the reuse of
payloads by the implementation now means that the payload might be
masked by a random client side mask.
+ Cleaning up Abnormal Close handling for idle timeout cases
+ Fixing logging a tag
+ Fixing intermittent test failure in jsr EchoTest
2013-08-12 16:29:25 -07:00
Joakim Erdfelt
46b3dc10c8
414913 - WebSocket / Performance - reduce ByteBuffer allocation/copying during generation/writing
...
+ Splitting Header bytes from payload bytes.
+ returning List<ByteBuffer> from WriteBytesProvider now
+ returning possibly more than 1 frame per
WriteBytesProvider.getByteBuffers() for submission to
Endpoint.write()'s gathered write of multiple bytebuffers
2013-08-12 16:29:25 -07:00
Joakim Erdfelt
dfd3d5af29
WebSocket - refactoring bits and pieces to make testing easier.
2013-08-02 09:33:15 -07:00
Simone Bordet
ed95ffbfea
Fixed lifecycle management.
2013-08-02 15:05:50 +02:00
Joakim Erdfelt
07041f6439
JSR-356 making HTTP Header map use TreeMap(String.CASE_INSENSITIVE_ORDER)
2013-08-01 10:50:01 -07:00
Joakim Erdfelt
441c98544a
JSR-356 if mapping not found, allow default behavior
2013-08-01 07:47:02 -07:00
Joakim Erdfelt
e2f02a7a8a
JSR-356 fixing ServerContainer.setDefault*() method behavior
2013-07-31 14:25:54 -07:00
Joakim Erdfelt
0444b87961
414167 - WebSocket handshake upgrade from FireFox fails due to keep-alive
...
+ Making .isUpgradeRequest() multi-value aware, per spec
2013-07-31 13:00:16 -07:00
Joakim Erdfelt
0fd0ecc887
JSR-356 - making ClientContainer a use jetty LifeCycle properly
2013-07-31 10:34:31 -07:00
Joakim Erdfelt
8a2ccdf8ae
JSR-356 - fixing Session.setMax(Text|Binary)MessageBufferSize
2013-07-31 09:52:51 -07:00
Joakim Erdfelt
9ebf890d51
WebSocket - supporting WriteCallback in jetty RemoteEndpoint
...
+ new RemoteEndpoint.sendBytes(ByteBuffer, WriteCallback)
+ new RemoteEndpoint.sendString(String, WriteCallback)
2013-07-30 15:25:41 -07:00
Joakim Erdfelt
28b3ee8b13
WebSocket - breaking out unfinished MUX extension into its own module
2013-07-30 15:09:40 -07:00
Joakim Erdfelt
6fc7e23dc0
Testing for non-null
2013-07-30 14:41:28 -07:00
Joakim Erdfelt
b363400c84
JSR-356 - making SessionFactory additive to allow multiple impls at the same time.
2013-07-29 09:30:42 -07:00
Joakim Erdfelt
b549410932
JSR-356 - Making WebSocketUpgradeFilter an attribute in the ServletContext
2013-07-25 09:43:47 -07:00
Joakim Erdfelt
d7d4e415ea
JSR-356 - making use of ServiceLoader technique for finding Extensions
2013-07-24 14:46:59 -07:00
Joakim Erdfelt
e69b41e9cd
JSR-356 Adding suppport for @PathParam
2013-07-16 16:56:03 -07:00
Greg Wilkins
987aa846cc
398467 Servlet 3.1 Non Blocking IO
...
ensure that EOF is checked after all calls to nextContent
2013-07-15 14:28:22 +10:00
Greg Wilkins
981102fda5
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
Greg Wilkins
e4716e05e1
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
aggregates/jetty-all/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-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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-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/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-plus/pom.xml
jetty-proxy/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-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/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/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-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-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
2013-06-27 09:12:28 +10:00
Joakim Erdfelt
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
Joakim Erdfelt
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
Joakim Erdfelt
1a190a176e
Making testcase more consistent
2013-06-25 07:38:26 -07:00
Jesse McConnell
8927c18840
reset versions for release
2013-06-21 15:28:26 -05:00
Jesse McConnell
018a51a04e
Merge branch 'master' into release-9
2013-06-21 15:18:46 -05:00
Joakim Erdfelt
ebe98022ab
Making autobahn server disconnect happy
2013-06-21 12:46:10 -07:00
Joakim Erdfelt
73fd838b41
Addressing WebSocket server side disconnect issue that autobahn found
2013-06-21 12:10:06 -07:00
Jesse McConnell
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
Jesse McConnell
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
Joakim Erdfelt
f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -07:00
Joakim Erdfelt
931cfa10ce
Merge branch 'master' into javawebsocket-jsr
...
Conflicts:
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
2013-06-18 12:41:20 -07:00
Joakim Erdfelt
43867ff075
Reworking SSL tests
2013-06-18 08:37:16 -07:00
Joakim Erdfelt
a6ef027232
Finish reverting change to ServletUpgradeRequest from websocket-ssl branch that was missed
2013-06-18 07:05:35 -07:00
Joakim Erdfelt
be2cf578ce
400503 - WebSocket - squelch legitimate Exceptions during testing to avoid false positives
2013-06-17 16:34:21 -07:00
Joakim Erdfelt
2da8c9c306
Merge branch 'master' into javawebsocket-jsr
...
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
2013-06-17 10:54:10 -07:00
Greg Wilkins
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
Joakim Erdfelt
5c7f6937fd
Giving a different test more time to complete on busy machines
2013-06-14 14:12:04 -07:00
Joakim Erdfelt
64a6d6f0bb
Giving test more time to complete on busy machines
2013-06-14 13:45:24 -07:00
Joakim Erdfelt
ce68faf9aa
Reverting incompatible API change to WebSocketCreator.
...
+ Added javadoc about casting of parameters and note about
future change to API (possibly in 9.1)
2013-06-14 11:39:14 -07:00
Joakim Erdfelt
83bd15559b
Merge branch 'master' into websocket-ssl
...
Conflicts:
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
2013-06-13 16:05:26 -07:00
Joakim Erdfelt
a535381b53
410537 - Exceptions during @OnWebSocketConnect not reported to @OnWebSocketError
...
+ Fixed EventDriver behavior with regards to unhandled throwables during
calls to the various onMethod() calls
+ Adding testcase to verify intended behavior
2013-06-12 11:05:01 -07:00
Joakim Erdfelt
7b79b4c5f9
410370 - WebSocketCreator.createWebSocket() should use servlet specific parameters
...
+ Changing method signature of
Object createWebSocket(UpgradeRequest req, UpgradeResponse resp)
to
Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp)
2013-06-11 11:22:24 -07:00
Joakim Erdfelt
ae9a776d06
410386 - WebSocket Session.getUpgradeRequest().getRequestURI() returns bad URI on server side
...
+ Prior commit fixed this
+ Adding test to prevent regression in the future
2013-06-10 14:20:14 -07:00
Joakim Erdfelt
e61c161ebd
410175 - WebSocketSession#isSecure() doesn't return true for SSL session on the server side
...
+ Fixing server side support for Session.isSecure()
+ Standardizing the WSURI translation into new
org.eclipse.jetty.websocket.api.util.WSURI class
+ Adding testcase for SSL on server side
2013-06-10 13:48:18 -07:00
Greg Wilkins
d2794584e1
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
Joakim Erdfelt
b01e6432a5
Merge branch 'master' into javawebsocket-jsr
2013-06-05 10:20:50 -07:00
Joakim Erdfelt
82b5acb0cf
409978 - Websocket shouldn't create HttpSession if not present
...
+ Preventing creation of HttpSession
+ Adding Local/Remote address information lookup in
ServletWebSocketRequest
2013-06-05 09:22:23 -07:00
Greg Wilkins
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
Joakim Erdfelt
598ecd7d7f
Merge branch 'master' into javawebsocket-jsr
2013-05-22 09:25:06 -07:00
Joakim Erdfelt
dd3a918136
408118 - NullPointerException when parsing request cookies
...
+ Added NPE guard for non-Jetty containers.
2013-05-21 11:34:56 -07:00
Joakim Erdfelt
f403a1e185
407386 - Cookies not copied in ServletWebSocketRequest
...
+ Adding missing to super.setCookies()
+ Adding test case to prevent regression
2013-05-21 11:34:56 -07:00
Greg Wilkins
5397f16559
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-17 14:09:17 +10:00
Greg Wilkins
b22d280e2a
398467 Servlet 3.1 Non Blocking IO
...
Cleaned up exceptions and HttpOutput.write
2013-05-16 19:00:00 +10:00
Greg Wilkins
4dd80e9128
398467 Servlet 3.1 Non Blocking IO
...
More refinements to avoid duplicate code and optimise common paths
2013-05-14 17:52:46 +10:00
Joakim Erdfelt
6d73ab86dd
Using released version of test-helper
2013-05-10 14:35:14 -07:00
Joakim Erdfelt
ce0435e099
Cleaning up test output
2013-05-09 14:29:59 -07:00
Joakim Erdfelt
9f82849900
Merge from [master] to [javawebsocket-jsr]
2013-05-09 12:10:57 -07:00
Jesse McConnell
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
Jesse McConnell
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
Jan Bartel
e7ecfd2b2b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
Joakim Erdfelt
9ad5ab1ed5
406449 - Session's disconnect not detected
...
+ Vastly cleaned up IOState and ConnectionState behavior
2013-04-30 15:54:41 -07:00
Joakim Erdfelt
ef77b854fa
404911 - WebSocketCloseTest fails spuriously
...
+ Renabling test
+ Using EventQueue from jetty-test-helper instead
+ Standarizing HttpResponseHeaderParser into websocket-common so that
remaining bytebuffer logic is maintained in one place.
+ Making BlockingClient also use HttpResponseHeaderParser
2013-04-26 15:37:46 -07:00
Joakim Erdfelt
c91c3f2f60
JSR-356: adding WebSocketConfiguration and reworking ServerContainer init
2013-04-24 14:33:46 -07:00
Joakim Erdfelt
a4644dc780
JSR-356 working out server endpoint creation
2013-04-23 11:06:01 -07:00
Joakim Erdfelt
9463eee427
Merge branch 'master' into javawebsocket-jsr
2013-04-19 09:25:03 -07:00
Greg Wilkins
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
Jan Bartel
d34bd7aec7
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-18 12:16:24 +10:00
Jesse McConnell
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
Jesse McConnell
e390b54b25
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
2013-04-17 11:46:31 -05:00
Joakim Erdfelt
8088edc96c
Merge branch 'master' into javawebsocket-jsr
2013-04-15 12:12:25 -07:00
Jesse McConnell
0b20467c6f
[maven-release-plugin] prepare for next development iteration
2013-04-15 11:40:45 -05:00