diff --git a/CMakeLists.txt b/CMakeLists.txt index e9df1478b..a307d907c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) project(libtorrent) set (SOVERSION "8") -set (VERSION "1.1.1") +set (VERSION "1.1.2") set(sources web_connection_base diff --git a/ChangeLog b/ChangeLog index 77bb9c186..223d820ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.1.2 release + * fix invalid access when leaving seed-mode with outstanding hash jobs * fix ABI compatibility issue introduced with preformatted entry type * add web_seed_name_lookup_retry to session_settings diff --git a/Jamfile b/Jamfile index dd4133138..efe2b91cc 100644 --- a/Jamfile +++ b/Jamfile @@ -58,7 +58,7 @@ else : : $(boost-include-path) ; } -VERSION = 1.1.1 ; +VERSION = 1.1.2 ; # rule for linking the correct libraries depending # on features and target-os diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 9492314e5..8f857e2cf 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -133,7 +133,7 @@ else: libraries = ['torrent-rasterbar'] + flags.libraries)] setup(name = 'python-libtorrent', - version = '1.1.1', + version = '1.1.2', author = 'Arvid Norberg', author_email = 'arvid@libtorrent.org', description = 'Python bindings for libtorrent-rasterbar', diff --git a/configure.ac b/configure.ac index c08e19dfc..df2e859ff 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[1.1.1],[arvid@libtorrent.org], +AC_INIT([libtorrent-rasterbar],[1.1.2],[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 9476448d6..14731cec2 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/contributing.rst b/docs/contributing.rst index 00a7a988b..d47f77dc5 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_rss.rst b/docs/dht_rss.rst index c3dcc32e1..37debbf14 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.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_sec.rst b/docs/dht_sec.rst index 67fea182f..e29fb1f90 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.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_store.rst b/docs/dht_store.rst index 86a5c90a5..a27cbc3c9 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.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/examples.rst b/docs/examples.rst index 21a171495..00a644de5 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -3,7 +3,7 @@ libtorrent Examples =================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/features.rst b/docs/features.rst index 7f2cc4f06..03bb4ddc8 100644 --- a/docs/features.rst +++ b/docs/features.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py index 933e8bddf..6b261fe4a 100644 --- a/docs/gen_reference_doc.py +++ b/docs/gen_reference_doc.py @@ -1005,7 +1005,7 @@ for cat in categories: out.write(''' :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 `home`__ diff --git a/docs/hacking.rst b/docs/hacking.rst index d4a5b4078..66c9c6fe1 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -3,7 +3,7 @@ libtorrent hacking ================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/index.rst b/docs/index.rst index cb033c694..008a0a553 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,5 +1,5 @@ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 .. raw:: html diff --git a/docs/manual.rst b/docs/manual.rst index 43000d7e4..46921d645 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.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 1 diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index b058e8015..4dd599d91 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/tuning.rst b/docs/tuning.rst index 53bd3b5b4..53b1652ac 100644 --- a/docs/tuning.rst +++ b/docs/tuning.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 47cd26783..a7433ee5b 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/docs/utp.rst b/docs/utp.rst index f92dd2e4e..4233a4369 100644 --- a/docs/utp.rst +++ b/docs/utp.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.1 +:Version: 1.1.2 .. contents:: Table of contents :depth: 2 diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index 75f8d5300..6e01fbeec 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 1 +#define LIBTORRENT_VERSION_TINY 2 // 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.1.0" -#define LIBTORRENT_REVISION "1229491" +#define LIBTORRENT_VERSION "1.1.2.0" +#define LIBTORRENT_REVISION "6e65851" namespace libtorrent { diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index b498aae5f..ceec06f9a 100644 --- a/src/settings_pack.cpp +++ b/src/settings_pack.cpp @@ -142,7 +142,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, "-LT1110-", &session_impl::update_peer_fingerprint), + SET_NOPREV(peer_fingerprint, "-LT1120-", &session_impl::update_peer_fingerprint), SET_NOPREV(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes) };