Merge branch 'maint'

* maint:
  Bump wait_split to 1000 as irssi has it
  Stop sharing during restart

doc/UPDATES.md

@@ -19,6 +19,7 @@
   * Fix various small memory leaks.
   * Fix case where .[bot]set would not share to new bots until their localhub
     was relinked.
+  * Raise netsplit timeout to 1000 seconds.
 
 # 1.4.6
   * Disable demo TCL support by default to prevent confusion during build.

src/misc.cc

@@ -789,6 +789,9 @@ restart(int idx)
     botnet_send_bye(reason);
   }
 
+  /* Stop sharing to prevent writing LASTON to lostdcc() DCC_BOT sockets. */
+  noshare = 1;
+
   /* kill all connections except STDOUT/server */
   for (fd = 0; fd < dcc_total; fd++) {
     if (dcc[fd].type && dcc[fd].type != &SERVER_SOCKET && dcc[fd].sock != STDOUT) {

src/mod/irc.mod/irc.cc

@@ -74,7 +74,7 @@ static cache_t *irccache = NULL;
 
 #define do_eI (((now - chan->channel.last_eI) > 30) ? 1 : 0)
 
-static time_t wait_split = 900;    /* Time to wait for user to return from
+static time_t wait_split = 1000;    /* Time to wait for user to return from
                                  * net-split. */
 int max_bans;                   /* Modified by net-type 1-4 */
 int max_exempts;