diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-12-07 01:11:29 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-12-07 01:11:29 +0000 |
| commit | 9c63abc9a1d127f95162756467284cf76b47aff8 (patch) | |
| tree | 84f27a6ab44d932e4b0455f18390b070b4de626e /libgo/go/websocket/server.go | |
| parent | 374280238f934fa851273e2ee16ba53be890c6b8 (diff) | |
| download | gcc-9c63abc9a1d127f95162756467284cf76b47aff8.zip gcc-9c63abc9a1d127f95162756467284cf76b47aff8.tar.gz gcc-9c63abc9a1d127f95162756467284cf76b47aff8.tar.bz2 | |
libgo: Update to weekly 2011-11-09.
From-SVN: r182073
Diffstat (limited to 'libgo/go/websocket/server.go')
| -rw-r--r-- | libgo/go/websocket/server.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libgo/go/websocket/server.go b/libgo/go/websocket/server.go index 9420c47..57dc4fd 100644 --- a/libgo/go/websocket/server.go +++ b/libgo/go/websocket/server.go @@ -7,8 +7,8 @@ package websocket import ( "bufio" "fmt" - "http" "io" + "net/http" ) func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Request) (conn *Conn, err error) { @@ -20,6 +20,7 @@ func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Requ fmt.Fprintf(buf, "Sec-WebSocket-Version: %s\r\n", SupportedProtocolVersion) buf.WriteString("\r\n") buf.WriteString(err.Error()) + buf.Flush() return } if err != nil { @@ -34,12 +35,17 @@ func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Requ fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code)) buf.WriteString("\r\n") buf.WriteString(err.Error()) + buf.Flush() return } config.Protocol = nil err = hs.AcceptHandshake(buf.Writer) if err != nil { + code = http.StatusBadRequest + fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code)) + buf.WriteString("\r\n") + buf.Flush() return } conn = hs.NewServerConn(buf, rwc, req) |