6b54650046
365932 - Produce jetty-websocket aggregate jar for android use
...
+ Adding maven-shade-plugin default configuration (no bytecode
manipulation) to produce an aggregate classifier jar for
jetty-websocket use.
2011-12-07 10:17:20 -07:00
0689e05e9b
365750 - Support WebSocket over SSL, aka wss://
...
This is now implemented, using the new architecture of wrapping the connection with
SslConnection.
The only refactoring was to avoid that the HTTP handshake was sent from the
HandshakeConnection constructor, because at that point the SSL wiring is not ready yet.
Now the handshake is sent from handle(), guarded by a boolean variable to sent it once.
2011-12-06 16:25:15 +01:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
631b0ba1b6
[maven-release-plugin] prepare for next development iteration
2011-11-30 13:16:54 +11:00
9d3745f999
[maven-release-plugin] prepare release jetty-8.1.0.RC0
2011-11-30 13:16:41 +11:00
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
3b2d3e5754
websocket not supported on blocking connectors
2011-11-28 15:31:07 +11:00
ddce35a2e6
364638 SCEP does idle timestamp checking. New setCheckForIdle method controls onIdleExpired callback.
...
364921 a second onIdleExpired callback will result in close rather than a shutdown output.
2011-11-28 11:51:01 +11:00
8e913fe7c0
Fixed bug in AsyncEndPoint.hasProgressed() handling: the progressing status
...
must be remembered until a call to hasProgressed() is made.
Additional code cleanups.
2011-11-24 20:58:59 +01:00
c6103f2d53
Removed usages of ThreadDeath.
2011-11-24 20:39:04 +01:00
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
7fb371a7ad
Fixing testcase failure on blocking read/write during WebSocketClient use
2011-11-15 14:47:42 -07:00
a62061944e
removed EndPoint.isBufferingInput
2011-11-11 11:41:29 +11:00
921b285235
Avoid flush if no content to flush
2011-11-10 14:45:28 +11:00
7a9b8f1e9d
reverted last changes due to instability
2011-11-10 12:11:58 +11:00
d61258ec4e
clean ups from review from sbordet.
...
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
2a6b8696d7
Merge branch 'master' into jetty-8
2011-11-08 15:59:55 -06:00
29fa330a6e
363124 improved websocket close handling
2011-11-09 07:09:13 +11:00
21e692aee6
363124 improved websocket close handling
2011-11-08 18:18:34 +11:00
7a082280f1
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
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-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
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/ssl/SslContextFactory.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/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-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/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-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.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-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-11-07 18:09:31 +11:00
2cff05c531
Bug 362853 - Promoting all Websocket STRICT blocks to standard behavior
...
+ Removing BRUTAL flag, and promoting its logic to standard behavior.
2011-11-04 11:27:50 -07:00
373a2946be
Bug 362853 - Promoting all Websocket STRICT blocks to standard behavior
2011-11-04 09:40:32 -07:00
5ca9dbb7d4
Undoing recent change as redundant, existing STRICT block does the same thing
2011-11-03 16:03:46 -07:00
de4253b5e6
Bug 362850 - Websocket allowing >125 octets on control frame payloads
2011-11-03 15:47:12 -07:00
e2f15522bd
Fixing junit test cases affected by close status code changes
2011-11-03 09:18:31 -07:00
c1d681551b
Bug 362740 - Websocket D13 close handling is off [autobahn]
...
+ Address autobahn 0.4.3 test cases 7.9.*
Description: Send close with invalid close code (999. 1004, 1005, 1006, 1011, 1100, 2000, 2999, 5000, 65535)
Expectation: Clean close with protocol error code
2011-11-02 20:04:03 -07:00
da60996ce5
Bug 362740 - Websocket D13 close handling is off [autobahn]
...
+ Address autobahn 0.4.3 test case 7.5.1
Description: Send a close frame with invalid UTF8 payload
Expectation: Clean close with protocol error or invalid utf8 code
2011-11-02 17:22:40 -07:00
4314c55c77
Bug 362740 - Websocket D13 close handling is off [autobahn]
...
+ Address autobahn 0.4.3 test case 7.3.2
Description: Send a close frame with payload length 1
Expectation: Clean close with protocol error
2011-11-02 16:58:29 -07:00
cafbb47a2f
Bug 362740 - Websocket D13 close handling is off [autobahn]
...
+ Address autobahn 0.4.3 test case 7.3.1
Description: Send a close frame with payload length 0 (no close code, no close reason)
Expectation: Clean close with normal code
2011-11-02 16:47:48 -07:00
2b6fec713c
Merge branch 'master' into jetty-8
2011-11-02 16:47:04 -05:00
903c5dcbbf
Bug 362223 - Websocket client fails to send query parameters
2011-10-27 10:37:54 -07:00
738cbfdccc
refactored client to use upgradeable endpoint. Instert SslConnection when needed
2011-10-27 16:37:07 +11:00
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
d5320d95ba
[maven-release-plugin] prepare for next development iteration
2011-10-24 15:02:30 -05:00
d02f74a50c
[maven-release-plugin] prepare release jetty-8.0.4.v20111024
2011-10-24 15:02:23 -05:00
1d86da8f68
[maven-release-plugin] prepare for next development iteration
2011-10-24 14:52:54 -05:00
5f349ecc92
[maven-release-plugin] prepare release jetty-7.5.4.v20111024
2011-10-24 14:52:48 -05:00
5140a95144
refactored HttpConnection name
2011-10-20 15:12:19 +11:00
0e284f78f5
Protected HttpParser from multiple entry.
2011-10-20 12:18:10 +11:00
49f8b0de1a
Websocket partially refactored and passing tests
2011-10-18 21:59:49 +11:00
6edb7c1930
organised imports
2011-10-18 15:05:22 +11:00
e43b718fb1
Refactored NIO to better handle half closes. Applied the following policy:
...
Call shutdownOutput to signal the other end that you have written all the data that your are going to write (eg and the end of a non persistent HTTP response). This can be done either by generator (when it is complete) or coordinator or handle - but we need to decide which and have only 1 doing it.
Call shutdownInput to signal your own end that you have read -1 and to allow other local code to check that with an isInputShutdown. Ideally we could get by without any calls at all to shutdownInput, so long as we well handle reading -1 (Currently we don't). This should be done by whatever does the IO read.
Calling close should always be a real TCP close, even with SSL. SSL shutdown
The default handling of an idle callback should be close. But some connections (NOT endpoints) may implement idle as initiating a shutdown exchange (eg websocket close). If they do, this is state that should be held in the connection or parser - ie do-this-exhange-and-then-shutdown
Call close when you want to shutdown Output and you have already read -1, so input is already shutdown. We need to double verify that this is correct and that if a FIN has been received from the other end, that a close will not result in a reset. I'll do that today.
Call close when you want to shutdown Input and output has already been shutdown. This means you have read -1 after having sent a FIN.
Call close on any errors.
The current state is that server HttpConnection appears to be working well. Other connection types have not been updated and/or tested
2011-10-18 14:38:02 +11:00
a38f2a9e68
[maven-release-plugin] prepare for next development iteration
2011-10-11 10:16:54 -05:00
55a1be5435
[maven-release-plugin] prepare release jetty-8.0.3.v20111011
2011-10-11 10:16:47 -05:00
7d10182034
[maven-release-plugin] prepare for next development iteration
2011-10-11 08:47:07 -05:00
b6ac542604
[maven-release-plugin] prepare release jetty-7.5.3.v20111011
2011-10-11 08:47:00 -05:00
b55ec9bac1
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:59:52 -05:00
e32e8b1377
[maven-release-plugin] prepare release jetty-8.0.2.v20111006
2011-10-06 17:59:46 -05:00
0c55c774d4
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:25:38 -05:00
4d822759de
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 17:25:32 -05:00
b58006b4a4
[maven-release-plugin] prepare for next development iteration
2011-10-06 09:43:37 -05:00
7eca345e8d
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 09:43:31 -05:00
32dbb1bddb
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
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-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-deploy/src/main/config/etc/jetty-deploy.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/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-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml
jetty-osgi/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-security/pom.xml
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.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-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-10-04 17:45:15 +11:00
c438d7c043
improved websocket testserver example to include ping/pong
2011-10-03 18:03:57 +11:00
fbb4893352
improved websocket testserver example to include ping/pong
2011-10-03 18:03:42 +11:00
7bf5f7792b
359673 updated websocket version handling
2011-10-03 16:04:37 +11:00
18aa8fed9b
359673 updated websocket version handling
2011-10-03 16:04:13 +11:00
a6988108c3
minor cleanups and extra debug
2011-09-16 15:29:28 +10:00
54961fca1f
refined test options and output
2011-09-14 14:17:09 +10:00
55d229e73c
357338 remove debug
2011-09-13 00:38:08 +10:00
c5e6378b84
357338 Improve UTF-8 validation
2011-09-12 13:14:09 +10:00
4c885ca3ad
357178 websockets draft 14 support
2011-09-09 12:10:01 +10:00
d5304b2cbc
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:20:15 -05:00
c33548d38a
[maven-release-plugin] prepare release jetty-8.0.1.v20110908
2011-09-08 12:19:24 -05:00
ebdb89dc23
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:00:16 -05:00
932245a114
[maven-release-plugin] prepare release jetty-7.5.1.v20110908
2011-09-08 12:00:10 -05:00
721c8ab682
updating version.txt and resetting pom version to 8.0.1-SNAPSHOT
2011-09-08 11:54:53 -05:00
f8c1858efb
Merge branch 'jetty-8' into release-8
2011-09-08 11:52:23 -05:00
97dee04a68
merge over from jetty7
2011-09-08 11:51:48 -05:00
37d0f53b0a
updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT
2011-09-08 11:40:37 -05:00
4a575d4958
Merge branch 'master' into release
2011-09-08 11:36:48 -05:00
e914e0f97f
improved websocket handling of error cases for autobahn test suite
2011-09-09 01:52:27 +10:00
b8556bec76
fixes from running autobahn test suite
2011-09-08 11:35:39 +10:00
4e47d6a7fa
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:16:58 -05:00
d77a12962b
[maven-release-plugin] prepare release jetty-8.0.1.v20110907
2011-09-07 18:16:50 -05:00
6b614a54f0
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:12:16 -05:00
ce55c8c601
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 18:12:09 -05:00
7c7fc30b90
Merge over from jetty 7 master
2011-09-07 16:08:35 -05:00
1744b5bce1
reset from release
2011-09-07 11:09:46 -05:00
ae86ad6d4e
[maven-release-plugin] prepare for next development iteration
2011-09-07 10:03:16 -05:00
86383afbd2
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 10:03:10 -05:00
65a1e84886
misc findbugs cleanups
2011-09-07 15:57:18 +10:00
cf45e7b647
356823 correctly decode close codes. Send not utf-8 close code.
2011-09-07 11:37:46 +10:00
1d6079e78f
findbugs inspired code cleanups
2011-09-06 11:22:37 +10:00
b1f95541de
Fixes #356749 (WebSocket message length is computed wrongly when greater than 0xFFFF), and a bunch of other silly mistakes.
2011-09-06 00:18:02 +02:00
a8ce6e8878
Fixed pom.xml by declaring dependencies in the right way.
...
Dependency on jetty-server must be kept with scope provided (the classes that depend on jetty-server can only be run on Jetty).
2011-09-05 11:18:47 +02:00
8a40a0d9fb
356695 jetty server jars are provided for websockets
2011-09-05 11:21:26 +10:00
40dcb10ed8
[maven-release-plugin] prepare for next development iteration
2011-09-01 12:24:32 -05:00
db14b194fa
[maven-release-plugin] prepare release jetty-8.0.0.v20110901
2011-09-01 12:24:24 -05:00
402352962d
Merge branch 'master' into jetty-8
2011-09-01 11:24:21 -05:00
a728021edf
[maven-release-plugin] prepare for next development iteration
2011-09-01 11:17:05 -05:00
882308f781
[maven-release-plugin] prepare release jetty-7.5.0.c20110901
2011-09-01 11:16:58 -05:00
c3e170bb74
Merge branch 'master' into release
2011-09-01 10:56:08 -05:00
6a15cf7dc7
javadoc
2011-09-01 23:49:30 +10:00
e68d056b0f
setters for max message size in client factory
2011-09-01 23:33:05 +10:00
ddd77f8c08
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:19:52 +10:00
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
0b489b8877
356421 Upgraded websocket to draft 13 support
2011-09-01 12:11:10 +10:00
9528870b23
improved setting of default message maximums
2011-09-01 10:48:43 +10:00
57e9045635
[maven-release-plugin] prepare for next development iteration
2011-08-31 14:17:32 -05:00
317491a4d7
[maven-release-plugin] prepare release jetty-7.5.0.v20110901
2011-08-31 14:17:25 -05:00
0f8939dd96
Added test for the lost messages bug.
2011-08-31 18:29:09 +02:00
ba87334389
353073 better warnings
2011-08-31 21:53:34 +10:00
0a5e3d2f4c
353073 better warnings
2011-08-31 21:46:42 +10:00
0f54330156
353073 more false frag tests
2011-08-31 21:41:13 +10:00
82e364730b
353073 blocking tests
2011-08-31 18:35:40 +10:00
a55ba2eac3
353073 blocking tests
2011-08-31 17:07:48 +10:00
3c02be9cab
more info in expires message
2011-08-31 00:14:54 +10:00
0d17559f7d
handle -1 maxIdleTime as disabled timeout
2011-08-30 23:37:41 +10:00
139dd9fa66
start websocket client factory thread pool
2011-08-30 19:23:17 +10:00
33fa7afb47
356144 added SelectorManager.setSelectorPriorityDelta(int)
2011-08-30 14:24:28 +10:00
3cbe6f7ca0
Javadocs.
2011-08-30 00:36:52 +02:00
2f76dd13a4
Added getter and setter to configure the bind address.
...
Removed uneffective setSoTimeout() call, it is not used for non-blocking sockets.
Reworked javadocs.
2011-08-30 00:21:14 +02:00
1ba88a6a4b
352188 TestClient correctly processes --host option in jetty-websocket
2011-08-29 14:13:53 -04:00
39d0d4fee9
353073 deprecated non factory method for websocket clients
2011-08-29 12:27:53 +10:00
79db394552
Merge from trunk
2011-08-26 10:12:45 -07:00
c99498af91
353073 factory pattern for clients
2011-08-26 11:50:33 +10:00
4ace183764
Merging from master
2011-08-25 12:09:36 -07:00
f9eafd34eb
Using NullMaskGen if masking is disabled.
2011-08-25 14:02:16 +02:00
97cc150144
Renamed methods to enable/disable masking to is/setMaskingEnabled().
2011-08-25 12:26:33 +02:00
a7a45bf7d9
353073 allows null masks for websocket client
2011-08-25 18:36:34 +10:00
68d562008e
353073 draft 12 update
2011-08-25 14:05:12 +10:00
def117775d
353073 recycle buffer
2011-08-25 12:28:49 +10:00
f7f7e0af75
293739 - Deprecate static Jetty Log usage in favor of named logs
...
+ Finished conversion of jetty-security, jetty-server, jetty-servlet,
jetty-servlets, jetty-websocket
2011-08-24 12:53:27 -07:00
44b8d56289
353073 updated to draft 11
2011-08-24 10:28:39 +10:00
6867dae4ee
353073 Add websocket origin setter
2011-08-22 12:02:00 +10:00
ee1f0e5d9e
Quick javadoc fixes
2011-08-19 12:16:04 -04:00
e5a3cb9cef
[maven-release-plugin] prepare for next development iteration
2011-08-19 22:17:46 +10:00
f0b4ffffda
[maven-release-plugin] prepare release jetty-7.5.0.RC1
2011-08-19 22:17:33 +10:00
4700979200
[maven-release-plugin] prepare for next development iteration
2011-08-16 09:26:56 -05:00
3ae78dfbb2
[maven-release-plugin] prepare release jetty-8.0.0.RC0
2011-08-16 09:26:48 -05:00
ee1afa5e97
353073 cleaned up no context logging
2011-08-16 17:59:28 +10:00
6e8afd6795
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
2011-08-16 11:35:46 +10:00
4d7ba354e1
[maven-release-plugin] prepare for next development iteration
2011-08-15 14:18:53 -05:00
2175bae0a0
[maven-release-plugin] prepare release jetty-7.5.0.RC0
2011-08-15 14:18:42 -05:00
bfda9e0523
353073 removed old origin handling
2011-08-15 16:16:34 +10:00
2cb0cd377e
353073 better close messages
2011-08-15 15:19:14 +10:00
050cb83b35
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
jetty-websocket/pom.xml
2011-08-12 18:43:15 +10:00
11d89c9e3f
353073 too large message handling
2011-08-12 14:23:51 +10:00
365bc6bb67
353073 use java.net ProtocolException
2011-08-11 18:24:13 +10:00
8ae43e9bea
353073 expose cookie api
2011-08-11 17:26:15 +10:00
c07e14840c
353073 Support fake fragements, so that frames may be larger than buffers
2011-08-11 13:26:12 +10:00
d63294bfe4
353073 Improved client javadoc
2011-08-11 12:18:36 +10:00
72caa15632
353073 Improved client API to use futures
2011-08-11 11:52:33 +10:00
6b9ecd0806
353073 Improved client API to use futures
2011-08-11 11:50:23 +10:00
5ea2806c08
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
...
Conflicts:
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
2011-08-09 15:45:17 +10:00
75dacc2b61
fixed websocket client tests
2011-08-09 15:39:26 +10:00
3dd582475b
Resolve test case issue with comment for Greg on proper order of on*
...
responses for websocket interface
2011-08-05 12:44:41 -05:00
f930050a4a
Working out what testBadHandshake keeps failing
2011-08-05 10:11:38 -07:00
Joakim Erdfelt
Simone Bordet
Greg Wilkins
Jan Bartel
Jesse McConnell
Michael Gorovoy