From 869d9792b30c0c9d9ad0d6d37170bf76ac0271be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 3 Mar 2016 13:06:23 +0200 Subject: [PATCH 1/2] [release/1.3.5] eth: forward empty body responses to the downlaoder (cherry picked from commit ae4982a365ae396f928c76e332777563c9cc6b40) --- eth/handler.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eth/handler.go b/eth/handler.go index d1a6c040c620..96bb554ddced 100644 --- a/eth/handler.go +++ b/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) From cab802b40f6c405380376d68c4b0aaa68f5c8888 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Thu, 3 Mar 2016 15:07:33 +0100 Subject: [PATCH 2/2] VERSION, cmd/geth: bumped version 1.3.5 --- VERSION | 2 +- cmd/geth/main.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index d0149fef743a..80e78df6830f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.4 +1.3.5 diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 76abf45f0f34..dab2d8fc0579 100644 --- a/cmd/geth/main.go +++ b/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 (