[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[List Home]
|
[jetty-commit] [Git@Eclipse] Jetty: primary project repository branch jetty-9 updated. jetty-8.1.5.v20120716-600-g32e9548
|
- From: genie@xxxxxxxxxxx (Joakim Erdfelt)
- Date: Mon, 30 Jul 2012 17:51:43 -0400 (EDT)
- Delivered-to: jetty-commit@eclipse.org
The branch, jetty-9 has been updated
via 32e9548f0ceb624e4938f89a6295dd401d778d71 (commit)
via 7d2d40dc2b8dc1b858152e0dc795206cd3214049 (commit)
from 9c717d552ff1e1b151a79e14426f4f5e06902678 (commit)
- Log -----------------------------------------------------------------
commit 32e9548f0ceb624e4938f89a6295dd401d778d71
Merge: 7d2d40d 9c717d5
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date: Mon Jul 30 14:51:50 2012 -0700
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
commit 7d2d40dc2b8dc1b858152e0dc795206cd3214049
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date: Mon Jul 30 14:51:34 2012 -0700
Fixing PING vs CLOSE ordering issues with outgoing queue
-----------------------------------------------------------------------
Summary of changes:
.../websocket/io/WebSocketAsyncConnection.java | 23 +-
.../jetty/websocket/server/ab/TestABCase2.java | 476 ++++++++++++++++++++
.../server/helper/IncomingFramesCapture.java | 6 +-
.../src/test/resources/jetty-logging.properties | 4 +-
4 files changed, 500 insertions(+), 9 deletions(-)
create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java
hooks/post-receive
--
Jetty: primary project repository