From 82a227b263fa7d4caee454884661548f7415b9d7 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 23 May 2012 21:45:26 -0400 Subject: [PATCH 1/6] .gitignore: add test_bitcoin --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c1d06a3dfba..7fc31bb8057 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ src/*.exe src/bitcoin src/bitcoind +src/test_bitcoin .*.swp *.*~* *.bak From a0ea95d3ceacea5868b8f921c36bbdddb5dc2b1b Mon Sep 17 00:00:00 2001 From: Michael Hendricks Date: Fri, 2 Mar 2012 12:24:38 -0700 Subject: [PATCH 2/6] Serialize access to debug.log stream Acquire an exclusive, advisory lock before sending output to debug.log and release it when we're done. This should avoid output from multiple threads being interspersed in the log file. We can't use CRITICAL_SECTION machinery for this because the debug log is written during startup and shutdown when that machinery is not available. (Thanks to Gavin for pointing out the CRITICAL_SECTION problems based on his earlier work in this area) --- src/util.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util.cpp b/src/util.cpp index 6dc2f3b6da2..ccd39aa2296 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -22,6 +22,7 @@ namespace boost { #include #include #include +#include using namespace std; using namespace boost; @@ -193,6 +194,8 @@ inline int OutputDebugStringF(const char* pszFormat, ...) if (fileout) { static bool fStartedNewLine = true; + static boost::mutex mutexDebugLog; + boost::mutex::scoped_lock scoped_lock(mutexDebugLog); // Debug print useful for profiling if (fLogTimestamps && fStartedNewLine) From af413c0a0ff507da69afae6399bf3ff3fbf0774b Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Tue, 8 May 2012 23:02:48 +0200 Subject: [PATCH 3/6] fix an incorrect if-clause in net.cpp --- src/net.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net.cpp b/src/net.cpp index 04d278c9f17..a9f6c87bc7b 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -868,7 +868,7 @@ void ThreadSocketHandler2(void* parg) if (nSelect == SOCKET_ERROR) { int nErr = WSAGetLastError(); - if (hSocketMax > -1) + if (hSocketMax != INVALID_SOCKET) { printf("socket select error %d\n", nErr); for (unsigned int i = 0; i <= hSocketMax; i++) From 9a48f56fb02338b7f68ab9fd469abc1abe0011c3 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Tue, 12 Jun 2012 23:50:38 +0000 Subject: [PATCH 4/6] Bugfix: Move IsStandard scriptSig size check out of IsPushOnly, since BIP16 verification uses the latter too This caused clients to reject block #177618 since it has a P2SH transaction with over 200 bytes in scriptSig. (Upstream commit: e679ec969c8b22c676ebb10bea1038f6c8f13b33) --- src/main.h | 2 +- src/script.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main.h b/src/main.h index 44624f5cf70..930f5187d92 100644 --- a/src/main.h +++ b/src/main.h @@ -507,7 +507,7 @@ public: bool IsStandard() const { BOOST_FOREACH(const CTxIn& txin, vin) - if (!txin.scriptSig.IsPushOnly()) + if (txin.scriptSig.size() > 200 || !txin.scriptSig.IsPushOnly()) return error("nonstandard txin: %s", txin.scriptSig.ToString().c_str()); BOOST_FOREACH(const CTxOut& txout, vout) if (!::IsStandard(txout.scriptPubKey)) diff --git a/src/script.h b/src/script.h index 502bce1e54f..8dddb893f43 100644 --- a/src/script.h +++ b/src/script.h @@ -623,8 +623,6 @@ public: bool IsPushOnly() const { - if (size() > 200) - return false; const_iterator pc = begin(); while (pc < end()) { From 9849f50b6866f326040622f124601efaa8c37434 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 14 Jun 2012 15:59:18 +0000 Subject: [PATCH 5/6] Bump VERSION so we can differentiate between fixed 0.4.7rc2 and not-fixed 0.4.7rc1 --- src/serialize.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/serialize.h b/src/serialize.h index e3c3210e02b..db3c9636540 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -59,7 +59,7 @@ class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int VERSION = 40700; +static const int VERSION = 40701; static const char* pszSubVer = ""; static const bool VERSION_IS_BETA = true; From ca39829ecb90e392b9722292739585124ba0d7c1 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Wed, 13 Jun 2012 01:06:40 +0200 Subject: [PATCH 6/6] Update wiki changelog at doc/release-process.txt --- doc/release-process.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release-process.txt b/doc/release-process.txt index 8bf944a29e6..8a236a7933f 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -48,4 +48,5 @@ * update wiki download links +* update wiki changelog: https://en.bitcoin.it/wiki/Changelog