jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged RC_1_2 into RC_2_0

Browse Source
This commit is contained in:
arvidn
2021-01-04 14:01:32 +01:00
parent 49454d8cc1 bfafd20428
commit bb92f6673c
6 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -1,4 +1,4 @@
Written by Arvid Norberg. Copyright (c) 2003-2019
Written by Arvid Norberg. Copyright (c) 2003-2021
Contributions by:
Andrei Kurushin
@ -19,7 +19,7 @@ Thanks to (github user) nervoir for bug reports
Thanks to Reimond Retz for bugfixes, suggestions and testing
Thanks to University of Ume<6D> for providing development and test hardware.
Thanks to University of Ume<6D> for providing development and test hardware.
Project is hosted by Github

1
Makefile
View File

@ -75,6 +75,7 @@ DOCS_IMAGES = \
docs/img/utp_stack.png \
docs/img/bitcoin.png \
docs/img/logo-color-text.png \
docs/img/pp-acceptance-medium.png \
docs/style.css
DOCS_PAGES = \

BIN
docs/img/pp-acceptance-medium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

10
docs/index.rst
View File

@ -153,13 +153,6 @@ See the contributing_ page for other ways to help out.
<a href="bitcoin:373ZDeQgQSQNuxdinNAPnQ63CRNn4iEXzg">bitcoin:373ZDeQgQSQNuxdinNAPnQ63CRNn4iEXzg</a>
</div>
<span style="display:block;text-align:center;margin-top:1em">
<span style="display:inline-block">
<a class="FlattrButton" style="display:none;" href="https://libtorrent.org"></a>
<noscript><a href="https://flattr.com/thing/95662/libtorrent" target="_blank">
<img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript>
</span>
<span style="display:inline-block">
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_donations">
@ -168,8 +161,7 @@ See the contributing_ page for other ways to help out.
<input type="hidden" name="item_name" value="libtorrent">
<input type="hidden" name="currency_code" value="USD">
<input type="hidden" name="bn" value="PP-DonationsBF:btn_donate_LG.gif:NonHosted">
<input type="image" src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
<input type="image" src="img/pp-acceptance-medium.png" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
</form>
</span>
</span>

2
src/alert.cpp
View File

@ -2060,7 +2060,7 @@ namespace {
return msg;
}
std::snprintf(msg, sizeof(msg), "DHT put commplete (success=%d hash=%s)"
std::snprintf(msg, sizeof(msg), "DHT put complete (success=%d hash=%s)"
, num_success
, aux::to_hex(target).c_str());
return msg;

4
src/peer_connection.cpp
View File

@ -1018,7 +1018,7 @@ namespace libtorrent {
&& has_piece(index))
{
#ifndef TORRENT_DISABLE_LOGGING
peer_log(peer_log_alert::outgoing_message, "HAVE", "piece: %d SUPRESSED"
peer_log(peer_log_alert::outgoing_message, "HAVE", "piece: %d SUPPRESSED"
, static_cast<int>(index));
#endif
return;
@ -2368,7 +2368,7 @@ namespace libtorrent {
#ifndef TORRENT_DISABLE_LOGGING
if (should_log(peer_log_alert::info))
{
peer_log(peer_log_alert::info, "INVALID_REQUEST", "piece not superseeded "
peer_log(peer_log_alert::info, "INVALID_REQUEST", "piece not super-seeded "
"i: %d t: %d n: %d h: %d ss1: %d ss2: %d"
, m_peer_interested
, valid_piece_index