removed braintree/manners

ipfs · May 18, 2015 · 6c213c6 · 6c213c6
1 parent ad9d84d
commit 6c213c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@
 
 /test/bin
 .ipfs
+.idea/
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/core/corehttp/corehttp.go b/core/corehttp/corehttp.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"time"
 
-	manners "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/braintree/manners"
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
 	core "github.com/ipfs/go-ipfs/core"
@@ -62,7 +61,7 @@ func listenAndServe(node *core.IpfsNode, addr ma.Multiaddr, handler http.Handler
 		return err
 	}
 
-	server := manners.NewServer()
+	server := &http.Server{Addr: host, Handler: handler}
 
 	// if the server exits beforehand
 	var serverError error
@@ -72,7 +71,7 @@ func listenAndServe(node *core.IpfsNode, addr ma.Multiaddr, handler http.Handler
 	defer node.Children().Done()
 
 	go func() {
-		serverError = server.ListenAndServe(host, handler)
+		serverError = server.ListenAndServe()
 		close(serverExited)
 	}()
 
@@ -85,9 +84,7 @@ func listenAndServe(node *core.IpfsNode, addr ma.Multiaddr, handler http.Handler
 		log.Infof("server at %s terminating...", addr)
 
 		// make sure keep-alive connections do not keep the server running
-		server.InnerServer.SetKeepAlivesEnabled(false)
-
-		server.Shutdown <- true
+		server.SetKeepAlivesEnabled(false)
 
 	outer:
 		for {