removed braintree/manners
Vijayee Kulkaa committed
May 18, 2015 at 09:27 UTC
fcb8be5607a1c0bae6e88b0b437284169595e65d
3 files changed
+4
-12
.gitignore
+1
-1
@@ -10,4 +10,4 @@
10
*~
11
12
/test/bin
13
-.ipfs
13
+.ipfs
\ No newline at end of file
Godeps/Godeps.json
-5
@@ -28,11 +28,6 @@
28
"Comment": "v0.7.3-2-g26709e2",
29
"Rev": "26709e2714106fb8ad40b773b711ebce25b78914"
30
},
31
- {
32
- "ImportPath": "github.com/braintree/manners",
33
- "Comment": "0.3.1-2-g5280e25",
34
- "Rev": "5280e250f2795914acbeb2bf3b55dd5a2d1fba52"
35
- },
31
{
32
"ImportPath": "github.com/bren2010/proquint",
33
"Rev": "5958552242606512f714d2e93513b380f43f9991"
core/corehttp/corehttp.go
+3
-6
@@ -8,7 +8,6 @@ import (
8
"net/http"
9
"time"
10
11
- manners "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/braintree/manners"
11
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
12
manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
13
core "github.com/ipfs/go-ipfs/core"
@@ -62,7 +61,7 @@ func listenAndServe(node *core.IpfsNode, addr ma.Multiaddr, handler http.Handler
61
return err
62
}
63
65
- server := manners.NewServer()
64
+ server := &http.Server{Addr: host, Handler: handler}
65
66
// if the server exits beforehand
67
var serverError error
@@ -72,7 +71,7 @@ func listenAndServe(node *core.IpfsNode, addr ma.Multiaddr, handler http.Handler
71
defer node.Children().Done()
72
73
go func() {
75
- serverError = server.ListenAndServe(host, handler)
74
+ serverError = server.ListenAndServe()
75
close(serverExited)
76
}()
77
@@ -85,9 +84,7 @@ func listenAndServe(node *core.IpfsNode, addr ma.Multiaddr, handler http.Handler
84
log.Infof("server at %s terminating...", addr)
85
86
// make sure keep-alive connections do not keep the server running
88
- server.InnerServer.SetKeepAlivesEnabled(false)
89
-
90
- server.Shutdown <- true
87
+ server.SetKeepAlivesEnabled(false)
88
89
outer:
90
for {