Greg Wilkins
300157fb2d
more time needed for ssl test on slow machine
2011-12-14 12:01:23 -08:00
Greg Wilkins
5c5f783e2b
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-14 11:42:34 -08:00
Greg Wilkins
bc48eb1f5b
366730 pass the time idle to onIdleExpire
2011-12-14 11:41:32 -08:00
Joakim Erdfelt
c8e43ede1c
Merge branch 'master' into websocket-servlet-refactor
2011-12-14 11:15:20 -07:00
Joakim Erdfelt
6b42a1c45d
JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
...
+ Implementation of Safari WebSocket Draft-0 behavior in a unit test.
(Test fails, and is currently set as @Ignore)
2011-12-14 10:23:40 -07:00
Joakim Erdfelt
42816041c0
JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
...
+ Adding unit test to attempt to replicate behavior (test passes)
2011-12-13 11:26:30 -07:00
Simone Bordet
bcbcbafb14
More tests for WebSocket over SSL.
2011-12-13 11:15:04 +01:00
Joakim Erdfelt
004fa1ce1c
Bug 365973 - Websocket client on android causes many VFY errors and
...
warnings.
+ Splitting out WebSocketConnection#handshake() into new
WebSocketServletConnection interface and refactoring accordingly,
in order to remove servlet-api dep on WebSocketConnection for
appropriate websocket client use.
2011-12-12 09:02:40 -07:00
Joakim Erdfelt
6d2ad43cc4
365932 - Produce jetty-websocket aggregate jar for android use
...
+ revert last change using maven-shade-plugin as it didn't address
the now redundant transitive dependencies present in the
jetty-websocket pom.
+ made a formal jetty-aggregate/jetty-websocket build instead.
2011-12-07 12:13:57 -07:00
Joakim Erdfelt
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
Simone Bordet
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
Greg Wilkins
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
2011-11-30 16:27:30 +11:00
Greg Wilkins
631b0ba1b6
[maven-release-plugin] prepare for next development iteration
2011-11-30 13:16:54 +11:00
Greg Wilkins
9d3745f999
[maven-release-plugin] prepare release jetty-8.1.0.RC0
2011-11-30 13:16:41 +11:00
Greg Wilkins
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
Greg Wilkins
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
Greg Wilkins
3b2d3e5754
websocket not supported on blocking connectors
2011-11-28 15:31:07 +11:00
Greg Wilkins
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
Simone Bordet
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
Simone Bordet
c6103f2d53
Removed usages of ThreadDeath.
2011-11-24 20:39:04 +01:00
Jan Bartel
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
Joakim Erdfelt
7fb371a7ad
Fixing testcase failure on blocking read/write during WebSocketClient use
2011-11-15 14:47:42 -07:00
Greg Wilkins
a62061944e
removed EndPoint.isBufferingInput
2011-11-11 11:41:29 +11:00
Greg Wilkins
921b285235
Avoid flush if no content to flush
2011-11-10 14:45:28 +11:00
Greg Wilkins
7a9b8f1e9d
reverted last changes due to instability
2011-11-10 12:11:58 +11:00
Greg Wilkins
d61258ec4e
clean ups from review from sbordet.
...
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
Jesse McConnell
2a6b8696d7
Merge branch 'master' into jetty-8
2011-11-08 15:59:55 -06:00
Greg Wilkins
29fa330a6e
363124 improved websocket close handling
2011-11-09 07:09:13 +11:00
Greg Wilkins
21e692aee6
363124 improved websocket close handling
2011-11-08 18:18:34 +11:00
Greg Wilkins
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
Joakim Erdfelt
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
Joakim Erdfelt
373a2946be
Bug 362853 - Promoting all Websocket STRICT blocks to standard behavior
2011-11-04 09:40:32 -07:00
Joakim Erdfelt
5ca9dbb7d4
Undoing recent change as redundant, existing STRICT block does the same thing
2011-11-03 16:03:46 -07:00
Joakim Erdfelt
de4253b5e6
Bug 362850 - Websocket allowing >125 octets on control frame payloads
2011-11-03 15:47:12 -07:00
Joakim Erdfelt
e2f15522bd
Fixing junit test cases affected by close status code changes
2011-11-03 09:18:31 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Jesse McConnell
2b6fec713c
Merge branch 'master' into jetty-8
2011-11-02 16:47:04 -05:00
Joakim Erdfelt
903c5dcbbf
Bug 362223 - Websocket client fails to send query parameters
2011-10-27 10:37:54 -07:00
Greg Wilkins
738cbfdccc
refactored client to use upgradeable endpoint. Instert SslConnection when needed
2011-10-27 16:37:07 +11:00
Greg Wilkins
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
Jesse McConnell
d5320d95ba
[maven-release-plugin] prepare for next development iteration
2011-10-24 15:02:30 -05:00
Jesse McConnell
d02f74a50c
[maven-release-plugin] prepare release jetty-8.0.4.v20111024
2011-10-24 15:02:23 -05:00
Jesse McConnell
1d86da8f68
[maven-release-plugin] prepare for next development iteration
2011-10-24 14:52:54 -05:00
Jesse McConnell
5f349ecc92
[maven-release-plugin] prepare release jetty-7.5.4.v20111024
2011-10-24 14:52:48 -05:00
Greg Wilkins
5140a95144
refactored HttpConnection name
2011-10-20 15:12:19 +11:00
Greg Wilkins
0e284f78f5
Protected HttpParser from multiple entry.
2011-10-20 12:18:10 +11:00
Greg Wilkins
49f8b0de1a
Websocket partially refactored and passing tests
2011-10-18 21:59:49 +11:00
