Commit graph

3065 commits

Author SHA1 Message Date
Gavin Andresen
0a4e67afad Bump client version number for 0.7.0rc3 2012-09-12 14:07:22 -04:00
Gavin Andresen
b3295cd283 Merge pull request #1822 from sipa/fix_ipv6_rpc
Do not abort if RPC listening for IPv6 fails
2012-09-12 11:02:40 -07:00
Pieter Wuille
c1d79812f4 Do not abort if RPC listening for IPv6 fails
Instead, fall back to IPv4 listening.
2012-09-12 16:45:09 +02:00
Gavin Andresen
d078739965 Merge branch 'bip30_harder' of git://github.com/gmaxwell/bitcoin 2012-09-12 10:20:46 -04:00
Wladimir J. van der Laan
8b1eb5687d Merge pull request #1755 from osmosis79/patch-1
Update doc/build-unix.txt
2012-09-11 11:55:29 -07:00
osmosis
a21bdda7ad Cleanup on doc/build-unix.txt 2012-09-11 10:47:12 -07:00
Gregory Maxwell
ab91bf39b7 Apply BIP30 checks to all blocks except the two historic violations.
Matt pointed out some time ago that there existed a minor DOS
attack where a node in its initial block download could be wedged
by an overwrite attack in a fork created between checkpoints before
a time where BIP30 was enforced. Now that the BIP30 timestamp
is irreversibly past the check can be more aggressive and apply to
all blocks except the two historic violations.
2012-09-09 20:11:04 -04:00
Wladimir J. van der Laan
0e08efc54a Merge pull request #1808 from laanwj/2012_09_serialize_deadcode
Remove VC6 comment and pointless #ifdef'd benchmark code
2012-09-09 11:20:04 -07:00
Wladimir J. van der Laan
b019ea17ec Remove VC6 comment and pointless #ifdef'd benchmark code
We're in a wholly different world now, C++-compiler-wise.

Current std::stringstream implementations don't have the stated problem anymore,
and are just as fast as CDataStream.

The #ifdef'd block does not even compile anymore; CDataStream constructor changed,
and missing some std::. Also timing in whole seconds is also way too granular
to say anything sensible in such microbenchmarks. Just remove it,
it can always be found again in git history.
2012-09-09 17:24:00 +02:00
Wladimir J. van der Laan
eabc8f2c81 Merge pull request #1803 from luke-jr/md2k7_license
Apply MIT license to md2k7 art
2012-09-09 01:58:00 -07:00
Wladimir J. van der Laan
d8ecd21ff7 Merge pull request #1802 from luke-jr/bugfix_ts
Update translations from Transifex (100% coverage for Finnish and Chinese (China)
2012-09-09 00:04:03 -07:00
Luke Dashjr
23a44a7ad6 Apply MIT license to md2k7 art
[21:48:14] <md2k7> feel free to make it MIT if you like
2012-09-08 21:51:52 +00:00
Luke Dashjr
85eb1e7e56 Update translations from Transifex (100% coverage for Finnish and Chinese (China) 2012-09-08 20:32:54 +00:00
Wladimir J. van der Laan
31fac119dc Merge pull request #1796 from luke-jr/bugfix_ts
Various translation fixups and restorations
2012-09-07 22:15:19 -07:00
Luke Dashjr
4ee706243c Partially Bugfix: Update English translation strings and translations from Transifex
Bugfix: Correct doubled-up &amp;amp; in translations
Bugfix: Remove extra spaces after ampersand in translations (this fixes hotkeys)
Restore copyright translations, now split up
Restore old translations lost due to changes to English structure
	Skipped: ca_ES et eu_ES fr_CA (under 10% coverage)
2012-09-08 04:59:13 +00:00
Wladimir J. van der Laan
5cb01b5714 Merge pull request #1799 from Diapolo/release-notes
small update to release-notes.txt
2012-09-07 07:44:08 -07:00
Philip Kaufmann
2dc953274d small update to release-notes.txt 2012-09-07 16:33:50 +02:00
Wladimir J. van der Laan
db1967957d Merge pull request #1798 from xanatos/patch-19
Wrong address added to collection in test (address1 instead of address2)
2012-09-07 07:13:23 -07:00
Wladimir J. van der Laan
7b1504ccb8 Merge pull request #1683 from Diapolo/Qt_Win_exe_version
Bitcoin-Qt (Windows only): add version info to Resource File
2012-09-07 07:12:58 -07:00
Philip Kaufmann
f875921176 Bitcoin-Qt (Windows only): add version info to Resource File
- add version information to bitcoin-qt.rc, which is displayed on Windows, when looking in the executable properties and selecting "Details"
- introduce a new clientversion.h (used in bitcoin-qt.rc to generate
  version information), which takes only the version defines from
  version.h and is included in it (to allow usage with the windres rc-file
  compiler)
- move #define STRINGIFY(s) #s into clientversion.h as that is used in
  bitcoin-qt.rc and rename to DO_STRINGIZE(X)
- add #define STRINGIZE(X) DO_STRINGIZE(X), which is needed to convert the
  version defines into a version string in the rc-file
- this ensures we only need to update 1 file and have bitcoin-qt.exe
  version information

- for RC-file documentation see:
  http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058%28v=vs.85%29.aspx
2012-09-07 16:08:18 +02:00
xanatos
af8c050bff Wrong address added to collection in test
The wrong address is added to the collection. As was written a second copy of address1 was added (and so address2 was useless).
2012-09-07 16:04:39 +03:00
Wladimir J. van der Laan
b9a4aaad1e Merge pull request #1726 from laanwj/2012_08_gitian_qt_styles
Remove unused styles on Windows from gitian qt build
2012-09-06 23:34:43 -07:00
Wladimir J. van der Laan
f106491fa2 Merge pull request #1786 from jgarzik/select-fix
select()'s first argument should be zero, if no file descriptors are selected
2012-09-06 23:30:22 -07:00
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
Jeff Garzik
2387944782 select(): Use precise fd presence check, rather than imprecise hSocketMax test 2012-09-05 16:01:28 -04: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