diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:07:11 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:07:11 +0000 |
| commit | 3703150d56ff6ee557ab330e55637c9c23835902 (patch) | |
| tree | b3f13dd5416c38c508ee785dd3e543e381cc03a2 /src | |
| parent | 1bc2f0a37b68aa99e90437105a48c47046b6c0d0 (diff) | |
| parent | ca39829ecb90e392b9722292739585124ba0d7c1 (diff) | |
| download | bitcoin-3703150d56ff6ee557ab330e55637c9c23835902.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
doc/release-process.txt
src/serialize.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.h | 2 | ||||
| -rw-r--r-- | src/net.cpp | 2 | ||||
| -rw-r--r-- | src/script.h | 2 | ||||
| -rw-r--r-- | src/serialize.h | 2 | ||||
| -rw-r--r-- | src/util.cpp | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/main.h b/src/main.h index 21bb4c8a0b..74bbe2940e 100644 --- a/src/main.h +++ b/src/main.h @@ -513,7 +513,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/net.cpp b/src/net.cpp index ebdc1cc149..8384251095 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -914,7 +914,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++) diff --git a/src/script.h b/src/script.h index 502bce1e54..8dddb893f4 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()) { diff --git a/src/serialize.h b/src/serialize.h index b1fabb7a0e..61d80d7050 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -60,7 +60,7 @@ class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int VERSION = 50600; +static const int VERSION = 50601; static const char* pszSubVer = ""; static const bool VERSION_IS_BETA = true; diff --git a/src/util.cpp b/src/util.cpp index be6267688c..6314b53627 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -22,6 +22,7 @@ namespace boost { #include <boost/interprocess/sync/interprocess_mutex.hpp> #include <boost/interprocess/sync/interprocess_recursive_mutex.hpp> #include <boost/foreach.hpp> +#include <boost/thread.hpp> 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) |