diff options
author | Satoshi Nakamoto <satoshin@gmx.com> | 2010-07-26 17:40:05 +0000 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-07-26 17:40:05 +0000 |
commit | 40cd0369419323f8d7385950e20342e998c994e1 (patch) | |
tree | af4d40473a1073f108442aa8fe50a9b72462ece4 /util.cpp | |
parent | fe98cf8dc5066368b78e9ce208118c3532598dd2 (diff) |
Gavin Andresen's JSON-RPC HTTP authentication,v0.3.3
faster initial block download
-- version 0.3.3
Diffstat (limited to 'util.cpp')
-rw-r--r-- | util.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -642,7 +642,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet, set<string> setOptions; setOptions.insert("*"); - + for (pod::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it) { // Don't overwrite existing settings so command line settings override bitcoin.conf @@ -732,7 +732,7 @@ void AddTimeData(unsigned int ip, int64 nTime) sort(vTimeOffsets.begin(), vTimeOffsets.end()); int64 nMedian = vTimeOffsets[vTimeOffsets.size()/2]; nTimeOffset = nMedian; - if ((nMedian > 0 ? nMedian : -nMedian) > 36 * 60 * 60) + if ((nMedian > 0 ? nMedian : -nMedian) > 70 * 60) { // Only let other nodes change our clock so far before we // go to the NTP servers |