aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4903Pieter Wuille2014-09-161-12/+16
|\ | | | | | | efad808 Avoid reject message feedback loops (Pieter Wuille)
| * Avoid reject message feedback loopsPieter Wuille2014-09-121-12/+16
| |
* | Merge pull request #4930Wladimir J. van der Laan2014-09-161-1/+1
|\ \ | | | | | | | | | f4fe205 add nModSize init to default constructor of CTxMemPoolEntry (Philip Kaufmann)
| * | add nModSize init to default constructor of CTxMemPoolEntryPhilip Kaufmann2014-09-161-1/+1
| | |
* | | Merge pull request #4719Wladimir J. van der Laan2014-09-1617-35/+42
|\ \ \ | | | | | | | | | | | | 52a5f90 Create the common location for all m4 autotool build scripts, build-aux/m4.
| * | | Create the common location for all m4 autotool build scripts, build-aux/m4.randy-waterhouse2014-09-1617-35/+42
| | | | | | | | | | | | | | | | Update .gitignore.
* | | | Merge pull request #4460Wladimir J. van der Laan2014-09-161-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | 604ee2a Remove tx from AlreadyAskedFor list once we receive it, not when we process it. (R E Broadley)
| * | | | Remove tx from AlreadyAskedFor list once we receive it, not when we process it.R E Broadley2014-07-161-3/+3
| | | | |
* | | | | Merge pull request #4611Wladimir J. van der Laan2014-09-168-51/+289
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 234bfbf Add init scripts and docs for Upstart and OpenRC (Adam Weiss)
| * | | | | Add init scripts and docs for Upstart and OpenRCAdam Weiss2014-09-098-51/+289
| | | | | |
* | | | | | Merge pull request #4853Wladimir J. van der Laan2014-09-169-193/+241
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | 2605b94 [Qt] update form files for setting autoDefault explicitly to false (Philip Kaufmann)
| * | | | | [Qt] update form files for setting autoDefault explicitly to falsePhilip Kaufmann2014-09-059-193/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - also fixes indentation in one file (auto fixed by Qt Designer) - removes several default parameters, which are not needed in the files - related to #4840 (but not intended as fix for a no-bug)
* | | | | | Merge pull request #4825Pieter Wuille2014-09-169-23/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 8d657a6 Fixing compiler warning C4800: 'type' forcing value to bool 'true' or 'false' (ENikS)
| * | | | | | Fixing compiler warning C4800: 'type' forcing value to bool 'true' or 'false'ENikS2014-09-069-23/+23
| | | | | | |
* | | | | | | Merge pull request #4911Pieter Wuille2014-09-1636-46/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 611116d header include cleanup (Philip Kaufmann)
| * | | | | | | header include cleanupPhilip Kaufmann2014-09-1436-48/+67
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | - ensures alphabetical ordering for includes etc. in source file headers
* | | | | | | Merge pull request #4875Pieter Wuille2014-09-163-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7e3637 Eliminate extra assignment (Suhas Daftuar) ec7eb0f When reindexing check for file before trying to open (refactored) (Suhas Daftuar)
| * | | | | | | Eliminate extra assignmentSuhas Daftuar2014-09-151-2/+1
| | | | | | | |
| * | | | | | | When reindexing check for file before trying to open (refactored)Suhas Daftuar2014-09-103-2/+12
| | | | | | | |
* | | | | | | | Merge pull request #4869Wladimir J. van der Laan2014-09-152-22/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 6050ab6 netbase: Make SOCKS5 negotiation interruptible (Wladimir J. van der Laan)
| * | | | | | | | netbase: Make SOCKS5 negotiation interruptibleWladimir J. van der Laan2014-09-102-22/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids that SOCKS5 negotiation will hold up the shutdown process. - Sockets can stay in non-blocking mode, no need to switch it on/off anymore - Adds a timeout (20 seconds) on SOCK5 negotiation. This should be enough for even Tor to get a connection to a hidden service, and avoids blocking the opencon thread indefinitely on a hanging proxy. Fixes #2954.
* | | | | | | | | Fixing compiler warning C4101ENikS2014-09-159-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Github-Pull: #4856
* | | | | | | | | Merge pull request #4919Wladimir J. van der Laan2014-09-151-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21b7add Bugfix: Add missing equals-sign to Travis config (Luke Dashjr)
| * | | | | | | | | Bugfix: Add missing equals-sign to Travis configLuke Dashjr2014-09-151-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4798Wladimir J. van der Laan2014-09-151-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d920f7d Move g_signals.SetBestChain(..) below SyncWithWallets (Cozz Lovan)
| * | | | | | | | | Move g_signals.SetBestChain(..) below SyncWithWalletsCozz Lovan2014-08-311-6/+6
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4817Pieter Wuille2014-09-154-3/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c26649f Track modified size in TxMemPoolEntry so that we can correctly compute priority. (Alex Morcos)
| * | | | | | | | | | Track modified size in TxMemPoolEntry so that we can correctly compute priority.Alex Morcos2014-09-084-3/+17
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4909Jeff Garzik2014-09-144-3/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | bitcoin-util-test: Test bitcoin-tx with null scriptPubKeyLuke Dashjr2014-09-143-1/+6
| | | | | | | | | | |
| * | | | | | | | | | Bugfix: bitcoin-tx: scriptPubKey may be null, so accept outscript=<n>:Luke Dashjr2014-09-141-2/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4881Pieter Wuille2014-09-1413-33/+34
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | 2d79bba cleanup new script files (no code changes) (Philip Kaufmann)
| * | | | | | | | | cleanup new script files (no code changes)Philip Kaufmann2014-09-1413-33/+34
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add missing header end comments - ensure alphabetical ordering - update copyright year and license
* | | | | | | | | Merge pull request #4896Wladimir J. van der Laan2014-09-121-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07d5287 Catch error when done reading files (Suhas Daftuar)
| * | | | | | | | | Catch error when done reading filesSuhas Daftuar2014-09-111-1/+5
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4876Pieter Wuille2014-09-124-794/+821
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6022b5d Make script_{valid,invalid}.json validation flags configurable (Pieter Wuille)
| * | | | | | | | | Make script_{valid,invalid}.json validation flags configurablePieter Wuille2014-09-084-794/+821
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4758 from theuni/osx-dmg-codesign-rebaseGavin Andresen2014-09-121-0/+29
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | build: osx: Fix incomplete framework packaging for codesigning
| * | | | | | | | | build: osx: Fix incomplete framework packaging for codesigningCory Fields2014-08-231-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with 10.9, Framework versions must be signed individually, rather than as a single bundle version, in order to be properly codesigned. This change ensures that the proper plist files and symlinks are present prior to packaging.
* | | | | | | | | | Merge pull request #4885Wladimir J. van der Laan2014-09-114-20/+70
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa3c697 Store fewer orphan tx by default, add -maxorphantx option (Gavin Andresen) c74332c Stricter handling of orphan transactions (Gavin Andresen)
| * | | | | | | | | | Store fewer orphan tx by default, add -maxorphantx optionGavin Andresen2014-09-103-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to store thousands of orphan transactions; normally an orphan's parents will either be broadcast or mined reasonably quickly. This pull drops the maximum number of orphans from 10,000 down to 100, and adds a command-line option (-maxorphantx) that is just like -maxorphanblocks to override the default.
| * | | | | | | | | | Stricter handling of orphan transactionsGavin Andresen2014-09-102-17/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent denial-of-service attacks by banning peers that send us invalid orphan transactions and only storing orphan transactions given to us by a peer while the peer is connected.
* | | | | | | | | | | Merge pull request #4892Wladimir J. van der Laan2014-09-112-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | e982b57 Use explicit fflush() instead of setvbuf() (Adam Weiss)
| * | | | | | | | | | Use explicit fflush() instead of setvbuf()Adam Weiss2014-09-102-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flushing after every line when printing to console is desirable when running with systemd but setvbuf() has slightly different semantics on Windows that causes warnings. Just do an explicit fflush() after each line print to console instead.
* | | | | | | | | | Fix crashing bug caused by orphan(s) with duplicate prevout.hashGavin Andresen2014-09-101-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4878Wladimir J. van der Laan2014-09-103-0/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 540ac45 Avoid returning many "inv" orphans (Jeff Garzik) d4168c8 Limit CNode::mapAskFor (Wladimir J. van der Laan)
| * | | | | | | | | | Avoid returning many "inv" orphansJeff Garzik2014-09-091-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Limit CNode::mapAskForWladimir J. van der Laan2014-09-092-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tighten resource constraints on CNode.
* | | | | | | | | | | Merge pull request #4623Wladimir J. van der Laan2014-09-105-13/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e84843c Broken addresses on command line no longer trigger testnet. (Ross Nicoll)
| * | | | | | | | | | | Broken addresses on command line no longer trigger testnet.Ross Nicoll2014-08-305-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing a bitcoin: URI on the command line, invalid addresses do not incorrectly send the user to the test network.