libgo: Update to weekly.2011-12-14.

[pf3gnuchains/gcc-fork.git] / libgo / go / net / http / server.go

diff --git a/libgo/go/net/http/server.go b/libgo/go/net/http/server.go
index c100e4d..fa90095 100644 (file)
--- a/libgo/go/net/http/server.go
+++ b/libgo/go/net/http/server.go
@@ -261,7 +261,7 @@ func (w *response) Header() Header {
 }
 
 // maxPostHandlerReadBytes is the max number of Request.Body bytes not
-// consumed by a handler that the server will read from the a client
+// consumed by a handler that the server will read from the client
 // in order to keep a connection alive.  If there are more bytes than
 // this then the server to be paranoid instead sends a "Connection:
 // close" response.
@@ -952,11 +952,11 @@ func Serve(l net.Listener, handler Handler) error {
 
 // A Server defines parameters for running an HTTP server.
 type Server struct {
-       Addr           string  // TCP address to listen on, ":http" if empty
-       Handler        Handler // handler to invoke, http.DefaultServeMux if nil
-       ReadTimeout    int64   // the net.Conn.SetReadTimeout value for new connections
-       WriteTimeout   int64   // the net.Conn.SetWriteTimeout value for new connections
-       MaxHeaderBytes int     // maximum size of request headers, DefaultMaxHeaderBytes if 0
+       Addr           string        // TCP address to listen on, ":http" if empty
+       Handler        Handler       // handler to invoke, http.DefaultServeMux if nil
+       ReadTimeout    time.Duration // the net.Conn.SetReadTimeout value for new connections
+       WriteTimeout   time.Duration // the net.Conn.SetWriteTimeout value for new connections
+       MaxHeaderBytes int           // maximum size of request headers, DefaultMaxHeaderBytes if 0
 }
 
 // ListenAndServe listens on the TCP network address srv.Addr and then
@@ -989,10 +989,10 @@ func (srv *Server) Serve(l net.Listener) error {
                        return e
                }
                if srv.ReadTimeout != 0 {
-                       rw.SetReadTimeout(srv.ReadTimeout)
+                       rw.SetReadTimeout(srv.ReadTimeout.Nanoseconds())
                }
                if srv.WriteTimeout != 0 {
-                       rw.SetWriteTimeout(srv.WriteTimeout)
+                       rw.SetWriteTimeout(srv.WriteTimeout.Nanoseconds())
                }
                c, err := srv.newConn(rw)
                if err != nil {
@@ -1027,7 +1027,7 @@ func (srv *Server) Serve(l net.Listener) error {
 //             http.HandleFunc("/hello", HelloServer)
 //             err := http.ListenAndServe(":12345", nil)
 //             if err != nil {
-//                     log.Fatal("ListenAndServe: ", err.String())
+//                     log.Fatal("ListenAndServe: ", err)
 //             }
 //     }
 func ListenAndServe(addr string, handler Handler) error {