Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-25 00:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,244 Commits 55 Branches 466 Tags
Commit Graph

455 Commits

Author SHA1 Message Date
Joakim Erdfelt
7211ce230e Removing unused websocket-core files, detrius from old merge 2013-01-23 10:50:37 -07:00
Jesse McConnell
e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06: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
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
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
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
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
Joakim Erdfelt
3c59cf90d0 Refactoring compression based extensions to use a common set of DEFLATE processes 2012-10-12 14:55:25 -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
f2595a7ec3 Bumping up to jetty-test-helper 2.0 with new @Rule TestTracker & AdvancedRunner status messages. 2012-10-10 09:10:51 -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
Joakim Erdfelt
550c2835cf Adding some more examples 2012-09-27 16:41:29 -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
Hugues Malphettes
1cfa277c6c jetty-9 osgi support 2012-09-24 13:04:57 +08: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
dc2a13602e Renaming DeflateFrameExtension in response to spec name change 2012-09-17 11:26:27 -07:00
Joakim Erdfelt
c7404731c9 Starting removal of WebSocketPolicy.getBufferSize() 2012-09-14 10:41:11 -07:00
Joakim Erdfelt
4f36513744 More work around close handshake testing 2012-09-04 14:53:34 -07:00
Greg Wilkins
83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +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
Simone Bordet
06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +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
b36b41afd7 Fixing websocket-client upgrade connection -> websocket connection handling 2012-08-17 13:48:04 -07: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
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
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
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