73fd838b41
Addressing WebSocket server side disconnect issue that autobahn found
2013-06-21 12:10:06 -07:00
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -07:00
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
43867ff075
Reworking SSL tests
2013-06-18 08:37:16 -07:00
a6ef027232
Finish reverting change to ServletUpgradeRequest from websocket-ssl branch that was missed
2013-06-18 07:05:35 -07:00
be2cf578ce
400503 - WebSocket - squelch legitimate Exceptions during testing to avoid false positives
2013-06-17 16:34:21 -07:00
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
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
5c7f6937fd
Giving a different test more time to complete on busy machines
2013-06-14 14:12:04 -07:00
64a6d6f0bb
Giving test more time to complete on busy machines
2013-06-14 13:45:24 -07:00
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
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
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
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
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
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
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
b01e6432a5
Merge branch 'master' into javawebsocket-jsr
2013-06-05 10:20:50 -07:00
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
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
598ecd7d7f
Merge branch 'master' into javawebsocket-jsr
2013-05-22 09:25:06 -07:00
dd3a918136
408118 - NullPointerException when parsing request cookies
...
+ Added NPE guard for non-Jetty containers.
2013-05-21 11:34:56 -07:00
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
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
b22d280e2a
398467 Servlet 3.1 Non Blocking IO
...
Cleaned up exceptions and HttpOutput.write
2013-05-16 19:00:00 +10:00
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
6d73ab86dd
Using released version of test-helper
2013-05-10 14:35:14 -07:00
ce0435e099
Cleaning up test output
2013-05-09 14:29:59 -07:00
9f82849900
Merge from [master] to [javawebsocket-jsr]
2013-05-09 12:10:57 -07:00
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
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
9ad5ab1ed5
406449 - Session's disconnect not detected
...
+ Vastly cleaned up IOState and ConnectionState behavior
2013-04-30 15:54:41 -07:00
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
c91c3f2f60
JSR-356: adding WebSocketConfiguration and reworking ServerContainer init
2013-04-24 14:33:46 -07:00
a4644dc780
JSR-356 working out server endpoint creation
2013-04-23 11:06:01 -07:00
9463eee427
Merge branch 'master' into javawebsocket-jsr
2013-04-19 09:25:03 -07:00
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
d34bd7aec7
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-18 12:16:24 +10:00
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
e390b54b25
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
2013-04-17 11:46:31 -05:00
8088edc96c
Merge branch 'master' into javawebsocket-jsr
2013-04-15 12:12:25 -07:00
0b20467c6f
[maven-release-plugin] prepare for next development iteration
2013-04-15 11:40:45 -05:00
3aa4301711
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
2013-04-15 11:40:37 -05:00
07b844bf85
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-11 15:55:04 +10:00
e0d353629f
JSR-356 - updates to Session tracking and start of PathMappings
...
+ Refactored websocket-commons Session creation to be factory based
+ Introduced new org.eclipse.jetty.websocket.common.SessionFactory
+ Made websocket-client and websocket-server use new SessionFactory
+ Introduced JsrSessionFactory to allow for consistent Session creation
even in the Jsr (no more duplciate Session creation)
+ Using JsrSessionFactory in javax-websocket-client-impl
+ Introducing PathMappings to hopefully replace jetty-util's PathMap
+ Using standard ClientEndpointConfig when appropriate.
+ Introducing JettyClientEndpointConfig for annotation based
configurations
+ Renaming EchoSocket used in javax.websocket client testing to
JettyEchoSocket to better indicate that its the Jetty server side
implementation and not the javax.websocket client side socket.
+ Changed IncomingFrames.incomingError() parameter from
WebSocketException to Throwable to match behavior on the JSR
2013-04-09 11:21:59 -07:00
b8dd8bde14
[maven-release-plugin] prepare for next development iteration
2013-04-08 12:31:34 +10:00
bf3771904b
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
2013-04-08 12:30:59 +10:00
4dea484853
Merge branch 'master' into javawebsocket-jsr
2013-04-04 12:03:30 -07:00
d1692733f5
JSR-356: MessageHandler(s) layer
2013-04-04 12:03:11 -07:00
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
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
0bab7b2c6d
reverting dispatched session open
2013-03-22 13:18:02 -07:00
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
54fd961354
403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout
2013-03-22 13:18:02 -07:00
04d86bd49e
402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request
2013-03-22 13:18:02 -07:00
bfb92dc18b
reverting dispatched session open
2013-03-21 07:13:16 -07:00
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
dd4394aa77
403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout
2013-03-19 12:05:29 -07:00
4d52c3ca8e
402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request
2013-03-19 11:28:23 -07:00
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
fd8f2b9753
Merge from [master] -> [javawebsocket-jsr]
2013-03-11 10:57:08 -07:00
897c35c2cb
[maven-release-plugin] prepare for next development iteration
2013-03-08 11:33:23 -07:00
cc6196af50
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
2013-03-08 11:33:15 -07:00
7fc38f6c0f
[maven-release-plugin] prepare for next development iteration
2013-03-07 19:14:19 -07:00
96d045442f
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
2013-03-07 19:14:11 -07:00
778ee1411b
[maven-release-plugin] prepare for next development iteration
2013-03-06 10:21:46 -06:00
d916078711
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
2013-03-06 10:21:38 -06:00
94756a42c3
[maven-release-plugin] prepare for next development iteration
2013-03-01 16:08:32 -07:00
96dabe7e62
[maven-release-plugin] prepare release jetty-9.0.0.RC3
2013-03-01 16:08:24 -07:00
c267c1a9d0
[maven-release-plugin] prepare for next development iteration
2013-03-01 10:26:43 -07:00
ba15fe04e2
[maven-release-plugin] prepare release jetty-9.0.0.RC3
2013-03-01 10:26:34 -07:00
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
c4af34d4e1
Adding smaller example of the WebSocketCreator use
2013-02-27 08:54:01 -07:00
370bdafc15
Reverting direct ByteBuffer commits
...
+ Reverting commit : 5621f87c81bbcf0c77b8
2013-02-26 10:41:40 -07:00
29b2118870
[maven-release-plugin] prepare for next development iteration
2013-02-26 09:20:45 -07:00
2b82b54f6d
[maven-release-plugin] prepare release jetty-9.0.0.RC2
2013-02-26 09:20:45 -07:00
bbcf0c77b8
Switching to direct ByteBuffers
2013-02-23 16:44:49 -07:00
5621f87c81
Switching to direct ByteBuffers
2013-02-23 16:44:49 -07:00
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
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
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
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
4dc3ed38c2
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
ed24f78498
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:36 -07:00
e073ceb06d
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
2f2ad287af
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:35 -07:00
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
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
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
1480f3d8fc
399669 - Remove WebSocketConnection in favor of websocket.api.Session
2013-01-31 12:09:04 -07:00
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
60088fa274
399515 - Websocket-client connect issues should report to websocket onError handlers
2013-01-30 12:15:15 -07:00
5e8aa4eeb3
399421 - Add websocket.api.Session.disconnect() for harsh low level connection disconnect
2013-01-29 15:56:30 -07:00
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
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
7adc77a5d5
Adding -tests classifier artifacts to deploy/release to aide in quickstart documentation
2013-01-25 12:19:17 -07:00
2e216dddb7
Consolidating WebSocketPolicy.setMax*Size() into single setMaxMessageSize()
2013-01-18 09:27:56 -07:00
b938245b14
Adding some javadoc, cleaning up package namespaces where appropriate
2013-01-17 15:41:33 -07:00
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
eff1262e49
398105 - Clean up WebSocketPolicy
2013-01-16 15:11:56 -07:00
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
5b7c19e38d
Reducing test logging noise by squelching stack traces in test cases where they are expected
2012-12-21 14:22:10 -07:00
ca1c3db642
Removing WriteResult class
2012-12-14 16:12:48 -07:00
e308f843db
Replacing FrameBytes tree with WriteBytesProvider class
2012-12-14 16:12:48 -07:00
ecb472f30b
Introducing WriteBytesProvider
2012-12-14 16:12:48 -07:00
c8c15a4063
Removing test for inputClosed on BlockheadClient to fix test failure.
2012-12-13 13:28:05 -07:00
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
bf3c5c7922
add in some handshake state tracking into IOState to help track who initiated closes
2012-12-13 12:18:30 -06:00
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
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
a2a5a97bfe
add some methods to the ServletWebSocketRequest and rename one method
2012-12-10 12:16:06 -06:00
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
3e151901bf
jetty-9 Use public HttpField
2012-12-08 01:41:01 +11:00
a20d984d30
jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap
2012-12-08 01:41:00 +11:00
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
11cbe274af
395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x
2012-11-28 16:55:13 -07:00
acaeb7663a
Making sure websocket server tests validate Sec-WebSocket-Accept on response headers
2012-11-27 12:40:28 -07:00
f89909e301
jetty-9 cleaning up dependencies
2012-11-23 16:25:57 +11:00
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
97d2130a8f
jetty-9 no debugging checked in
2012-11-19 15:08:53 +11:00
169498cd9d
Fixing Frame Decompress to work in Chrome 20.x
2012-11-12 20:52:54 -07:00
d67fdfdd85
Splitting out websocket-servlet to make it more friendly for WebAppClassloader
2012-11-12 19:42:32 -07:00
42ec683297
Merge from 'master' to 'ws-refactor'
2012-11-12 16:22:11 -07:00
80f5fa1a18
Attempting to get Mux sub-channel to flow thru server as well
2012-11-12 16:02:41 -07:00
dd0b1a39b8
Stubbing out mux client/server specific pieces
2012-11-12 16:02:41 -07:00
884f1a3eff
New ExtensionStack to manage Extensions easier and more consistently
2012-11-12 16:02:05 -07:00
8548331735
Ripping out javax.net.websocket.extension.* SPI as it is going away
2012-11-12 12:36:39 -07:00
9be64bab11
Making changes to client / server from api / common
2012-11-06 16:58:54 -07:00
414f964afd
Making changes to client / server from api / common
2012-11-06 16:58:49 -07:00
000cfe6986
Fixing UpgradeRequest / UpgradeResponse hierarchy.
2012-11-06 15:45:13 -07:00
17c6e04f47
Making rest of the modules use websocket-common (instead of old websocket-core)
2012-11-05 17:58:06 -07:00
e310b0a0ec
Attempting to get Mux sub-channel to flow thru server as well
2012-11-02 11:20:36 -07:00
2a2215cf0b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2012-11-02 16:59:11 +11:00
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
88ed9ff710
Stubbing out mux client/server specific pieces
2012-11-01 13:43:33 -07:00
c49563244c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2012-10-30 19:18:20 +11:00
add3c2b381
392237 improved names and examples for documentation
2012-10-29 17:59:39 +11:00
958d0c6949
Start incorporating (EDR version) servlet 3.1 spec
2012-10-27 17:38:43 +11:00
3e2aee293e
Cleaning up close handshake and noisy tests
2012-10-23 12:16:29 -07:00
2b13648b0e
392237 fixed many TODOs and many minor code cleanups
2012-10-19 16:17:30 +11:00
f5d3fec4f8
jetty-9 removed context deployer and merged context and webapps directory
2012-10-15 22:05:33 +11:00
3c59cf90d0
Refactoring compression based extensions to use a common set of DEFLATE processes
2012-10-12 14:55:25 -07:00
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
20317fffeb
Fixing stacktrace noise on tests
2012-10-10 11:35:19 -07:00
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
54e9c312ab
Removing old handshake
2012-10-10 11:11:45 -07:00
d23215f3f4
Bug 391140 - Implement x-webkit-deflate-frame extension as-used by Chrome/Safari
2012-10-04 10:11:50 -07:00
c8fe5c18ec
Making WebSocketServlet and WebSocketHandler both use same technique to configure
2012-09-27 12:38:33 -07:00
cda1c4588f
Reworking EventDriver to be mroe generic and not use reflection in 100% of cases
2012-09-26 13:43:17 -07:00
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
1cfa277c6c
jetty-9 osgi support
2012-09-24 13:04:57 +08:00
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
40382bad3a
jetty-9 - Removed references to JUnit 3.x.
2012-09-20 18:23:02 +02:00
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
e0e8708932
Updating Fuzzer for ignoring broken pipe issues when appropriate
2012-09-17 14:04:33 -07:00
0a5d32eb2f
jetty-9 - Removed unneeded 20 ms wait.
2012-09-17 21:49:19 +02:00
6e9567d410
jetty-9 - Using longer timeouts when expecting results.
2012-09-17 21:49:18 +02:00
92c95584fa
jetty-9 - Set default timeout for expect() to be 5 s.
2012-09-17 21:49:18 +02:00
129583679a
jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector
2012-09-17 17:37:56 +10:00
5ebc784b45
cleaning up test logging output
2012-09-14 14:41:03 -07:00
c7404731c9
Starting removal of WebSocketPolicy.getBufferSize()
2012-09-14 10:41:11 -07:00
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
4f36513744
More work around close handshake testing
2012-09-04 14:53:34 -07:00
c3776764f4
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:24:36 +10:00
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
cb5dd493fb
jetty-9 merged jetty-9-aggregation
2012-08-27 10:24:34 +10:00
726898ffd8
jetty-9 fixed after merged
2012-08-24 20:39:03 +10:00
171ad66962
Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 12:20:44 +02:00
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
dc140f85b7
Jetty9 - Refactored HttpChannel: moved connection logic back to HttpConnection.
2012-08-21 15:09:54 +02:00
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
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
b36b41afd7
Fixing websocket-client upgrade connection -> websocket connection handling
2012-08-17 13:48:04 -07:00
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
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
b37da5a5da
Making payload fast-fail and demasking work together in peace and harmony
2012-08-09 13:17:07 -07:00
03ebcc881c
jetty-9 include more modules
2012-08-09 19:31:50 +10:00
889d20ba55
Removing throws IOException on WSConnection.close()
2012-08-08 12:42:57 -07:00
1a62c5ded6
Fixing websocket example to use creator
2012-08-08 08:31:44 -07:00
9c9668b112
ported websocketchat to new API
2012-08-08 16:08:47 +10:00
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
d76a5ce80e
Fixing testcase 7.5.1 (bad utf8 close reason) handling
2012-08-07 09:53:33 -07:00
365f4d8448
Adding TestABCase9 with @Stress enabled
2012-08-06 13:55:55 -07:00
b8fc39a53e
Adding the AB7 close test cases
2012-08-06 10:18:16 -07:00
e04bb3128c
Refactoring out the basic good/bad UTF tests from TestABCase6 into separate parameterized test cases
2012-08-06 08:36:41 -07:00
33270eced5
More valid UTF8 text payload edge cases
2012-08-03 12:49:03 -07:00
a6d88f0d0f
Adding more Invalid UTF8 text payload tests
2012-08-03 12:35:16 -07:00
951b669ba9
Adding more UTF8 text payload tests
2012-08-03 12:00:10 -07:00
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
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
962a0d0889
jetty-9 ensure injected threadpool is managed
2012-08-03 08:44:49 +10:00
9b49e889dd
Fixing big buffer flush issue (thanks simone)
2012-08-02 15:25:18 -07:00
f6d84d9f91
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-08-03 06:33:26 +10:00
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
e2dd62a3af
Trying to work out masking issue with parser
2012-08-02 10:13:07 -07:00
a638bbb850
Trying to work out why masking occasionally barfs
2012-08-02 09:53:13 -07:00
Joakim Erdfelt
Jesse McConnell
Greg Wilkins
Jan Bartel
Simone Bordet
Hugues Malphettes