Merge branch '0.4.x' into 0.5.x

Conflicts:
	doc/release-process.txt
	src/serialize.h

diff --git a/.gitignore b/.gitignore
index 6ed527d..95152ce 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 src/*.exe
 src/bitcoin
 src/bitcoind
+src/test_bitcoin
 .*.swp
 *.*~*
 *.bak

diff --git a/doc/release-process.txt b/doc/release-process.txt
index 2d483d3..468d037 100644 (file)
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -89,6 +89,8 @@
 
 * update wiki download links
 
+* update wiki changelog: https://en.bitcoin.it/wiki/Changelog
+
 * Commit your signature to gitian.sigs:
   pushd gitian.sigs
   git add ${VERSION}/${SIGNER}

diff --git a/src/main.h b/src/main.h
index 21bb4c8..74bbe29 100644 (file)
--- 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 ebdc1cc..8384251 100644 (file)
--- 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 502bce1..8dddb89 100644 (file)
--- 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 b1fabb7..61d80d7 100644 (file)
--- 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 be62676..6314b53 100644 (file)
--- 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)