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
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
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
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