# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1609752546 -3600
# Node ID c0408dc4a74a19554ae7b024e9e609ac0478a021
# Parent  f46f74d118d5b8784750e8f4b3c60eac08d50f8b# Parent  d585adeee610fa399e60c6c12b3a36858950f9e8
misc: update before 3.1.1 release

diff -r f46f74d118d5 -r c0408dc4a74a CHANGES.md
--- a/CHANGES.md	Fri Jul 03 11:37:19 2020 +0200
+++ b/CHANGES.md	Mon Jan 04 10:29:06 2021 +0100
@@ -1,6 +1,13 @@
 IRC Client Daemon CHANGES
 =========================
 
+irccd 3.1.1 2021-01-04
+----------------------
+
+- Synchronize `ping-timeout` option in `[server]` to 1800 seconds by default,
+- Enable `auto-reconnect` option in `[server]` by default as specified in the
+  manual page.
+
 irccd 3.1.0 2020-07-03
 ----------------------
 
diff -r f46f74d118d5 -r c0408dc4a74a cmake/IrccdVersion.cmake
--- a/cmake/IrccdVersion.cmake	Fri Jul 03 11:37:19 2020 +0200
+++ b/cmake/IrccdVersion.cmake	Mon Jan 04 10:29:06 2021 +0100
@@ -30,7 +30,7 @@
 # Irccd version.
 set(IRCCD_VERSION_MAJOR "3")
 set(IRCCD_VERSION_MINOR "1")
-set(IRCCD_VERSION_PATCH "0")
+set(IRCCD_VERSION_PATCH "1")
 set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}${HG_REV}")
 set(IRCCD_VERSION_RAW "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}")
 set(IRCCD_VERSION_SHLIB "1")
@@ -42,10 +42,10 @@
 # IRCCD_RELEASE_DATE_MONTH      2 digits (01 = January)
 # IRCCD_RELEASE_DATE_DAY        2 digits (01 = first day of month)
 #
-set(IRCCD_RELEASE_DATE_YEAR 2020)
-set(IRCCD_RELEASE_DATE_MONTH 07)
-set(IRCCD_RELEASE_DATE_DAY 03)
+set(IRCCD_RELEASE_DATE_YEAR 2021)
+set(IRCCD_RELEASE_DATE_MONTH 01)
+set(IRCCD_RELEASE_DATE_DAY 04)
 set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}")
 
 # Irccd release data (manual version).
-set(IRCCD_MAN_DATE "July 03, 2020")
+set(IRCCD_MAN_DATE "January 04, 2021")
diff -r f46f74d118d5 -r c0408dc4a74a libirccd-daemon/irccd/daemon/server.cpp
--- a/libirccd-daemon/irccd/daemon/server.cpp	Fri Jul 03 11:37:19 2020 +0200
+++ b/libirccd-daemon/irccd/daemon/server.cpp	Mon Jan 04 10:29:06 2021 +0100
@@ -515,7 +515,7 @@
 server::server(boost::asio::io_service& service, std::string id, std::string hostname)
 	: id_(std::move(id))
 	, hostname_(std::move(hostname))
-	, options_(options::ipv4 | options::ipv6)
+	, options_(options::auto_reconnect | options::ipv4 | options::ipv6)
 	, service_(service)
 	, timer_(service)
 {
diff -r f46f74d118d5 -r c0408dc4a74a libirccd-daemon/irccd/daemon/server.hpp
--- a/libirccd-daemon/irccd/daemon/server.hpp	Fri Jul 03 11:37:19 2020 +0200
+++ b/libirccd-daemon/irccd/daemon/server.hpp	Mon Jan 04 10:29:06 2021 +0100
@@ -317,7 +317,7 @@
 	// Settings.
 	std::string command_char_{"!"};
 	std::uint16_t recodelay_{30};
-	std::uint16_t timeout_{1000};
+	std::uint16_t timeout_{1800};
 
 	// Server information.
 	std::map<channel_mode, char> modes_;
diff -r f46f74d118d5 -r c0408dc4a74a man/irccd.conf.5
--- a/man/irccd.conf.5	Fri Jul 03 11:37:19 2020 +0200
+++ b/man/irccd.conf.5	Mon Jan 04 10:29:06 2021 +0100
@@ -174,7 +174,7 @@
 .It Va auto-reconnect-delay No (int)
 Number of seconds to wait before retrying (Optional, default: 30).
 .It Va ping-timeout No (int)
-Number of seconds before ping timeout (Optional, default: 300).
+Number of seconds before ping timeout (Optional, default: 1800).
 .It Va nickname No (string)
 The nickname (Optional, default: irccd).
 .It Va realname No (string)