|
|
|
@ -1015,13 +1015,13 @@ Value listtransactions(const Array& params, bool fHelp)
@@ -1015,13 +1015,13 @@ Value listtransactions(const Array& params, bool fHelp)
|
|
|
|
|
for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) |
|
|
|
|
{ |
|
|
|
|
CWalletTx* wtx = &((*it).second); |
|
|
|
|
txByTime.insert(make_pair(wtx->GetTxTime(), TxPair(wtx, 0))); |
|
|
|
|
txByTime.insert(make_pair(wtx->GetTxTime(), TxPair(wtx, (CAccountingEntry*)0))); |
|
|
|
|
} |
|
|
|
|
list<CAccountingEntry> acentries; |
|
|
|
|
walletdb.ListAccountCreditDebit(strAccount, acentries); |
|
|
|
|
foreach(CAccountingEntry& entry, acentries) |
|
|
|
|
{ |
|
|
|
|
txByTime.insert(make_pair(entry.nTime, TxPair(0, &entry))); |
|
|
|
|
txByTime.insert(make_pair(entry.nTime, TxPair((CWalletTx*)0, &entry))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Now: iterate backwards until we have nCount items to return:
|
|
|
|
@ -1762,7 +1762,7 @@ void ThreadRPCServer2(void* parg)
@@ -1762,7 +1762,7 @@ void ThreadRPCServer2(void* parg)
|
|
|
|
|
map<string, string> mapHeaders; |
|
|
|
|
string strRequest; |
|
|
|
|
|
|
|
|
|
boost::thread api_caller(ReadHTTP, ref(stream), ref(mapHeaders), ref(strRequest)); |
|
|
|
|
boost::thread api_caller(ReadHTTP, boost::ref(stream), boost::ref(mapHeaders), boost::ref(strRequest)); |
|
|
|
|
if (!api_caller.timed_join(boost::posix_time::seconds(GetArg("-rpctimeout", 30)))) |
|
|
|
|
{ // Timed out:
|
|
|
|
|
acceptor.cancel(); |
|
|
|
|