Gavin Andresen
1913b6e2fc
Fix double-paren typo
2012-09-06 16:29:59 -04:00
Gavin Andresen
3c28b335af
Minor build documentation fix
2012-09-06 16:27:39 -04:00
Gavin Andresen
004fa1441c
Merge branch 'master' of github.com:bitcoin/bitcoin
2012-09-06 16:27:08 -04:00
Gavin Andresen
4dc89fa875
Build doc updates
2012-09-06 15:51:16 -04:00
Wladimir J. van der Laan
97e02a8d52
Merge pull request #1792 from Diapolo/rem_double_errfunc
...
replace 2x WSAGetLastError() with 1x WSAGetLastError() call
2012-09-05 22:15:38 -07:00
Gavin Andresen
ace35a1997
Fix mac .dmg packager for latest macports qt4
2012-09-05 17:54:37 -04:00
Philip Kaufmann
4bd34b4966
replace 2x WSAGetLastError() with 1x WSAGetLastError() call
2012-09-05 22:20:26 +02:00
Gavin Andresen
8788221761
Bump version number for 0.7.0rc2
2012-09-05 12:38:37 -04:00
Gavin Andresen
aeea5e2a2d
Minor documentation updates
2012-09-05 12:38:37 -04:00
Gavin Andresen
91c218a1cb
Merge branch 'testnet_alert' of git://github.com/gavinandresen/bitcoin-git
2012-09-05 11:38:38 -04:00
Gavin Andresen
21327ebe93
Update gitian build setup notes
2012-09-05 11:37:33 -04:00
Jeff Garzik
32416e380b
Merge pull request #1791 from xanatos/patch-18
...
Correct LoadWallet() return value (false -> DB_LOAD_OK)
2012-09-05 06:32:55 -07:00
xanatos
4f76be1dc5
Correct LoadWallet() return value (false -> DB_LOAD_OK)
...
Equivalent code. (false == 0 == DB_LOAD_OK). Fixes #1706 .
2012-09-05 11:32:13 +03:00
Jeff Garzik
e271c1d3d0
Merge pull request #1789 from Diapolo/fix_double_Startuptime
...
remove double logging of startup time, when !fLogTimestamps
2012-09-04 23:39:15 -07:00
Jeff Garzik
b930a2a6be
Merge pull request #1788 from Diapolo/fix_unsigned_BlockFilePath
...
fix signed/unsigned usage in BlockFilePath()
2012-09-04 23:38:37 -07:00
Philip Kaufmann
274b7ab123
remove double logging of startup time, when !fLogTimestamps
2012-09-05 08:36:50 +02:00
Philip Kaufmann
8d367c7e66
fix signed/unsigned usage in BlockFilePath()
2012-09-05 08:34:41 +02:00
Jeff Garzik
42613c97d5
Add block file naming helper, BlockFilePath()
2012-09-04 21:40:26 -04:00
Jeff Garzik
dcb14198bb
init.cpp: fix build error, and possibly-uninit'd warning
2012-09-04 12:24:08 -04:00
Jeff Garzik
38e8f282d2
Merge pull request #1427 from rebroad/StartTimeFix
...
No need to log start time if it's already being done on every line.
2012-09-04 09:10:47 -07:00
Jeff Garzik
2fd6f067db
Merge pull request #1777 from laanwj/2012_09_eliminate_sprintf
...
Remove last occurrence of potentially insecure function sprintf
2012-09-04 09:00:02 -07:00
Jeff Garzik
bec02998b4
Merge pull request #1779 from xanatos/patch-15
...
Useless vector declaration
2012-09-04 08:59:05 -07:00
Jeff Garzik
8c7b6c05db
Merge pull request #1738 from laanwj/2012_08_boostthread
...
implement CreateThread with boost::thread
2012-09-04 08:53:05 -07:00
Wladimir J. van der Laan
9d7da11458
Merge pull request #1743 from xanatos/patch-14
...
Changed nprev->pprev
2012-09-03 08:11:36 -07:00
Wladimir J. van der Laan
acbe4a1f32
Merge pull request #1728 from xanatos/patch-11
...
Removed duplicated lock
2012-09-03 08:00:18 -07:00
xanatos
89fbd1f11c
Useless vector declaration
...
The vector isn't referenced in the small code block it's declared. I don't see any "useful" side effect in its declaration.
2012-09-03 17:53:27 +03:00
Wladimir J. van der Laan
9c80909452
Remove last occurrence of potentially insecure function sprintf.
...
%d can return up to 11 characters. Move away from fixed buffer completely and
use our own safe function strprintf.
2012-09-03 16:18:16 +02:00
Gavin Andresen
eaf00a3a5d
Merge pull request #1774 from luke-jr/refactor_times
...
Bugfix: Require OrderedTxItems to provide properly scoped accounting entry list
2012-09-02 16:47:58 -07:00
Wladimir J. van der Laan
4d0c2b6cf4
Merge pull request #1761 from Diapolo/timeout_desc
...
add default value in -timeout description
2012-09-02 06:19:10 -07:00
Luke Dashjr
ddb709e9de
Bugfix: Require OrderedTxItems to provide properly scoped accounting entry list
...
OrderedTxItems returns a multimap of pointers, but needs a place to store the actual CAccountingEntries it points to.
It had been using a stack item, which was clobbered as soon as it returned, resulting in undefined behaviour.
This fixes at least bug #1768 .
2012-09-02 08:02:46 +00:00
Jeff Garzik
0e1be81a4a
Merge pull request #1771 from luke-jr/bugfix_bip22_mode
...
Bugfix: getblocktemplate: Accept optional "mode" parameter not being provided
2012-09-01 12:30:13 -07:00
R E Broadley
016178132e
No need to log start time if it's already being done on every line.
2012-09-01 14:24:33 +01:00
Luke Dashjr
0689a7eb9c
Bugfix: getblocktemplate: Accept optional "mode" parameter not being provided
2012-09-01 07:12:56 +00:00
Wladimir J. van der Laan
90489ae977
Merge pull request #1770 from laanwj/2012_08_rpcconsoleparsing2
...
RPC console: escaping within ' and " now handled differently
2012-09-01 00:10:00 -07:00
Wladimir J. van der Laan
9c94bdac06
RPC console: escaping within ' and " now handled differently
...
Should now mimic bash quoting and escaping (see http://wiki.bash-hackers.org/syntax/quoting ) exactly,
leaving out argument expansion and obscure syntax like $''.
2012-09-01 09:08:38 +02:00
Gregory Maxwell
ddbddcb31e
Merge pull request #1758 from laanwj/2012_08_uiconsole_parsing
...
Fix RPC console parser to handle escaped arguments more like bash
2012-08-31 22:50:23 -07:00
Wladimir J. van der Laan
b5c1467a7d
In RPC console, attempt to format errors
...
Try to display a nicer message instead of dumping raw JSON object when possible. If the error
somehow doesn't have the required 'code' and 'message' fields, fall back to printing raw JSON object.
2012-08-31 17:41:58 +02:00
Wladimir J. van der Laan
576b5efe93
Fix RPC console parser to handle escaped arguments more like bash
...
- Fix issue #1750
2012-08-31 17:23:48 +02:00
Jeff Garzik
c2cd13faa4
release-notes.txt: mention getmemorypool removal
2012-08-30 19:44:57 -04:00
Philip Kaufmann
d93e5986d7
add default value in -timeout description
2012-08-30 23:28:19 +02:00
Wladimir J. van der Laan
f78fd6f397
Merge pull request #1752 from Diapolo/bitcoind_ASLR_DEP
...
enable ASLR and DEP for bitcoind.exe via linker flags
2012-08-30 11:07:11 -07:00
Wladimir J. van der Laan
a65b53bf06
Merge pull request #1756 from Diapolo/pro_add_netbase_h
...
add missing netbase.h to Qt project-file
2012-08-30 10:20:32 -07:00
Philip Kaufmann
c3856bb011
add missing netbase.h to Qt project-file
2012-08-30 19:11:41 +02:00
Philip Kaufmann
a4d4403a75
enable ASLR and DEP for bitcoind.exe via linker flags
...
- this is already active for bitcoin-qt.exe
2012-08-29 22:22:04 +02:00
Wladimir J. van der Laan
4d1d94c56c
Rename CreateThread to NewThread
...
Prevent clash with win32 API symbol
2012-08-29 20:25:37 +02:00
Jeff Garzik
4445434a2d
Merge pull request #1745 from gmaxwell/irc_fixes
...
Misc IRC fixes.
2012-08-29 11:02:21 -07:00
Wladimir J. van der Laan
61d8507140
implement CreateThread with boost::thread
...
I'm not sure why this wasn't done before.
- Removes typedef of pthread_t on Windows, which fixes a native compile issue on mingw.
2012-08-29 20:02:07 +02:00
Wladimir J. van der Laan
74d36d44f2
Merge pull request #1754 from laanwj/2012_08_stringsupdate2
...
Update strings for 0.7.0rc2
2012-08-29 10:58:11 -07:00
Wladimir J. van der Laan
6117afeeaa
Update strings for 0.7.0rc2
2012-08-29 19:55:40 +02:00
Wladimir J. van der Laan
c7df832d7a
Merge pull request #1617 from Diapolo/Show_Hide_string
...
Update string for Show/Hide in the tray
2012-08-29 10:52:01 -07:00