diff options
| author | Cary Hull <chull@google.com> | 2008-10-08 09:34:50 -0700 |
|---|---|---|
| committer | Cary Hull <chull@google.com> | 2008-10-08 09:34:50 -0700 |
| commit | f4a8db667be985eb8b9f0d0e1e8674b751df5121 (patch) | |
| tree | bbf53b65d8f93f6ba6e7a7df486d69527f940e14 /src/lib/http/server.go | |
| parent | b4f8e01acb8239eb8d31017d5f137cbda57e62d3 (diff) | |
| download | go-f4a8db667be985eb8b9f0d0e1e8674b751df5121.tar.xz | |
Fixes breakage caused by semicolon restriction.
R=rsc
APPROVED=rsc
DELTA=50 (4 added, 0 deleted, 46 changed)
OCL=16707
CL=16725
Diffstat (limited to 'src/lib/http/server.go')
| -rw-r--r-- | src/lib/http/server.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/http/server.go b/src/lib/http/server.go index 0c9af6c0a4..43b4fb1fd5 100644 --- a/src/lib/http/server.go +++ b/src/lib/http/server.go @@ -18,16 +18,16 @@ import ( // Serve a new connection. func ServeConnection(fd net.Conn, raddr string, f *(*Conn, *Request)) { - c, err := NewConn(fd) + c, err := NewConn(fd); if err != nil { return } for { - req, err := c.ReadRequest() + req, err := c.ReadRequest(); if err != nil { break } - f(c, req) + f(c, req); if c.close { break } @@ -44,7 +44,7 @@ export func Serve(l net.Listener, f *(*Conn, *Request)) *os.Error { } for { - rw, raddr, e := l.Accept() + rw, raddr, e := l.Accept(); if e != nil { return e } @@ -55,11 +55,11 @@ export func Serve(l net.Listener, f *(*Conn, *Request)) *os.Error { // Web server: listen on address, call f for each request. export func ListenAndServe(addr string, f *(*Conn, *Request)) *os.Error { - l, e := net.Listen("tcp", addr) + l, e := net.Listen("tcp", addr); if e != nil { return e } e = Serve(l, f); - l.Close() + l.Close(); return e } |
