Joakim Erdfelt
d1692733f5
JSR-356: MessageHandler(s) layer
2013-04-04 12:03:11 -07:00
Simone Bordet
024936c2de
Temporarily ignoring this test that fails spuriously (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=404911 ).
2013-04-04 17:11:01 +02:00
Simone Bordet
72219d016b
404610 - Reintroduce ability to disallow TLS renegotiation.
2013-04-04 17:11:01 +02:00
Jan Bartel
7523c5234c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-jsp/pom.xml
2013-04-04 13:31:33 +11:00
Joakim Erdfelt
3a66b3ec3f
JSR-356 first working annotated @ClientEndpoint echo test
2013-03-28 10:51:45 -07:00
Joakim Erdfelt
fc7526b739
[JSR-356] Refactoring annotated callables to handle any-order rule
2013-03-26 17:30:49 -07:00
Joakim Erdfelt
3c59f15a5c
Some basic @ServerEndpoint scanning tests
2013-03-25 09:56:04 -07:00
Joakim Erdfelt
725887620c
Some basic @ServerEndpoint scanning tests
2013-03-25 09:56:01 -07:00
Joakim Erdfelt
a498107c42
Parameter identification refactor + Decoder and PathParam integration
2013-03-22 13:18:02 -07:00
Joakim Erdfelt
0bab7b2c6d
reverting dispatched session open
2013-03-22 13:18:02 -07:00
Joakim Erdfelt
bf335f496d
403817 - Use of WebSocket Session.close() results in invalid status code
...
+ Fixing WebSocketSession.close() to delgate NORMAL close properly
2013-03-22 13:18:02 -07:00
Joakim Erdfelt
54fd961354
403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout
2013-03-22 13:18:02 -07:00
Joakim Erdfelt
04d86bd49e
402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request
2013-03-22 13:18:02 -07:00
Joakim Erdfelt
bfb92dc18b
reverting dispatched session open
2013-03-21 07:13:16 -07:00
Joakim Erdfelt
23ce4235d8
403817 - Use of WebSocket Session.close() results in invalid status code
...
+ Fixing WebSocketSession.close() to delgate NORMAL close properly
2013-03-20 09:28:07 -07:00
Joakim Erdfelt
dd4394aa77
403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout
2013-03-19 12:05:29 -07:00
Joakim Erdfelt
4d52c3ca8e
402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request
2013-03-19 11:28:23 -07:00
Joakim Erdfelt
96df602e9e
Initial pass at fixing build for websocket PFD
2013-03-18 16:50:07 -07:00
Joakim Erdfelt
8ec9ac4d64
Merge branch 'master' into javawebsocket-jsr
2013-03-18 13:32:08 -07:00
Jan Bartel
279dff381c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-osgi/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
2013-03-18 16:00:23 +11:00
Joakim Erdfelt
8a9f1f94e8
403373 - WebSocket change timeout log level from warn -> info
2013-03-14 10:00:02 -07:00
Joakim Erdfelt
fd8f2b9753
Merge from [master] -> [javawebsocket-jsr]
2013-03-11 10:57:08 -07:00
Joakim Erdfelt
897c35c2cb
[maven-release-plugin] prepare for next development iteration
2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
2013-03-08 11:33:15 -07:00
Simone Bordet
f01e4f0b2c
402757 - WebSocket client module can't be used with WebSocket server module in the same WAR.
...
Introduced a shaded artifact that relocates the websocket-common classes, so they cannot
be shared with the server.
The shaded artifact has classifier "hybrid", and users will need to exclude the websocket-common
dependency manually when using the classified artifact.
2013-03-08 19:05:48 +01:00
Joakim Erdfelt
7fc38f6c0f
[maven-release-plugin] prepare for next development iteration
2013-03-07 19:14:19 -07:00
Joakim Erdfelt
96d045442f
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
2013-03-07 19:14:11 -07:00
Jesse McConnell
778ee1411b
[maven-release-plugin] prepare for next development iteration
2013-03-06 10:21:46 -06:00
Jesse McConnell
d916078711
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
2013-03-06 10:21:38 -06:00
Joakim Erdfelt
3be67fa5d1
402008 - Websocket blocking write hangs when remote client dies (or is killed) without going thru Close handshake
...
+ Fixing close and callback failure notificiations to address issues
with suddenly killed clients.
2013-03-05 13:54:23 -07:00
Joakim Erdfelt
2d74857ffa
402008 - Strange behavior when clients are suddenly killed
...
+ Fixing close and callback failure notificiations to address issues
with suddenly killed clients.
2013-03-05 13:11:50 -07:00
Joakim Erdfelt
79630de1f1
402148 - Update Javadoc for WebSocketServlet for new API
2013-03-01 09:31:29 -07:00
Joakim Erdfelt
9e78529a17
402154 - WebSocket / Session.setIdleTimeout(ms) should support in-place idle timeout changes
...
+ Made WebSocketSession delegate idle timeouts to LogicalConnection,
that way the EndPoint or Mux can manage the idle timeout accordingly.
2013-03-01 09:24:03 -07:00
Simone Bordet
e6fed09129
402075 - Massive old gen growth when hit by lots of non persistent connections.
...
Replaced usages of TimerScheduler with ScheduledExecutorScheduler.
2013-03-01 15:19:51 +01:00
Joakim Erdfelt
c4af34d4e1
Adding smaller example of the WebSocketCreator use
2013-02-27 08:54:01 -07:00
Joakim Erdfelt
370bdafc15
Reverting direct ByteBuffer commits
...
+ Reverting commit : 5621f87c81
+ Reverting commit : bbcf0c77b8
2013-02-26 10:41:40 -07:00
Joakim Erdfelt
29b2118870
[maven-release-plugin] prepare for next development iteration
2013-02-26 09:20:45 -07:00
Joakim Erdfelt
2b82b54f6d
[maven-release-plugin] prepare release jetty-9.0.0.RC2
2013-02-26 09:20:45 -07:00
Jan Bartel
42475b1564
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-02-26 12:50:30 +11:00
Joakim Erdfelt
283cd58147
Merge branch 'jetty-7' into jetty-8
2013-02-25 16:54:16 -07:00
Joakim Erdfelt
2ed0dc8fff
Fixing websocket testcase
2013-02-25 16:53:32 -07:00
Joakim Erdfelt
7a2b775f03
Reducing log noise
2013-02-23 16:44:49 -07:00
Joakim Erdfelt
bbcf0c77b8
Switching to direct ByteBuffers
2013-02-23 16:44:49 -07:00
Joakim Erdfelt
5621f87c81
Switching to direct ByteBuffers
2013-02-23 16:44:49 -07:00
Joakim Erdfelt
dbf3662f90
Refinement of factorymethod approach in WebSocketClient (for cometd to use)
2013-02-22 10:49:49 -07:00
Joakim Erdfelt
12814b02ed
Making WebSocketClient connection stuff pluggable via factory methods
2013-02-22 10:43:47 -07:00
Jan Bartel
e95301b906
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/SafariD00.java
2013-02-22 18:37:29 +11:00
Joakim Erdfelt
95f166b374
Merge branch 'jetty-7' into jetty-8
2013-02-21 17:34:19 -07:00
Joakim Erdfelt
c7dd114cb6
401317 - Make Safari 5.x websocket support minVersion level error more clear
...
+ Making error message about minVersion configurable more clear on both
the Logging on the server side, and the HTTP/1.1 400 error response
line
2013-02-21 17:23:17 -07:00
Joakim Erdfelt
61470cde2e
401427 - WebSocket messages sent from onConnect fail to be read by jetty websocket-client
...
+ Adding carryover of bytes remaining from UpgradeConnection to
AbstractWebSocketConnection.parser
2013-02-21 15:32:37 -07:00
Joakim Erdfelt
660f6d2e85
399520 - Websocket Server Connection needs session idle timeouts
2013-02-21 08:21:01 -07:00
Joakim Erdfelt
246db2b08d
401177 - Make org.eclipse.jetty.websocket.api.WebSocketAdapter threadsafe
...
+ Making some subtle changes to address thread safety of the WebSocketAdapter
2013-02-21 07:30:28 -07:00
Joakim Erdfelt
22fe9d419e
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Rounding out the Encoders / Decoders base implementation
2013-02-20 15:58:04 -07:00
Joakim Erdfelt
54a4818511
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Defining Decoders and Encoders
+ Trying to work out the Type assignment matching for Decoders
2013-02-19 16:24:34 -07:00
Joakim Erdfelt
6e5ab19c58
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Trying to noodle out the @WebSocketMessage validation with Decoders in
the mix
2013-02-15 14:33:15 -07:00
Joakim Erdfelt
7d1f774c0e
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Adding support for @WebSocketClient method scanning of
@WebSocketOpen
@WebSocketClose
@WebSocketError
2013-02-15 12:26:35 -07:00
Joakim Erdfelt
820e20f042
Fixing license headers
2013-02-15 10:03:14 -07:00
Joakim Erdfelt
2faba0bf4b
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Start of @WebSocketClient class/method scanning with tests
2013-02-14 16:24:07 -07:00
Joakim Erdfelt
4fb1bc80da
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Refactoring EventDriver to be more pluggable (for jsr endpoints)
2013-02-13 13:37:26 -07:00
Joakim Erdfelt
43231d8451
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Restarting branch, copying over work from November with new JSR-356
Draft 012 api in mind.
2013-02-12 16:19:35 -07:00
Joakim Erdfelt
9ae3c94b22
399520 - Websocket needs session idle timeouts
...
+ Integrated suggestions about AbstractConnection.onReadTimeout()
+ Enabled tests on client side
2013-02-12 13:51:06 -07:00
Joakim Erdfelt
ebaffcfd27
399535 - Websocket-client connect should have configurable connect timeout
...
+ Made default value for connectTimeout be exposed from SelectorManager.
+ Added javadoc on time unit.
2013-02-12 12:56:46 -07:00
Joakim Erdfelt
5c68d23138
400512 - ClientUpgradeRequet.addExtension() should fail if extension is not installed
2013-02-12 11:37:16 -07:00
Joakim Erdfelt
4daba06175
400255 - Using WebSocket.maxMessageSize results in IllegalArgumentException
...
+ Adding testcase that replicated failure reported in issue
+ Fixing AnnotatedEventDriver error with input size
+ Fixing WebSocketSession detection of isOpen()
+ Fixing BigEchoSocket test for session.isOpen()
2013-02-11 16:50:01 -07:00
Joakim Erdfelt
d505f481a4
400255 - Using WebSocket.maxMessageSize results in IllegalArgumentException
2013-02-11 16:24:13 -07:00
Joakim Erdfelt
4dc3ed38c2
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Joakim Erdfelt
ed24f78498
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:36 -07:00
Jesse McConnell
e073ceb06d
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Jesse McConnell
2f2ad287af
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:35 -07:00
Joakim Erdfelt
b810ce6535
Adding synchronize for multi-threaded write concerns
2013-02-01 09:20:33 -07:00
Joakim Erdfelt
89d8972e74
399689 - Websocket RFC6455 extension handshake fails if server doesn't have extension
...
+ Fixing the fix that fixed the negotation to fix a bad fixation of the
negotiated extensions
2013-01-31 16:14:30 -07:00
Joakim Erdfelt
552ec4ae36
399689 - Websocket RFC6455 extension handshake fails if server doesn't have extension
...
+ Correcting logic in HandshakeRFC6455 with regards to negotiated extensions
2013-01-31 15:36:30 -07:00
Joakim Erdfelt
261809380a
395444 - Disabling Websocket Compress Extensions (not working with Chrome / deflate problem)
...
+ Adding test case example of many server messages in a row
+ Disabling various compression extensions till a solution is found
2013-01-31 12:41:20 -07:00
Joakim Erdfelt
242f7f0f45
399568 - OSGi tests can't find websocket classes
...
+ Changing classloading in WebSocketServlet to be more OSGi friendly
2013-01-31 12:15:22 -07:00
Joakim Erdfelt
1480f3d8fc
399669 - Remove WebSocketConnection in favor of websocket.api.Session
2013-01-31 12:09:04 -07:00
Joakim Erdfelt
1aa6e63d25
395232 - UpgradeRequest object passed to createWebSocket() has null Session
...
+ Server side UpgradeRequest.getSession() now has HttpSession (if
it has already been created)
2013-01-31 11:26:17 -07:00
Jesse McConnell
5c58878c3c
[maven-release-plugin] prepare for next development iteration
2013-01-31 11:34:38 -06:00
Jesse McConnell
ebbe37294f
[maven-release-plugin] prepare release jetty-8.1.9.v20130131
2013-01-31 11:34:30 -06:00
Joakim Erdfelt
32cb1045ba
Fixing logger name
2013-01-31 09:35:27 -07:00
Jesse McConnell
a5e1e04af1
[maven-release-plugin] prepare for next development iteration
2013-01-31 08:42:20 -06:00
Jesse McConnell
b7fb18fd65
[maven-release-plugin] prepare release jetty-7.6.9.v20130131
2013-01-31 08:42:12 -06:00
Joakim Erdfelt
728201fa3e
Making Simone jubilantly happy :-)
2013-01-30 14:02:52 -07:00
Joakim Erdfelt
b2951bdf5d
396428 - Test for WebSocket masking on client fragments per RFC 6455 Sec 5.1
2013-01-30 13:51:49 -07:00
Joakim Erdfelt
25b0bd73a6
399516 - Websocket UpgradeException should contain HTTP Request/Response information
...
+ Added UpgradeException.requestURI and UpgradeException.responseStatusCode
2013-01-30 13:13:29 -07:00
Joakim Erdfelt
60088fa274
399515 - Websocket-client connect issues should report to websocket onError handlers
2013-01-30 12:15:15 -07:00
Joakim Erdfelt
f46ad8bbab
Using HttpCookieStore.Empty from jetty-util instead
2013-01-30 09:56:09 -07:00
Joakim Erdfelt
5e8aa4eeb3
399421 - Add websocket.api.Session.disconnect() for harsh low level connection disconnect
2013-01-29 15:56:30 -07:00
Joakim Erdfelt
cd38a7999e
399397 - websocket-client needs better upgrade failure checks
...
+ Adding checks on response status code and Connection header (along
with unit tests)
2013-01-29 14:44:56 -07:00
Joakim Erdfelt
4f48bc7e7b
399343 - OnWebSocketConnect should use api.Session parameter instead.
...
+ Changed method signature for WebSocketListener and the various
@OnWebSocket* annotations
2013-01-29 13:22:38 -07:00
Joakim Erdfelt
871b64cf38
Bug 399344 - Add missing @OnWebSocketError annotation
2013-01-29 13:22:38 -07:00
Joakim Erdfelt
335611815c
399173: UpgradeRequest.getParameterMap() should never return null
...
+ Making api.UpgradeRequest never return null, but also have no logic on
how to populate the parameter map
+ Using MultiMap in websocket-client for parameter map parsing
+ Using HttpServletRequest.getParameterMap() as-is in websocket-server
+ Adding unit testing for both sides
2013-01-28 17:11:51 -07:00
Joakim Erdfelt
7adc77a5d5
Adding -tests classifier artifacts to deploy/release to aide in quickstart documentation
2013-01-25 12:19:17 -07:00
Joakim Erdfelt
3975ae74cb
Moving test from jetty-parent to jetty-client module
2013-01-25 12:06:17 -07:00
Joakim Erdfelt
7211ce230e
Removing unused websocket-core files, detrius from old merge
2013-01-23 10:50:37 -07:00
Joakim Erdfelt
bfba20565a
Removing out of date mux diagrams
2013-01-23 10:49:07 -07:00
Joakim Erdfelt
f9cb26b5a7
Removing jsr diagrams from common, should only exist in jsr branch (for now)
2013-01-23 10:48:51 -07:00
Joakim Erdfelt
c31f3a5501
Updating diagrams
2013-01-23 10:47:59 -07:00
Joakim Erdfelt
2e216dddb7
Consolidating WebSocketPolicy.setMax*Size() into single setMaxMessageSize()
2013-01-18 09:27:56 -07:00
Simone Bordet
1ca0f004c3
Updated signature of setConnectTimeout(int) to setConnectTimeout(long)
...
to comply with field type and getter type.
Removed check that was throwing an exception if connect timeout was set
after start.
2013-01-18 10:35:20 +01:00
Joakim Erdfelt
b938245b14
Adding some javadoc, cleaning up package namespaces where appropriate
2013-01-17 15:41:33 -07:00
Joakim Erdfelt
e0b3c1b926
Making sure cookies are set
2013-01-16 15:11:57 -07:00
Joakim Erdfelt
4660f35210
393733 - WebSocketClient interface should support multiple connections
...
+ Removing deprecated methods from Session
+ Fixing client side UpgradeConnection to handle extension via new
ExtensionStack object
+ Making ExtensionStack.getNegotiatedExtensions() return
List<ExtensionConfig> instead of List<String>
+ Fixing tests that relied on changes
2013-01-16 15:11:57 -07:00
Joakim Erdfelt
1dfee4c992
393733 - WebSocketClient interface should support multiple connections
...
+ Reworking Connection Timeout handling
2013-01-16 15:11:57 -07:00
Joakim Erdfelt
f20f0481b4
93733 - WebSocketClient interface should support multiple connections
...
+ Cleaning up no longer used items in WebSocketClient
+ Adding back Connect Timeout handling (unreliable atm)
+ Making ConnectPromise a FuturePromise with Runnable, no longer need
FutureTask
+ Making sure Session is properly opened
+ Removing need for EventDriver.awaitActiveSession()
2013-01-16 15:11:57 -07:00
Joakim Erdfelt
acaa2aa4de
393733 - WebSocketClient interface should support multiple connections
...
* Initial pass at merging functions of WebSocketClientFactory into
WebSocketClient itself, eliminating the need for the factory.
* Introducing ConnectPromise to separate the connect future from
the client itself, hopefully allowing for multiple connections
from the client instance.
2013-01-16 15:11:56 -07:00
Joakim Erdfelt
eff1262e49
398105 - Clean up WebSocketPolicy
2013-01-16 15:11:56 -07:00
Jesse McConnell
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
Jesse McConnell
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
Jesse McConnell
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
Greg Wilkins
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
Joakim Erdfelt
5b7c19e38d
Reducing test logging noise by squelching stack traces in test cases where they are expected
2012-12-21 14:22:10 -07:00
Joakim Erdfelt
1936a0fc51
Fixing harmless NPE seen during testing.
2012-12-21 14:00:36 -07:00
Joakim Erdfelt
0ef9b23724
Fixing end user callback failure if runtime exception occurs, renaming enque to enqueue
2012-12-19 10:06:23 -07:00
Joakim Erdfelt
ca1c3db642
Removing WriteResult class
2012-12-14 16:12:48 -07:00
Joakim Erdfelt
e308f843db
Replacing FrameBytes tree with WriteBytesProvider class
2012-12-14 16:12:48 -07:00
Joakim Erdfelt
ecb472f30b
Introducing WriteBytesProvider
2012-12-14 16:12:48 -07:00
Greg Wilkins
6bfc19be1b
jetty-9 optimisation to dispatch before parsing so that handling is done in same thread
2012-12-14 09:50:22 +11:00
Joakim Erdfelt
c8c15a4063
Removing test for inputClosed on BlockheadClient to fix test failure.
2012-12-13 13:28:05 -07:00
Joakim Erdfelt
60598c5c73
396518 - Websocket AB Tests should test for which side disconnected and closed.wasClean
...
+ adding AbstractWebSocketConnection.onWriteWebSocketClose() to allow
for different behavior between client vs server TCP disconnect logic.
2012-12-13 13:28:05 -07:00
Jesse McConnell
bf3c5c7922
add in some handshake state tracking into IOState to help track who initiated closes
2012-12-13 12:18:30 -06:00
Joakim Erdfelt
a386a46045
396518 - Websocket AB Tests should test for which side disconnected and closed.wasClean
...
* Adding stubbed out example in Fuzzer for wasClean.
2012-12-13 09:33:12 -07:00
Joakim Erdfelt
9bbfcd7e62
More websocket threading issues
...
* Using new IOState object in AbstractWebSocketConnection to better
manage close handshake state and replies.
* Cleaning up many bad BufferPool.release() calls against ByteBuffers
that didn't arrive from BufferPool.acquire()
* Removing many ByteBuffer.wrap() calls.
* Fixing FrameCompression / MessageCompression extension handling
of ByteBuffers
2012-12-12 11:06:15 -07:00
Simone Bordet
756b13700b
Handling properly connect exceptions, notifying the failure to the websocket client.
2012-12-12 18:34:22 +01:00
Simone Bordet
f3d53918b5
Guarding against NPE if the masker is null.
2012-12-12 14:14:18 +01:00
Joakim Erdfelt
9a71d75003
Fixing threading issue in testcase
2012-12-11 13:01:54 -07:00
Jesse McConnell
d161673ff7
Add masker to client factory
2012-12-11 07:44:52 -06:00
Jesse McConnell
a2a5a97bfe
add some methods to the ServletWebSocketRequest and rename one method
2012-12-10 12:16:06 -06:00
Joakim Erdfelt
4ff9c2cea1
Setting problematic test to @Ignore
2012-12-10 10:20:48 -07:00
Joakim Erdfelt
baaf94eeae
Fixing write of large websocket frames (25MB+)
...
+ Using ForkInvoker from util
+ Using FrameBytes logic from SPDY
+ Fixing bad flush logic
+ Fixing lazy BufferPool.release() logic
+ Fixing Buffer reuse issue
+ Fixing BlockheadServer to use ExtensionStack
+ Moving WriteResultFuture helper classes out of tests into main
+ Introducing common IOState handling for common close handshake use
2012-12-10 09:23:18 -07:00
Greg Wilkins
3e151901bf
jetty-9 Use public HttpField
2012-12-08 01:41:01 +11:00
Greg Wilkins
a20d984d30
jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap
2012-12-08 01:41:00 +11:00
Jan Bartel
c9db4ca815
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-proxy/pom.xml
pom.xml
2012-11-30 15:45:36 +11:00
Joakim Erdfelt
11cbe274af
395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x
2012-11-28 16:55:13 -07:00
Joakim Erdfelt
2d851212ba
Validating obtaining Local/Remote address from connection object
2012-11-27 15:23:55 -07:00
Joakim Erdfelt
d8b1444609
Changing to ClientUpgrade(Request|Response)
2012-11-27 15:00:22 -07:00
Joakim Erdfelt
acaeb7663a
Making sure websocket server tests validate Sec-WebSocket-Accept on response headers
2012-11-27 12:40:28 -07:00
Greg Wilkins
f89909e301
jetty-9 cleaning up dependencies
2012-11-23 16:25:57 +11:00
Greg Wilkins
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
Jesse McConnell
fdc9428c6f
[maven-release-plugin] prepare for next development iteration
2012-11-19 18:06:01 -06:00
Jesse McConnell
d89b6f9b88
[maven-release-plugin] prepare release jetty-9.0.0.M3
2012-11-19 18:05:54 -06:00
Jesse McConnell
a0c1d85094
Revert "jetty-9 cleaned up serverClasses to minimum"
...
This reverts commit 67b5caadbb
.
2012-11-19 10:33:54 -06:00
Greg Wilkins
67b5caadbb
jetty-9 cleaned up serverClasses to minimum
2012-11-19 17:42:52 +11:00
Greg Wilkins
97d2130a8f
jetty-9 no debugging checked in
2012-11-19 15:08:53 +11:00
Greg Wilkins
4ff9bdc54d
jetty-9 alternative websocket discovery
2012-11-15 21:23:43 +11:00
Joakim Erdfelt
deed4e3db1
Fixing license header
2012-11-13 14:56:10 -07:00
Joakim Erdfelt
d229364f9d
Fixing jetty-osgi for new websocket artifacts
2012-11-13 12:50:27 -07:00
Joakim Erdfelt
169498cd9d
Fixing Frame Decompress to work in Chrome 20.x
2012-11-12 20:52:54 -07:00
Joakim Erdfelt
d67fdfdd85
Splitting out websocket-servlet to make it more friendly for WebAppClassloader
2012-11-12 19:42:32 -07:00
Joakim Erdfelt
42ec683297
Merge from 'master' to 'ws-refactor'
2012-11-12 16:22:11 -07:00
Joakim Erdfelt
80f5fa1a18
Attempting to get Mux sub-channel to flow thru server as well
2012-11-12 16:02:41 -07:00
Joakim Erdfelt
dd0b1a39b8
Stubbing out mux client/server specific pieces
2012-11-12 16:02:41 -07:00
Joakim Erdfelt
884f1a3eff
New ExtensionStack to manage Extensions easier and more consistently
2012-11-12 16:02:05 -07:00
Joakim Erdfelt
8548331735
Ripping out javax.net.websocket.extension.* SPI as it is going away
2012-11-12 12:36:39 -07:00
Greg Wilkins
f336511f87
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
2012-11-08 14:58:10 +11:00
Greg Wilkins
b3274a6baa
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
VERSION.txt
2012-11-08 14:41:01 +11:00
Greg Wilkins
eaf65a2902
393075 1xx 204 and 304 ignore all headers suggesting content
2012-11-08 14:37:07 +11:00
Joakim Erdfelt
09625a64e2
Adding more diagrams for javax.net.websocket layers
2012-11-07 12:01:25 -07:00
Joakim Erdfelt
802e97e6fb
Removing WebSocketClient.getConnection() as inappropriate
2012-11-07 11:00:46 -07:00
Joakim Erdfelt
4a8a1228fc
Moving client-side mux specifics to internal
2012-11-07 06:06:08 -07:00
Joakim Erdfelt
473ff032ae
Promoting ClientUpgradeRequest and ClientUpgradeResponse to non-internal use
2012-11-07 06:05:36 -07:00
Joakim Erdfelt
fc371fc7e6
UpgradResponse headers are now case insensitive
2012-11-06 17:07:55 -07:00
Joakim Erdfelt
9be64bab11
Making changes to client / server from api / common
2012-11-06 16:58:54 -07:00
Joakim Erdfelt
414f964afd
Making changes to client / server from api / common
2012-11-06 16:58:49 -07:00
Joakim Erdfelt
a7968c07be
Rolling Extension and ExtensionConfig change into rest of websocket-common
2012-11-06 15:51:23 -07:00
Joakim Erdfelt
11ff35ccbb
Adding missing @Override's
2012-11-06 15:50:27 -07:00
Joakim Erdfelt
e625689a1c
Using Extension interface, not AbstractExtension
2012-11-06 15:49:57 -07:00
Joakim Erdfelt
b6a4e04b38
Removing RequestedExtensionConfig in favor of new ExtensionConfig class implementation in .api
2012-11-06 15:49:16 -07:00
Joakim Erdfelt
48e0cf1fb7
Consolidating duplicate functionality of ExtensionRegistry and ExtensionFactory
2012-11-06 15:48:44 -07:00
Joakim Erdfelt
3d94916790
Making ExtensionConfig an object, not an interface
2012-11-06 15:47:31 -07:00
Joakim Erdfelt
5eb5eb818f
Brining over important getters for jetty Extension
2012-11-06 15:46:49 -07:00
Joakim Erdfelt
000cfe6986
Fixing UpgradeRequest / UpgradeResponse hierarchy.
2012-11-06 15:45:13 -07:00
Joakim Erdfelt
57c97505c8
Removing providedon javax.net.websocket
2012-11-06 15:42:06 -07:00
Joakim Erdfelt
17c6e04f47
Making rest of the modules use websocket-common (instead of old websocket-core)
2012-11-05 17:58:06 -07:00
Joakim Erdfelt
2e3447f6ef
Making .common pass all existing tests
2012-11-05 17:57:39 -07:00
Joakim Erdfelt
b37bd2b665
Exclude Continuations from Frame.Type
2012-11-05 17:57:04 -07:00
Joakim Erdfelt
053f91c8a0
Refactoring .core to .common and updating for .api
2012-11-05 17:18:44 -07:00
Joakim Erdfelt
c1ce7780a6
Updating rest for websocket-api
2012-11-05 12:01:42 -07:00
Joakim Erdfelt
eb2e42d402
Updating jetty-websocket-api classes
2012-11-05 12:01:26 -07:00
Jesse McConnell
bb27f561c1
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:24:06 -06:00
Jesse McConnell
1d767e99a3
[maven-release-plugin] prepare release jetty-8.1.8.v20121105
2012-11-05 12:23:59 -06:00
Jesse McConnell
70d591c430
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:16:03 -06:00
Jesse McConnell
017826b4eb
[maven-release-plugin] prepare release jetty-7.6.8.v20121105
2012-11-05 12:15:57 -06:00
Jesse McConnell
eac9414f01
Merge branch 'jetty-7' into jetty-8
2012-11-05 11:52:18 -06:00
Joakim Erdfelt
53f1892f7b
Fixing license header
2012-11-05 10:40:20 -07:00
Jan Bartel
f3af8c8650
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-05 16:28:25 +11:00
Greg Wilkins
36ddd3f5d6
393368 min websocket version
2012-11-05 11:02:50 +11:00
Joakim Erdfelt
d19f177cae
First step
2012-11-02 11:42:44 -07:00
Joakim Erdfelt
e310b0a0ec
Attempting to get Mux sub-channel to flow thru server as well
2012-11-02 11:20:36 -07:00
Jan Bartel
2a2215cf0b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2012-11-02 16:59:11 +11:00
Joakim Erdfelt
949996931a
Fixing license (for check plugin)
2012-11-01 21:25:25 -07:00
Greg Wilkins
52464a5ba6
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
Greg Wilkins
8723408731
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
Greg Wilkins
ba06103442
393383 delay onClose call until closeOut is done
2012-11-02 10:28:23 +11:00
Joakim Erdfelt
88ed9ff710
Stubbing out mux client/server specific pieces
2012-11-01 13:43:33 -07:00
Joakim Erdfelt
171fa2db67
More use of StringUtil.truncate
2012-10-31 13:27:21 -07:00
Joakim Erdfelt
01c9e650fb
First working TEXT echo thru the muxer (as test case)
2012-10-31 11:07:10 -07:00
Joakim Erdfelt
61c607076a
Mux interrim work.
2012-10-30 16:17:03 -07:00
Jan Bartel
c49563244c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2012-10-30 19:18:20 +11:00
Joakim Erdfelt
6108d0df0c
393075 Jetty WebSocket client cannot connect to Tomcat WebSocket Server
...
* Adding testcase to repliate behavior as reported by bug.
2012-10-29 11:18:01 -07:00
Greg Wilkins
add3c2b381
392237 improved names and examples for documentation
2012-10-29 17:59:39 +11:00
Jan Bartel
958d0c6949
Start incorporating (EDR version) servlet 3.1 spec
2012-10-27 17:38:43 +11:00
Joakim Erdfelt
1b6d919d8c
Adding logging on read timeout
2012-10-23 15:29:07 -07:00
Joakim Erdfelt
3e2aee293e
Cleaning up close handshake and noisy tests
2012-10-23 12:16:29 -07:00
Joakim Erdfelt
4f7c66ae81
Using NO_CODE instead of -1 for close frame with no status code declared
2012-10-23 12:16:29 -07:00
Greg Wilkins
2b13648b0e
392237 fixed many TODOs and many minor code cleanups
2012-10-19 16:17:30 +11:00
Joakim Erdfelt
57abd6fded
Per hybi list, adding no-cache to outgoing client request to prevent bad
...
intermediaries from attempting to cache the upgrade response.
2012-10-15 07:18:35 -07:00
Greg Wilkins
f5d3fec4f8
jetty-9 removed context deployer and merged context and webapps directory
2012-10-15 22:05:33 +11:00
Joakim Erdfelt
3c59cf90d0
Refactoring compression based extensions to use a common set of DEFLATE processes
2012-10-12 14:55:25 -07:00
Greg Wilkins
fac580c374
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
...
Conflicts:
VERSION.txt
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
jetty-annotations/pom.xml
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AbstractDiscoverableAnnotationHandler.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http/src/main/java/org/eclipse/jetty/http/Generator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/BufferUtil.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/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-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
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-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/bio/SocketConnector.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
jetty-server/src/test/resources/jetty-logging.properties
jetty-servlet/pom.xml
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
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-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/pom.xml
jetty-start/src/test/java/org/eclipse/jetty/start/CommandLineBuilderTest.java
jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/pom.xml
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
jetty-websocket/pom.xml
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/MessageSender.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
tests/pom.xml
tests/test-integration/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2012-10-12 21:19:21 +11:00
Joakim Erdfelt
20317fffeb
Fixing stacktrace noise on tests
2012-10-10 11:35:19 -07:00
Joakim Erdfelt
1892dbfa03
Bug 391591 - WebSocket client should support x-webkit-deflate-frame
...
* Adding test + hack for BFINAL 0 vs BFINAL 1
2012-10-10 11:34:32 -07:00
Joakim Erdfelt
0cc7b5f907
Bug 391590 - WebSocket client needs ability to set requested extensions
...
* Adding UpgradeRequest.addExtensions(String ... extConfigs) interface
* Implementing in WebSocket Client & WebSocket Server
* Fixing case sensitive ClientUpgradeRequest.getHeaderValues(String key)
2012-10-10 11:19:06 -07:00
Joakim Erdfelt
9b7eb1da79
Bug 391588 - WebSocket Client does not set masking on close frames
2012-10-10 11:16:44 -07:00
Joakim Erdfelt
cae79aabc5
Fixing naming
2012-10-10 11:15:44 -07:00
Joakim Erdfelt
54e9c312ab
Removing old handshake
2012-10-10 11:11:45 -07:00
Joakim Erdfelt
f2595a7ec3
Bumping up to jetty-test-helper 2.0 with new @Rule TestTracker & AdvancedRunner status messages.
2012-10-10 09:10:51 -07:00
Simone Bordet
2748a9381e
jetty-9: Added support for connect timeout.
2012-10-08 11:05:26 +02:00
Joakim Erdfelt
41ea028706
Adding websocket client example
2012-10-04 14:02:36 -07:00
Joakim Erdfelt
d23215f3f4
Bug 391140 - Implement x-webkit-deflate-frame extension as-used by Chrome/Safari
2012-10-04 10:11:50 -07:00
Joakim Erdfelt
28bb21eaf4
Updating websocket chart images for javadoc
2012-09-28 14:27:20 -07:00
Jan Bartel
156e33bd23
Merge remote-tracking branch 'origin/master' into jetty-8
2012-09-28 18:47:33 +10:00
Joakim Erdfelt
550c2835cf
Adding some more examples
2012-09-27 16:41:29 -07:00
Joakim Erdfelt
c8fe5c18ec
Making WebSocketServlet and WebSocketHandler both use same technique to configure
2012-09-27 12:38:33 -07:00
Joakim Erdfelt
cda1c4588f
Reworking EventDriver to be mroe generic and not use reflection in 100% of cases
2012-09-26 13:43:17 -07:00
Jesse McConnell
494f7e48fc
add websocket test for http keyword in response message from reported issue
2012-09-25 08:18:06 -05:00
Joakim Erdfelt
be9d24584c
390263: Sec-WebSocket-Extensions from Chrome and Safari badly handled
...
+ fixing broken negotiation of missing/invalid extension configurations
2012-09-24 13:31:54 -07:00
Hugues Malphettes
1cfa277c6c
jetty-9 osgi support
2012-09-24 13:04:57 +08:00
Greg Wilkins
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
Joakim Erdfelt
857498b115
Upgrading to junit-dep-4.10.jar (banning junit.jar)
2012-09-20 11:52:59 -07:00
Simone Bordet
40382bad3a
jetty-9 - Removed references to JUnit 3.x.
2012-09-20 18:23:02 +02:00
Joakim Erdfelt
b10a10797d
Making websocket-core have a unique package org.eclipse.jetty.websocket.core to conform to osgi requirements
2012-09-18 10:01:01 -07:00
Joakim Erdfelt
e46617ad8a
Moving maskers from core to client, where it belongs
2012-09-17 14:38:27 -07:00
Joakim Erdfelt
e0e8708932
Updating Fuzzer for ignoring broken pipe issues when appropriate
2012-09-17 14:04:33 -07:00
Simone Bordet
0a5d32eb2f
jetty-9 - Removed unneeded 20 ms wait.
2012-09-17 21:49:19 +02:00
Simone Bordet
6e9567d410
jetty-9 - Using longer timeouts when expecting results.
2012-09-17 21:49:18 +02:00
Simone Bordet
92c95584fa
jetty-9 - Set default timeout for expect() to be 5 s.
2012-09-17 21:49:18 +02:00
Joakim Erdfelt
dc2a13602e
Renaming DeflateFrameExtension in response to spec name change
2012-09-17 11:26:27 -07:00
Greg Wilkins
129583679a
jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector
2012-09-17 17:37:56 +10:00
Joakim Erdfelt
515804a463
Fixing connection.onOpen()
2012-09-14 15:10:54 -07:00
Joakim Erdfelt
7ab495515a
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-09-14 14:41:09 -07:00
Joakim Erdfelt
5ebc784b45
cleaning up test logging output
2012-09-14 14:41:03 -07:00
Simone Bordet
88cbfed7e0
jetty-9 - Made SelectorManager.connection[Opened|Closed]() concrete, since they are overridden only by SelectChannelConnector.
2012-09-14 23:30:21 +02:00
Joakim Erdfelt
6ebd96e9bd
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-09-14 10:41:23 -07:00
Joakim Erdfelt
c7404731c9
Starting removal of WebSocketPolicy.getBufferSize()
2012-09-14 10:41:11 -07:00
Greg Wilkins
22ba57b8d2
jetty-9 refactored onOpen and onClose
2012-09-14 17:38:47 +10:00
Jesse McConnell
a8994178f5
[maven-release-plugin] prepare for next development iteration
2012-09-10 14:18:11 -05:00
Jesse McConnell
92180a9700
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 14:18:01 -05:00
Jesse McConnell
10e4027579
[maven-release-plugin] prepare for next development iteration
2012-09-10 13:59:34 -05:00
Jesse McConnell
57a6258f96
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
2012-09-10 13:59:10 -05:00
Jesse McConnell
1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
Jesse McConnell
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
Joakim Erdfelt
3ba074ecc8
Adding .STACKS=(boolean) support to StdErrLog configuration
2012-09-06 12:33:38 -07:00
Simone Bordet
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
Joakim Erdfelt
4f36513744
More work around close handshake testing
2012-09-04 14:53:34 -07:00
Jesse McConnell
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
Jesse McConnell
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
Jesse McConnell
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
Jesse McConnell
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
Greg Wilkins
c3776764f4
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:24:36 +10:00
Greg Wilkins
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
Simone Bordet
4de5b0ad63
Merged branch 'jetty-9' into jetty-9-client.
2012-08-30 17:24:49 +02:00
Greg Wilkins
353978726b
jetty-9 reverted isHead change
2012-08-27 11:14:19 +10:00
Greg Wilkins
cb5dd493fb
jetty-9 merged jetty-9-aggregation
2012-08-27 10:24:34 +10:00
Greg Wilkins
726898ffd8
jetty-9 fixed after merged
2012-08-24 20:39:03 +10:00
Simone Bordet
171ad66962
Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 12:20:44 +02:00
Greg Wilkins
72bfacd5a4
Merge branch 'jetty-9' into jetty-9-aggregation
2012-08-24 20:17:08 +10:00
Simone Bordet
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
Joakim Erdfelt
afbaa78e66
Marking client tests appropriately
2012-08-23 16:12:17 -07:00
Joakim Erdfelt
28ae24fc35
Fixing testBlockReceiving
2012-08-22 11:06:57 -07:00
Simone Bordet
dc140f85b7
Jetty9 - Refactored HttpChannel: moved connection logic back to HttpConnection.
2012-08-21 15:09:54 +02:00
Joakim Erdfelt
4ed72ad585
Fixing websocket-client issues around fillInterested on physical connection
2012-08-20 15:05:47 -07:00
Jesse McConnell
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
Joakim Erdfelt
6311976e86
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-17 13:48:22 -07:00
Joakim Erdfelt
b36b41afd7
Fixing websocket-client upgrade connection -> websocket connection handling
2012-08-17 13:48:04 -07:00
Joakim Erdfelt
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
Jesse McConnell
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
Jesse McConnell
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
Joakim Erdfelt
9c63ed975e
Reworking client connection handling per discussion with simone
2012-08-14 09:44:21 -07:00
Joakim Erdfelt
1f78fc6250
Attempting to get client connection working
2012-08-13 13:59:46 -07:00
Simone Bordet
136f7924fd
Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle.
2012-08-10 19:02:16 +02:00
Joakim Erdfelt
b37da5a5da
Making payload fast-fail and demasking work together in peace and harmony
2012-08-09 13:17:07 -07:00
Greg Wilkins
03ebcc881c
jetty-9 include more modules
2012-08-09 19:31:50 +10:00
Joakim Erdfelt
889d20ba55
Removing throws IOException on WSConnection.close()
2012-08-08 12:42:57 -07:00
Joakim Erdfelt
0abb7511ff
Refactoring websocket.io.RawConnection to websocket.api.BaseConnection.
...
+ Introducing BaseConnection.SuspendToken and suspend/resume logic for
working with buffer suspended read concerns.
2012-08-08 12:30:12 -07:00
Joakim Erdfelt
1a62c5ded6
Fixing websocket example to use creator
2012-08-08 08:31:44 -07:00
Greg Wilkins
9c9668b112
ported websocketchat to new API
2012-08-08 16:08:47 +10:00
Greg Wilkins
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
Joakim Erdfelt
7ebab746fe
Reworking stream vs simple message appending into single concept.
...
+ Removing StreamAppender
+ Adding MessageAppender
+ Gain fast-fail on bad UTF8 in text message
2012-08-07 12:16:53 -07:00
Joakim Erdfelt
d76a5ce80e
Fixing testcase 7.5.1 (bad utf8 close reason) handling
2012-08-07 09:53:33 -07:00
Joakim Erdfelt
365f4d8448
Adding TestABCase9 with @Stress enabled
2012-08-06 13:55:55 -07:00
Joakim Erdfelt
b8fc39a53e
Adding the AB7 close test cases
2012-08-06 10:18:16 -07:00
Joakim Erdfelt
e04bb3128c
Refactoring out the basic good/bad UTF tests from TestABCase6 into separate parameterized test cases
2012-08-06 08:36:41 -07:00
Joakim Erdfelt
33270eced5
More valid UTF8 text payload edge cases
2012-08-03 12:49:03 -07:00
Joakim Erdfelt
a6d88f0d0f
Adding more Invalid UTF8 text payload tests
2012-08-03 12:35:16 -07:00
Joakim Erdfelt
951b669ba9
Adding more UTF8 text payload tests
2012-08-03 12:00:10 -07:00
Joakim Erdfelt
744bd20a44
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-03 09:37:58 -07:00
Simone Bordet
e3132d41d8
Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
...
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 18:35:34 +02:00
Joakim Erdfelt
03521a9a99
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-03 08:49:53 -07:00
Joakim Erdfelt
65cb453080
Attempting to come to terms with EofException condition
2012-08-03 08:49:48 -07:00
Greg Wilkins
5e6cd1b27f
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
2012-08-03 08:48:34 +10:00
Greg Wilkins
962a0d0889
jetty-9 ensure injected threadpool is managed
2012-08-03 08:44:49 +10:00
Joakim Erdfelt
9b49e889dd
Fixing big buffer flush issue (thanks simone)
2012-08-02 15:25:18 -07:00
Greg Wilkins
f6d84d9f91
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-08-03 06:33:26 +10:00
Joakim Erdfelt
000657ddb5
Fixing various Parser bugs identified by test cases
...
+ Mask bytes were read backwards during slow parse
+ Bad continuation frame detection added
+ Bad fragmented data frame detection added
+ Correcting WebSocketFrame copy constructor and FIN bit
2012-08-02 13:02:54 -07:00
Joakim Erdfelt
01c40b5290
Fixing Parsing of masking bytes on slow testcase (would read in reverse order under certain conditions)
2012-08-02 10:31:37 -07:00
Joakim Erdfelt
e2dd62a3af
Trying to work out masking issue with parser
2012-08-02 10:13:07 -07:00
Joakim Erdfelt
a638bbb850
Trying to work out why masking occasionally barfs
2012-08-02 09:53:13 -07:00
Greg Wilkins
0865a9cfb0
jetty-9 removed more AsyncConnection names
2012-08-02 18:10:29 +10:00
Greg Wilkins
b63e09df61
jetty-9 rudimentary connectionFactory impl
2012-08-02 17:44:29 +10:00
Greg Wilkins
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
Greg Wilkins
a4da8f2323
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-08-02 14:18:38 +10:00
Joakim Erdfelt
a8a3bade33
Setting @Ignore on tests with issues ATM
2012-08-01 19:45:14 -07:00
Greg Wilkins
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10:00
Joakim Erdfelt
3621bec43c
More AB tests, and updates to Fuzzer
2012-08-01 13:11:24 -07:00
Joakim Erdfelt
07929fee88
Fleshing out more fragment tests
2012-08-01 10:46:15 -07:00
Joakim Erdfelt
7c742ee4e8
More AB tests around bad/reserved opcodes
2012-08-01 09:59:50 -07:00
Joakim Erdfelt
ab89924261
Fleshing out more AB case 4 tests
2012-07-31 15:24:33 -07:00
Joakim Erdfelt
a97fe106f9
Reworking OpCode from enum to static class
2012-07-31 15:15:21 -07:00
Joakim Erdfelt
9a568514a6
More AB testing, reworked for Fuzzer
2012-07-31 12:52:22 -07:00
Joakim Erdfelt
7d2d40dc2b
Fixing PING vs CLOSE ordering issues with outgoing queue
2012-07-30 14:51:34 -07:00
Joakim Erdfelt
30ae8370bd
Fixing BlockheadClient and reading of frames
2012-07-30 12:40:01 -07:00
Joakim Erdfelt
f34d74ec84
Some logging rework/repair
2012-07-30 12:39:30 -07:00
Joakim Erdfelt
9999db9c94
Fixing WebSocketAsyncConnection close/read logic to prevent unstoppable QTP threads
2012-07-30 09:54:45 -07:00
Joakim Erdfelt
da2b457eaa
Fixing compile issue
2012-07-30 05:38:51 -07:00
Joakim Erdfelt
c2aae7c517
Attempting to come to grips with proper close/disconnect/stop/cleanup
2012-07-27 13:48:34 -07:00
Joakim Erdfelt
f2c86b2d00
Adding close validation to TestABCase1
2012-07-27 10:52:46 -07:00
Joakim Erdfelt
99afabdf92
Finished fleshing out TestABCase1
2012-07-27 10:24:35 -07:00
Joakim Erdfelt
47f882e6dc
Fixing various things around generate/parse of windowed fragments.
...
+ @WebSocket annotation's policy configuraiton is now optional
+ WebSocketPolicy.clonePolicy() fixed for other fields
+ WebSocketEventDriver now has internal WebSocket POJO specific logger
to allow for logging control of the WebSocket POJO itself in case of
runtime exceptions.
+ WebSocketEventDriver now honors bufferSize correctly.
+ DataFrameBytes always requests windowSize from generator, allowing
generator to determine ultimate byteBuffer utilization itself.
+ MessageInputStream / MessageReader now clears the starting buffer
+ Generator now honors windowSize correctly (even if buffer obtained
from ByteBufferPool.acquire() is much larger
+ Parser now demasks the payload after a successful parse of the framing
+ Various testing cleanup to produce less noisy output during testing.
2012-07-27 09:41:26 -07:00
Joakim Erdfelt
cbcb76eaea
More spec tests from server point of view
2012-07-26 15:45:54 -07:00
Joakim Erdfelt
db2570c2ee
380928 - Implement new websocket close code
2012-07-26 10:30:12 -07:00
Joakim Erdfelt
b3db5ffc8d
Fixing websocket-server tests
2012-07-25 11:49:04 -07:00
Joakim Erdfelt
6fa2f67a96
Updates for Extensions
...
+ Extensions now report to Generator their requirements for
RSV1, RSV2, RSV3
+ DeflateFrameExtension now reports RSV1 use.
+ DeflateFrameExtension reads uncompressed data properly now.
+ Unit tests for small/medium/large payloads on DeflateFrameExtension
+ OutgoingFrames.output() method now has non-optional throws IOException
2012-07-25 11:04:38 -07:00
Joakim Erdfelt
78b16d38f5
Adding more to AllTests
2012-07-25 09:35:12 -07:00
Joakim Erdfelt
e46cc961ac
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-25 09:16:10 -07:00
Joakim Erdfelt
a49238ceba
Removing FragmentExtension's minFragments config.
...
+ The minFragments configuration appears to work on the message,
not the fragments, so its was removed as inappropriate for the
level of the protocol the FragmentExtension works on.
2012-07-24 13:21:35 -07:00
Joakim Erdfelt
36360ae1d2
Adding initial tests for FragmentExtension
2012-07-24 11:47:25 -07:00
Simone Bordet
822abe514e
Jetty9 - Improved idle timeout handling.
...
Idle timeouts are not enforced anymore by polling the AsyncEndPoints from the SelectorManager,
but instead the AsyncEndPoints now take a SchedulerExecutorService as parameter and perform
their own enforcing of the idle timeout.
Also removed a few Timer usages (replaced by SchedulerExecutorService) and fixed XML files
referencing old APIs.
2012-07-24 10:38:28 +02:00
Joakim Erdfelt
9c4a8df8af
Adding test for deflate-frame extension receiving non-compressed frames
2012-07-23 13:56:41 -07:00
Joakim Erdfelt
93b5d97379
Full core testing of DeflateFrameExtension
...
+ Renaming FrameParserCapture -> IncomingFramesCapture
+ Adding OutgoingFramesCapture
+ Fixing DeflateFrameExtension of small payloads
2012-07-23 13:52:08 -07:00
Simone Bordet
d2a0cb5c50
Jetty9 - Fixed compilation problems.
2012-07-23 15:38:27 +02:00
Simone Bordet
6b4583b461
Jetty9 - Introduced a onReadTimeout() callback and refactored into AbstractAsyncConnection.onOpen() calls to onFillInterested() that were previously done by all subclasses.
2012-07-23 14:27:33 +02:00
Joakim Erdfelt
b5d23b1c64
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-20 07:00:17 -07:00
Simone Bordet
6aba6d1e8c
Jetty9 - Refactored SelectorManager and SelectChannelEndPoint.
...
Simplified Selectable interface, and improved idle timeout checking.
2012-07-20 13:04:28 +02:00
Joakim Erdfelt
f58182d2ab
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-19 14:10:15 -07:00
Joakim Erdfelt
4af5a10b29
Working out bug in client parsing of lots of messages
2012-07-19 14:10:07 -07:00
Simone Bordet
dfeb761306
Jetty9 - Now calling SelectorManager.newConnection() from a single call site rather than having to duplicate the call in every newEndPoint() implementation.
2012-07-19 18:43:23 +02:00
Joakim Erdfelt
796e240545
Fixing aggregate message echo test
2012-07-18 13:23:07 -07:00
Joakim Erdfelt
1c77ef0723
Fixing bad generator.generate() assumptions on output bytebuffer state
2012-07-18 12:36:42 -07:00
Joakim Erdfelt
b0e475f09c
Fixing invalid statuscode error that shouldn't be thrown on no-status code
2012-07-18 12:36:14 -07:00
Joakim Erdfelt
fae2e0d48e
No longer need to flip output of Generator.generate()
2012-07-18 12:23:04 -07:00
Joakim Erdfelt
f8e72803a6
Fixing expectations in unit tests
2012-07-18 12:22:16 -07:00
Jesse McConnell
960491cc64
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-18 14:01:42 -05:00
Joakim Erdfelt
964fa9325a
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-18 11:51:38 -07:00
Joakim Erdfelt
0060a32bc5
Adding test of windows generator with masking
2012-07-18 11:51:22 -07:00
Joakim Erdfelt
58e181f463
Making Generator and WebSocketFrame collaborate to allow for windowed buffer creation
2012-07-18 11:36:30 -07:00
Simone Bordet
ebb7806edc
Jetty9 - Implemented abstract methods on SelectorManager that were always implemented in the same way, making them consistent.
2012-07-18 19:47:10 +02:00
Joakim Erdfelt
51e77c93f3
Adding testcase for windowed Generator
2012-07-18 09:44:55 -07:00
Joakim Erdfelt
6350470e3f
Coming to grips with windowed write
2012-07-18 09:36:16 -07:00
Jesse McConnell
c0e80e6ff9
comments on the generate() method
2012-07-18 10:54:00 -05:00
Joakim Erdfelt
99e7b9becc
Fixing mid-message ping/pong support
2012-07-17 11:50:53 -07:00
Joakim Erdfelt
4aa54d244a
Working out some fallout of the Session split
2012-07-17 11:20:18 -07:00
Joakim Erdfelt
6ece593c58
Fixing expectations of internal impl now that WebSocketSession exists
2012-07-17 10:15:11 -07:00
Joakim Erdfelt
249595882c
Wiring up extension chain on server side
2012-07-17 10:09:25 -07:00
Joakim Erdfelt
c84df9bf2b
Adding test suite for quick testing
2012-07-16 16:08:00 -07:00
Joakim Erdfelt
6c0e24485a
Splitting out new WebSocketSession from WebSocketAsyncConnection to better support extensions (see diagrams)
2012-07-16 15:49:12 -07:00
Joakim Erdfelt
10eeb3f6cf
Fixing typo [1]
2012-07-16 12:04:43 -07:00
Joakim Erdfelt
851b53ec3a
Adding diagrams to javadoc about communications stack (and extensions)
2012-07-16 11:58:27 -07:00
Jesse McConnell
136514948f
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:24:49 -05:00
Jesse McConnell
1bbc677a09
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
2012-07-16 13:24:42 -05:00
Jesse McConnell
f755d014cd
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:23:59 -05:00
Jesse McConnell
04b7e807a0
[maven-release-plugin] prepare release jetty-7.6.5.v20120716
2012-07-16 13:23:53 -05:00
Jesse McConnell
c00bb2d6ca
reset for release
2012-07-16 12:55:22 -05:00
Jesse McConnell
f59b2a0632
reset release
2012-07-16 12:54:36 -05:00
Joakim Erdfelt
1381ee4eeb
Adding copy constructor
2012-07-16 09:55:00 -07:00
Joakim Erdfelt
1cf2035580
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-16 09:32:38 -07:00
Joakim Erdfelt
5bf71f5125
Support reponse forbidden better
2012-07-16 09:32:25 -07:00
Jesse McConnell
205e8f74f0
[maven-release-plugin] prepare for next development iteration
2012-07-13 10:20:48 -05:00
Jesse McConnell
c3b5269d60
[maven-release-plugin] prepare release jetty-8.1.5.v20120713
2012-07-13 10:20:23 -05:00
Jesse McConnell
12ecc10c6a
[maven-release-plugin] prepare for next development iteration
2012-07-13 09:35:08 -05:00
Jesse McConnell
bf40110fb8
[maven-release-plugin] prepare release jetty-7.6.5.v20120713
2012-07-13 09:34:52 -05:00
Greg Wilkins
acbf20af27
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
...
Conflicts:
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
2012-07-13 22:59:05 +10:00
Greg Wilkins
e70df19248
jetty-9 progress on more unit tests
2012-07-13 22:55:40 +10:00
Joakim Erdfelt
fc658c3805
Fixing NPE
2012-07-12 11:29:40 -07:00
Joakim Erdfelt
b0549d8bf9
Introducing IncomingFrames and OutgoingFrames interfaces for everything to use, including Extensions
2012-07-12 11:21:35 -07:00
Joakim Erdfelt
f4c0b376d6
Removing discouraged form of Generator constructor
2012-07-11 13:08:02 -07:00
Jesse McConnell
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05:00
Joakim Erdfelt
03fa76d333
Adding more TODOs
2012-07-11 12:01:02 -07:00
Joakim Erdfelt
be0c372cad
Moving Parser and Generator into .protocol. package
2012-07-11 11:59:03 -07:00
Joakim Erdfelt
9986f43272
Fixing license headers
2012-07-11 11:57:31 -07:00
Joakim Erdfelt
d3a7ddbef0
Fixing license headers
2012-07-11 11:53:19 -07:00
Joakim Erdfelt
d7f3bbb260
Fixing build issue
2012-07-11 11:43:12 -07:00
Joakim Erdfelt
6757160a94
Starting to piece together the Extensions
2012-07-11 11:42:26 -07:00
Jesse McConnell
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
Joakim Erdfelt
0d1fee5906
Making BlockHeadClient timeouts more sane
2012-07-11 09:53:18 -07:00
Joakim Erdfelt
d3b599d67c
Attempting to get timeouts working
2012-07-11 09:47:10 -07:00
Joakim Erdfelt
c8821605fe
Fixing fill interested
2012-07-11 09:33:58 -07:00
Jesse McConnell
0fa17c13b1
Merge branch 'master' into jetty-8
2012-07-11 10:10:00 -05:00
Joakim Erdfelt
3ab8a0e5b7
Adding support to detect bad UTF-8 text message
2012-07-10 15:03:47 -07:00
Joakim Erdfelt
8aa6e5db9b
Fixing WebSocketAsyncConnection.write() of byte[] arrays
2012-07-10 14:45:37 -07:00
Joakim Erdfelt
4fd7ff76fb
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-10 14:34:05 -07:00
Joakim Erdfelt
eb07c173ca
Fixing some server tests
2012-07-10 14:33:50 -07:00
Jesse McConnell
c0b1261c2b
come back from parseFrame in order to notify
2012-07-10 16:32:57 -05:00
Joakim Erdfelt
5d796488e2
Fixing logging format specifier bug
2012-07-10 14:07:04 -07:00
Joakim Erdfelt
1f25e9cee1
Setting client tests to @Ignore
2012-07-10 14:03:11 -07:00
Joakim Erdfelt
23ecb2e29c
Fixing build
2012-07-10 13:44:09 -07:00
Joakim Erdfelt
6f52b23735
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-10 13:41:56 -07:00
Joakim Erdfelt
2f5c40bbf9
Making changes for WebSocketFrame builder
2012-07-10 13:41:50 -07:00
Jesse McConnell
ea68a3de83
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-10 15:36:09 -05:00
Jesse McConnell
bc4086491b
merge frame parser and actual parser
2012-07-10 15:35:51 -05:00
Joakim Erdfelt
e5883607ce
Adding scheduler to factory
2012-07-10 12:33:41 -07:00
Jesse McConnell
3ede05e134
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-10 14:25:35 -05:00
Jesse McConnell
9488507919
updated unit tests
2012-07-10 14:25:16 -05:00
Joakim Erdfelt
95e540fd27
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-10 12:20:50 -07:00
Joakim Erdfelt
3d39d0a916
Updating tests for WebSocketFrame
2012-07-10 12:20:40 -07:00
Jesse McConnell
d358847d5e
updated unit tests
2012-07-10 14:20:26 -05:00
Jesse McConnell
b3d7dd4f1b
adding constructors
2012-07-10 14:17:57 -05:00
Joakim Erdfelt
8d583045b3
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-10 12:16:58 -07:00
Joakim Erdfelt
ef69b22815
Fixing WebSocketFrame.setPayload(byte[]) bug, updating more tests
2012-07-10 12:16:47 -07:00
Jesse McConnell
4fed53ce85
test improvement
2012-07-10 14:13:09 -05:00
Joakim Erdfelt
b46ba628cd
Adding UnitGenerator and migrating more tests cases to WebSocketFrame
2012-07-10 12:05:03 -07:00
Joakim Erdfelt
f97d86894a
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-10 11:53:19 -07:00
Joakim Erdfelt
cd0edafa68
Fixing build issue
2012-07-10 11:53:10 -07:00
Jesse McConnell
8c6820a812
update to use latest changes on frame
2012-07-10 13:52:27 -05:00
Joakim Erdfelt
d6139b8978
Adding convenience statics to WebSocketFrame (useful stuff from FrameBuilder)
2012-07-10 11:48:53 -07:00
Joakim Erdfelt
caf693488a
Removing FrameBuilder
2012-07-10 11:44:17 -07:00
Joakim Erdfelt
c2f1d23f2b
Making WebSocketFrame use builder pattern
2012-07-10 11:12:10 -07:00
Joakim Erdfelt
20876011e0
Working in FrameBytes queue and timeout task
2012-07-10 10:41:47 -07:00
Joakim Erdfelt
8de2cc6805
Fixing parser
2012-07-10 10:19:38 -07:00
Jesse McConnell
9d2968d781
null check on payload
2012-07-10 08:55:15 -05:00
Jesse McConnell
3754f9e04c
most tests compiling again
2012-07-10 08:53:10 -05:00
Jesse McConnell
dc3ad1f3d5
clean up aftereffects of byte[] -> ByteBuffer switch in WebSocketFrame internals
2012-07-10 08:33:19 -05:00
Joakim Erdfelt
057acfd665
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-09 16:37:00 -07:00
Joakim Erdfelt
85b5d3456f
More work to flesh out the FrameBytes concept from SPDY within the scope of WebSocket with an eye on physical vs virtual connections
2012-07-09 16:36:54 -07:00
Joakim Erdfelt
5f6d7ec596
Refactoring out the byte[] array in favor of ByteBuffer in frame (to reduce number of data copies)
2012-07-09 15:26:05 -07:00
Jesse McConnell
4a1f50c7a6
switch generator to use bytebuffer again and wire pool back in, update frame builder to use static internal pool for time being, remove FrameGenerator
2012-07-09 17:20:58 -05:00
Joakim Erdfelt
3ae9548c43
Another review refact (in progress)
2012-07-09 14:42:59 -07:00
Joakim Erdfelt
6a0e3f6c72
Moving old tests to new structure
2012-07-09 09:32:37 -07:00
Joakim Erdfelt
c4029ba5df
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 15:53:56 -07:00
Joakim Erdfelt
7a35ea9c75
Moving more tests cases over
2012-07-06 15:53:41 -07:00
Jesse McConnell
db83405218
add comments re: rfc6455 for frame generator validation
2012-07-06 17:41:54 -05:00
Jesse McConnell
3797508f8e
switched method to add reason
2012-07-06 17:29:58 -05:00
Jesse McConnell
b4cf61bc7d
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 17:26:02 -05:00
Jesse McConnell
889a471420
rejigger frame builder to use the generator and pull generator validation logic into assertFrameValid method
2012-07-06 17:25:58 -05:00
Joakim Erdfelt
5d9eab45b4
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 15:09:27 -07:00
Jesse McConnell
27b05ccd6e
fix protocol exception regarding control frames and FIN=false
2012-07-06 17:09:05 -05:00
Joakim Erdfelt
87ca4eb25b
Fixing build issues
2012-07-06 15:09:03 -07:00
Joakim Erdfelt
c24b7d83e6
Fixing close handling
2012-07-06 15:03:07 -07:00
Joakim Erdfelt
137c6c3f2e
Removing ByteBufferAssert
2012-07-06 14:55:03 -07:00
Joakim Erdfelt
3e24e8290f
Minor fix of logging
2012-07-06 14:52:44 -07:00
Jesse McConnell
8b6ec0194b
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 16:48:50 -05:00
Jesse McConnell
b2cdc2bdb0
update test
2012-07-06 16:48:39 -05:00
Joakim Erdfelt
2af10cebab
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 14:46:16 -07:00
Joakim Erdfelt
d20b277924
Fixing test case build error
2012-07-06 14:46:05 -07:00
Joakim Erdfelt
8a43e2c6fc
Fixing test case build error
2012-07-06 14:45:09 -07:00
Jesse McConnell
3bebb2e0a4
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 16:45:05 -05:00
Jesse McConnell
af42702a27
update test
2012-07-06 16:45:00 -05:00
Joakim Erdfelt
cd27d7bf29
Removing CloseUtil in favor of CloseInfo
2012-07-06 14:37:57 -07:00
Joakim Erdfelt
cefeab8a65
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 14:36:14 -07:00
Joakim Erdfelt
f52c28f128
Fixing last of the test failures
2012-07-06 14:35:46 -07:00
Jesse McConnell
44f0253bdb
add warning to frame builder
2012-07-06 16:33:14 -05:00
Joakim Erdfelt
f21f0433e0
Fixing AB2.5
2012-07-06 14:23:39 -07:00
Joakim Erdfelt
e29b372604
Trying to fix AB2.5
2012-07-06 14:15:50 -07:00
Joakim Erdfelt
48a8077723
Fixing large frame test
2012-07-06 14:07:05 -07:00
Joakim Erdfelt
1a55c2fa44
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 14:06:08 -07:00
Joakim Erdfelt
f1be381866
Fixing policy
2012-07-06 14:05:58 -07:00
Jesse McConnell
7f102e7204
fixed test
2012-07-06 16:03:48 -05:00
Joakim Erdfelt
2f3937687d
Fixing EMPTY payload parsing issue
2012-07-06 14:01:35 -07:00
Jesse McConnell
fc8198e854
fixing a test issue
2012-07-06 15:56:04 -05:00
Jesse McConnell
c7cff443be
fixing a test issue
2012-07-06 15:55:09 -05:00
Joakim Erdfelt
b39a6a6f59
Fixing more tests
2012-07-06 13:49:47 -07:00
Joakim Erdfelt
071f15e0c9
Fixing tests
2012-07-06 13:43:42 -07:00
Joakim Erdfelt
cbfe922fe1
Fixing build errors
2012-07-06 13:40:23 -07:00
Joakim Erdfelt
a5424e65e3
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 13:37:25 -07:00
Joakim Erdfelt
eb9a6ecbfb
Fixing more parser tests
2012-07-06 13:37:11 -07:00
Jesse McConnell
c814772fc0
reorder tests
2012-07-06 15:33:39 -05:00
Jesse McConnell
eed8db7340
updates to unit tests
2012-07-06 15:28:46 -05:00
Joakim Erdfelt
8d0d3adcf9
Fixing FrameBuilder (and test)
2012-07-06 13:25:55 -07:00
Joakim Erdfelt
97cf0e37a9
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 13:21:15 -07:00
Joakim Erdfelt
557de7b708
Fixing more tests
2012-07-06 13:16:21 -07:00
Jesse McConnell
285701f98e
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 15:16:19 -05:00
Jesse McConnell
5973335f28
frame builder length test
2012-07-06 15:15:59 -05:00
Joakim Erdfelt
6e2c45fa47
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 13:08:11 -07:00
Joakim Erdfelt
4d020de810
Fixing parser
2012-07-06 13:07:58 -07:00
Jesse McConnell
79a1de1ad9
udpated binary tests
2012-07-06 14:41:49 -05:00
Jesse McConnell
854e056772
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 14:11:44 -05:00
Jesse McConnell
85982199e7
parsing tests showing issue
2012-07-06 14:11:33 -05:00
Joakim Erdfelt
3c8206e6bf
Adding CloseInfo (to replace CloseUtil)
2012-07-06 12:11:27 -07:00
Joakim Erdfelt
c1f4dbbfec
Replacing WebSocketFrame.ByteBuffer with byte[] array
2012-07-06 11:58:45 -07:00
Joakim Erdfelt
c2872ff556
Renaming .frames.BaseFrame to .protocols.WebSocketFrame
2012-07-06 11:33:26 -07:00
Joakim Erdfelt
dfc9315bc7
Next step in simplifying the frames
2012-07-06 11:32:22 -07:00
Joakim Erdfelt
b515e845cc
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 11:01:33 -07:00
Jesse McConnell
3bd5ad1746
adding close util
2012-07-06 13:00:20 -05:00
Joakim Erdfelt
521e9371a6
Removing javadoc links to frame classes (being removed)
2012-07-06 10:55:53 -07:00
Jesse McConnell
100d1ee5d5
merge
2012-07-06 12:25:32 -05:00
Jesse McConnell
748c9b6305
core compiling but failing tests so I can work with joakim on reducing to one core frame
2012-07-06 12:23:10 -05:00
Joakim Erdfelt
70ff05e955
WebSocketAsyncConnection.write() with byte[] array fails occasionally
2012-07-06 10:22:41 -07:00
Joakim Erdfelt
84fa1163e9
Fixing write of byte buffer
2012-07-06 10:06:05 -07:00
Joakim Erdfelt
ae56940796
Moving more tests to new structure
2012-07-06 09:47:11 -07:00
Joakim Erdfelt
4fadeb6b4a
Reenabling message echo
2012-07-06 09:46:53 -07:00
Joakim Erdfelt
4e6a3dd2fd
Making BlockheadClient a bit more friendly for debugging
2012-07-06 09:46:30 -07:00