Merge branch 'hotfix/0.7.11' into develop

obscuren · obscuren · commit 9d429180f995 · 2014-12-24T11:31:08.000+01:00
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
@@ -30,7 +30,7 @@ import (
 
 const (
 	ClientIdentifier = "Ethereum(G)"
-	Version          = "0.7.10"
+	Version          = "0.7.11"
 )
 
 var clilogger = logger.NewLogger("CLI")
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
@@ -31,7 +31,7 @@ import (
 
 const (
 	ClientIdentifier = "Mist"
-	Version          = "0.7.10"
+	Version          = "0.7.11"
 )
 
 var ethereum *eth.Ethereum
diff --git a/peer.go b/peer.go
@@ -412,6 +412,12 @@ func (p *Peer) HandleInbound() {
 				//}
 
 			case wire.MsgDiscTy:
+				blockPool := p.ethereum.blockPool
+				if blockPool.peer == p {
+					blockPool.peer = nil
+					blockPool.td = ethutil.Big0
+				}
+
 				p.Stop()
 				peerlogger.Infoln("Disconnect peer: ", DiscReason(msg.Data.Get(0).Uint()))
 			case wire.MsgPingTy:

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import (`
`30`	`30`
`31`	`31`	`const (`
`32`	`32`	`ClientIdentifier = "Ethereum(G)"`
`33`		`- Version = "0.7.10"`
	`33`	`+ Version = "0.7.11"`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`var clilogger = logger.NewLogger("CLI")`