From a499ace80b71cbd0eb6abb1415788b1a3c528102 Mon Sep 17 00:00:00 2001 From: arvidn Date: Thu, 27 Sep 2018 23:27:29 -0700 Subject: [PATCH 1/2] fix issue in udp_socket with unusual socket failure --- ChangeLog | 1 + src/udp_socket.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63f070932..1b5f75b50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ + * fix issue in udp_socket with unusual socket failure * split progress_notification alert category into file-, piece- and block progress * utp close-reason fix * exposed default add_torrent_params flags to python bindings diff --git a/src/udp_socket.cpp b/src/udp_socket.cpp index d4d51476a..54fa21183 100644 --- a/src/udp_socket.cpp +++ b/src/udp_socket.cpp @@ -586,8 +586,10 @@ void udp_socket::setup_read(udp::socket* s) error_code ec; boost::system::system_error e(ec); #endif - get_io_service().post(boost::bind(&udp_socket::on_read - , this, e.code(), s)); + on_read_impl(udp::endpoint(), e.code(), 0); + m_abort = true; + close(); + return; } } From 200bb494c32c2ed8ee9eef912e73130aeb265023 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sun, 30 Sep 2018 15:46:34 -0700 Subject: [PATCH 2/2] bump version --- CMakeLists.txt | 2 +- ChangeLog | 2 ++ Jamfile | 2 +- bindings/python/setup.py | 2 +- configure.ac | 2 +- docs/building.rst | 2 +- docs/contributing.rst | 2 +- docs/dht_rss.rst | 2 +- docs/dht_sec.rst | 2 +- docs/dht_store.rst | 2 +- docs/examples.rst | 2 +- docs/features.rst | 2 +- docs/gen_reference_doc.py | 2 +- docs/hacking.rst | 2 +- docs/index.rst | 2 +- docs/manual.rst | 2 +- docs/troubleshooting.rst | 2 +- docs/tuning.rst | 2 +- docs/tutorial.rst | 2 +- docs/utp.rst | 2 +- include/libtorrent/version.hpp | 6 +++--- src/settings_pack.cpp | 2 +- 22 files changed, 25 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c7d9c68d..d94e082af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.8) project(libtorrent) set (SOVERSION "8") -set (VERSION "1.1.9") +set (VERSION "1.1.10") set(sources web_connection_base diff --git a/ChangeLog b/ChangeLog index 1b5f75b50..29592b79d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.1.10 release + * fix issue in udp_socket with unusual socket failure * split progress_notification alert category into file-, piece- and block progress * utp close-reason fix diff --git a/Jamfile b/Jamfile index 552053ad9..d8e3dbbad 100644 --- a/Jamfile +++ b/Jamfile @@ -57,7 +57,7 @@ else : : $(boost-include-path) ; } -VERSION = 1.1.9 ; +VERSION = 1.1.10 ; rule linking ( properties * ) { diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 052900182..1b4ed877d 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -154,7 +154,7 @@ else: libraries = ['torrent-rasterbar'] + flags.libraries)] setup(name = 'python-libtorrent', - version = '1.1.9', + version = '1.1.10', author = 'Arvid Norberg', author_email = 'arvid@libtorrent.org', description = 'Python bindings for libtorrent-rasterbar', diff --git a/configure.ac b/configure.ac index 53af7b676..a5e4fe226 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[1.1.9],[arvid@libtorrent.org], +AC_INIT([libtorrent-rasterbar],[1.1.10],[arvid@libtorrent.org], [libtorrent-rasterbar],[http://www.libtorrent.org]) AC_CONFIG_SRCDIR([src/torrent.cpp]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/docs/building.rst b/docs/building.rst index 4c17226c8..ed200572c 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/contributing.rst b/docs/contributing.rst index 9df3dc628..f0c2a48ca 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_rss.rst b/docs/dht_rss.rst index fdaa39370..c7d2650eb 100644 --- a/docs/dht_rss.rst +++ b/docs/dht_rss.rst @@ -3,7 +3,7 @@ BitTorrent extension for DHT RSS feeds ====================================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_sec.rst b/docs/dht_sec.rst index b6880bbe1..655864c4f 100644 --- a/docs/dht_sec.rst +++ b/docs/dht_sec.rst @@ -3,7 +3,7 @@ BitTorrent DHT security extension ================================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_store.rst b/docs/dht_store.rst index 761f7ec66..61ae47bb0 100644 --- a/docs/dht_store.rst +++ b/docs/dht_store.rst @@ -3,7 +3,7 @@ BitTorrent extension for arbitrary DHT store ============================================ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/examples.rst b/docs/examples.rst index a65deb0f9..5020d7a66 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -3,7 +3,7 @@ libtorrent Examples =================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/features.rst b/docs/features.rst index 63f44fc1d..9bf93bada 100644 --- a/docs/features.rst +++ b/docs/features.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py index 9370f9c9b..bf4e49779 100644 --- a/docs/gen_reference_doc.py +++ b/docs/gen_reference_doc.py @@ -1027,7 +1027,7 @@ for cat in categories: out.write(''' :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 `home`__ diff --git a/docs/hacking.rst b/docs/hacking.rst index 5dba5dd82..8e1409c29 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -3,7 +3,7 @@ libtorrent hacking ================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/index.rst b/docs/index.rst index 0e6ad9fbc..13bed40ca 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,5 +1,5 @@ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. raw:: html diff --git a/docs/manual.rst b/docs/manual.rst index 49dbeef38..d4f2fb411 100644 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -3,7 +3,7 @@ libtorrent API Documentation ============================ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 1 diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index 7db7af9bf..c40798105 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/tuning.rst b/docs/tuning.rst index 908dc6587..58108f604 100644 --- a/docs/tuning.rst +++ b/docs/tuning.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 9013e59a0..13849800d 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/docs/utp.rst b/docs/utp.rst index 40755d4e8..1901c73f8 100644 --- a/docs/utp.rst +++ b/docs/utp.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.9 +:Version: 1.1.10 .. contents:: Table of contents :depth: 2 diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index a16b9795f..f174c9e4e 100644 --- a/include/libtorrent/version.hpp +++ b/include/libtorrent/version.hpp @@ -37,14 +37,14 @@ POSSIBILITY OF SUCH DAMAGE. #define LIBTORRENT_VERSION_MAJOR 1 #define LIBTORRENT_VERSION_MINOR 1 -#define LIBTORRENT_VERSION_TINY 9 +#define LIBTORRENT_VERSION_TINY 10 // the format of this version is: MMmmtt // M = Major version, m = minor version, t = tiny version #define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTORRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY) -#define LIBTORRENT_VERSION "1.1.9.0" -#define LIBTORRENT_REVISION "1ebc5f9ef" +#define LIBTORRENT_VERSION "1.1.10.0" +#define LIBTORRENT_REVISION "a499ace80" namespace libtorrent { diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index 6fbe1aca6..deabbce79 100644 --- a/src/settings_pack.cpp +++ b/src/settings_pack.cpp @@ -148,7 +148,7 @@ namespace libtorrent SET_NOPREV(proxy_username, "", &session_impl::update_proxy), SET_NOPREV(proxy_password, "", &session_impl::update_proxy), SET_NOPREV(i2p_hostname, "", &session_impl::update_i2p_bridge), - SET_NOPREV(peer_fingerprint, "-LT1190-", 0), + SET_NOPREV(peer_fingerprint, "-LT11A0-", 0), SET_NOPREV(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes) };