Use http.DefaultServeMux as default handler

server_test.go

@@ -3,6 +3,7 @@ package manners
 import (
 	"net"
 	"net/http"
+	"runtime"
 	"testing"
 	"time"
 
@@ -76,6 +77,44 @@ func TestRacyClose(t *testing.T) {
 	}()
 }
 
+// Tests that ListenAndServe works with the default handler
+func TestDefaultHandler(t *testing.T) {
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		w.Write([]byte("Hello\n"))
+	})
+
+	go ListenAndServe(":9000", nil)
+
+	ok := waitForServer(":9000", 500*time.Millisecond)
+	if !ok {
+		t.Fatal("Couldn't start HTTP server")
+	}
+
+	_, err := http.Get("http://localhost:9000/")
+	if err != nil {
+		t.Fatal("Simple GET failed.")
+	}
+
+	Close()
+}
+
+func waitForServer(addr string, timeout time.Duration) bool {
+	start := time.Now()
+
+	for {
+		runtime.Gosched()
+
+		conn, err := net.Dial("tcp", addr)
+		if err == nil {
+			conn.Close()
+			return true
+		}
+		if time.Since(start) > timeout {
+			return false
+		}
+	}
+}
+
 // Tests that the server begins to shut down when told to and does not accept
 // new requests once shutdown has begun
 func TestShutdown(t *testing.T) {

static.go

@@ -18,6 +18,9 @@ func init() {
 // ListenAndServe provides a graceful version of the function provided by the
 // net/http package. Call Close() to stop the server.
 func ListenAndServe(addr string, handler http.Handler) error {
+	if handler == nil {
+		handler = http.DefaultServeMux
+	}
 	defaultServer = NewWithServer(&http.Server{Addr: addr, Handler: handler})
 	defaultServerLock.Unlock()
 	return defaultServer.ListenAndServe()
@@ -26,6 +29,9 @@ func ListenAndServe(addr string, handler http.Handler) error {
 // ListenAndServeTLS provides a graceful version of the function provided by the
 // net/http package. Call Close() to stop the server.
 func ListenAndServeTLS(addr string, certFile string, keyFile string, handler http.Handler) error {
+	if handler == nil {
+		handler = http.DefaultServeMux
+	}
 	defaultServer = NewWithServer(&http.Server{Addr: addr, Handler: handler})
 	defaultServerLock.Unlock()
 	return defaultServer.ListenAndServeTLS(certFile, keyFile)
@@ -34,6 +40,9 @@ func ListenAndServeTLS(addr string, certFile string, keyFile string, handler htt
 // Serve provides a graceful version of the function provided by the net/http
 // package. Call Close() to stop the server.
 func Serve(l net.Listener, handler http.Handler) error {
+	if handler == nil {
+		handler = http.DefaultServeMux
+	}
 	defaultServer = NewWithServer(&http.Server{Handler: handler})
 	defaultServerLock.Unlock()
 	return defaultServer.Serve(l)