Mercurial > irccd
changeset 929:85feff0a2edf stable-3
misc: merge from release-3.1
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Mon, 04 Jan 2021 10:30:05 +0100 |
| parents | 378dc1a023f0 (current diff) ce37b2f12750 (diff) |
| children | 5ec14fdb00cf |
| files | |
| diffstat | 7 files changed, 17 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Fri Jul 03 11:38:09 2020 +0200 +++ b/.hgsigs Mon Jan 04 10:30:05 2021 +0100 @@ -12,3 +12,4 @@ 3e0b2fc5f79ebc40233ee9f8b7ea0c178f72c64a 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl2Hx3cACgkQodr5uEAj8x/YDQgAi4V8IsKc7u0fJjINnlLRa37JfgwRqtADJkyT9a1GR+BfbB3XT3/VgBFYx0SDFvbW9lQ7ZmOLaLd5tMJap5xzrK+yUl3ctgWLZMZUyUKdsxYOcN19x6qkKK06E7hBZqif/OfKvMq96xScRBKCdHh8mASmzjyIMszcnVVc/pH3Joy5gayM5wobJqRFeP/JIbdKaHM0V04O25j04yfJSZwaxYNQUQGi7vSSrB1die8r1HtHw8bYOxGA6FOjCoC7xUv9RD1UaXsKVTfChechFNHdKGSSP/r0gGG4mB6pYY6jmeoHOJR27wZrmfWvHYrgWasZK6pkcZ5ywy0eubdXMrG/0A== 4c68a73f31e92afe2a5986f810b299c1de28ba5a 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl2ZlTYACgkQodr5uEAj8x+FOgf/QOK/lRL2RY9i3frA3V8wbUz8o3iQmSE2rkWpWP2NacgIyAFwer/APJi7FecsZgJflwBHfXD06YH4V9lycVXmu0nJFMofSyMeWlUntzIjouBwjt7FtO80UJ0dARr6Czbsp2rUYBnz32lewS3ay6hkNHOOxCfj+Qpg8xDYSyW6mHzmeOJ5W9CL7brAaJlYO+es3zVgfA66PVmXskknjSaghLXnWH/irwJ08dS0rkAz8ltXuuzoqxOoHZyhV9Ib+i/GXnMCM4Xs7YLELmkK3hpCXpWA2RooN/4igiMs4J4DFmwiI85TZhPJyDTzhbvKwsCr+QGB5MDIC9UAZhg1hlNxQw== 52334419194e8e256fcee202d8ea163b3d1e08d6 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl7+/EgACgkQodr5uEAj8x+1ZQgAthVpFrD0iGZf3bG9bI0BfLxccWCPEhjLs+gIvnt5dl3lh83SQ+8M3D6Jo8mCR3r3WWVKlqa8f0a4L8MxV+GRv6CGeyMrzjzIFipDWm1gU+6nGssNuHp7neC4XECaI3Iu2150Qz3t6Ugdgbo2sqAgUc0BspJhITwoR7UNDmG894fNYlDLpwVYYEP8NU6i4efeD0IPMNzESl+WhJL6VCmBoESlwOCXTMR13ugyibnWmnyPNfH90/vpx1ZL/6woUgO+0QD94Bv5sAtbvSbwSMwJ351p0b9e05bd6PpTIT25HxTIpZyWmAmUroSjNV88KGdG3fJ3rTX5rXSOWArL5j9G4g== +45110aed06f0e483c1f6243cde3f24078819d10a 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl/y4AYACgkQodr5uEAj8x+HzAf9FZkgYj3W4Bx2bwfqG4st4bes2Ucv18QcStp15mu6ukxRroPzj3Q9YwN0Y97yLrq6LJnMx8+O+NV4R5CSgiATZ+6yvezMH7dkJasU6P9r26XoPUno7NIf+QaHEGXrCDljQd4N+EaM/qpxD9PW46Lf2LGO47f3C84Z4h3MKqc3LJEuK9sGsolcFaaSizmpOaLAez2mzxBst1TalHrJHeolS8jyZWtqNWtm5gzxXhIrbQPKZbiOhdcf6b2adKpgNP3mlpNqQDtoOOeFXyDRunP8QFiPOYimjsHrVY2U3ltF/b3U+dHEjk54MQ3U8u/wZVeqUQS7yghYk2g67EORZwcNJA==
--- a/.hgtags Fri Jul 03 11:38:09 2020 +0200 +++ b/.hgtags Mon Jan 04 10:30:05 2021 +0100 @@ -12,3 +12,4 @@ 9f953fb28a607c62815da41ee6c9d4cfabbc5eac 3.0.2 f14e00397e429c0f9d38b1f0777293e1577d6994 3.0.3 49b25adcd313a1b6df225540b0a2107fb4607da5 3.1.0 +c0408dc4a74a19554ae7b024e9e609ac0478a021 3.1.1
--- a/CHANGES.md Fri Jul 03 11:38:09 2020 +0200 +++ b/CHANGES.md Mon Jan 04 10:30:05 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 ----------------------
--- a/cmake/IrccdVersion.cmake Fri Jul 03 11:38:09 2020 +0200 +++ b/cmake/IrccdVersion.cmake Mon Jan 04 10:30:05 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")
--- a/libirccd-daemon/irccd/daemon/server.cpp Fri Jul 03 11:38:09 2020 +0200 +++ b/libirccd-daemon/irccd/daemon/server.cpp Mon Jan 04 10:30:05 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) {
--- a/libirccd-daemon/irccd/daemon/server.hpp Fri Jul 03 11:38:09 2020 +0200 +++ b/libirccd-daemon/irccd/daemon/server.hpp Mon Jan 04 10:30:05 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_;
--- a/man/irccd.conf.5 Fri Jul 03 11:38:09 2020 +0200 +++ b/man/irccd.conf.5 Mon Jan 04 10:30:05 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)