aboutsummaryrefslogtreecommitdiff
path: root/src/lib/http/server.go
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2009-05-08 11:22:57 -0700
committerRob Pike <r@golang.org>2009-05-08 11:22:57 -0700
commitc8b47c6fceeb249ab9e6f39503615ebe2ea205ce (patch)
tree2affd4955742b1bde18daf6a1f053e148c7b9838 /src/lib/http/server.go
parentdf46b3342ce54129af59e30ff6d9708347f61c75 (diff)
downloadgo-c8b47c6fceeb249ab9e6f39503615ebe2ea205ce.tar.xz
Name change to improve embeddability:
io.Read->io.Reader io.Write,Close,etc.->io.Writer,Closer etc. R=rsc DELTA=190 (0 added, 0 deleted, 190 changed) OCL=28525 CL=28535
Diffstat (limited to 'src/lib/http/server.go')
-rw-r--r--src/lib/http/server.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/http/server.go b/src/lib/http/server.go
index 9b6aa6c414..5769ced7ee 100644
--- a/src/lib/http/server.go
+++ b/src/lib/http/server.go
@@ -43,7 +43,7 @@ type Conn struct {
RemoteAddr string; // network address of remote side
Req *Request; // current HTTP request
- rwc io.ReadWriteClose; // i/o connection
+ rwc io.ReadWriteCloser; // i/o connection
buf *bufio.BufReadWrite; // buffered rwc
handler Handler; // request handler
hijacked bool; // connection has been hijacked by handler
@@ -56,7 +56,7 @@ type Conn struct {
}
// Create new connection from rwc.
-func newConn(rwc io.ReadWriteClose, raddr string, handler Handler) (c *Conn, err os.Error) {
+func newConn(rwc io.ReadWriteCloser, raddr string, handler Handler) (c *Conn, err os.Error) {
c = new(Conn);
c.RemoteAddr = raddr;
c.handler = handler;
@@ -238,7 +238,7 @@ func (c *Conn) serve() {
// will not do anything else with the connection.
// It becomes the caller's responsibility to manage
// and close the connection.
-func (c *Conn) Hijack() (rwc io.ReadWriteClose, buf *bufio.BufReadWrite, err os.Error) {
+func (c *Conn) Hijack() (rwc io.ReadWriteCloser, buf *bufio.BufReadWrite, err os.Error) {
if c.hijacked {
return nil, nil, ErrHijacked;
}