Merge pull request #2287 from obscuren/release/1.3.5

Release/1.3.5

Author: obscuren

VERSION

@@ -1 +1 @@
-1.3.4
+1.3.5

cmd/geth/main.go

@@ -48,10 +48,10 @@ import (
 
 const (
 	ClientIdentifier = "Geth"
-	Version          = "1.3.4"
+	Version          = "1.3.5"
 	VersionMajor     = 1
 	VersionMinor     = 3
-	VersionPatch     = 4
+	VersionPatch     = 5
 )
 
 var (

eth/handler.go

@@ -491,7 +491,11 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 			uncles[i] = body.Uncles
 		}
 		// Filter out any explicitly requested bodies, deliver the rest to the downloader
-		if trasactions, uncles := pm.fetcher.FilterBodies(trasactions, uncles, time.Now()); len(trasactions) > 0 || len(uncles) > 0 {
+		filter := len(trasactions) > 0 || len(uncles) > 0
+		if filter {
+			trasactions, uncles = pm.fetcher.FilterBodies(trasactions, uncles, time.Now())
+		}
+		if len(trasactions) > 0 || len(uncles) > 0 || !filter {
 			err := pm.downloader.DeliverBodies(p.id, trasactions, uncles)
 			if err != nil {
 				glog.V(logger.Debug).Infoln(err)