diff src/main.cpp @ 1278:b805a444bc4e draft

Merge branch 'master' of https://github.com/bitcoin/bitcoin
author Wladimir J. van der Laan <laanwj@gmail.com>
date Sat, 03 Sep 2011 09:09:34 +0200 (2011-09-03)
parents c8bedc563a87 e5b0ca852fce
children bb5150a11d8b
line wrap: on
line diff
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1830,7 +1830,9 @@
 
         // Ask the first connected node for block updates
         static int nAskedForBlocks;
-        if (!pfrom->fClient && (nAskedForBlocks < 1 || vNodes.size() <= 1))
+        if (!pfrom->fClient &&
+            (pfrom->nVersion < 32000 || pfrom->nVersion >= 32400) &&
+             (nAskedForBlocks < 1 || vNodes.size() <= 1))
         {
             nAskedForBlocks++;
             pfrom->PushGetBlocks(pindexBest, uint256(0));