]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
Default defer to on for SSL listeners
authorAttila Molnar <attilamolnar@hush.com>
Wed, 24 Aug 2016 10:29:40 +0000 (12:29 +0200)
committerAttila Molnar <attilamolnar@hush.com>
Wed, 24 Aug 2016 10:29:40 +0000 (12:29 +0200)
Issue #1112

src/listensocket.cpp

index fb9f2a0eff6e313ef01caced913462fa1033d6e1..13aebf75f4b3ef2419bf2d68f335686cbb1e7c5b 100644 (file)
@@ -59,7 +59,8 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        if (rv >= 0)
                rv = SocketEngine::Listen(this->fd, ServerInstance->Config->MaxConn);
 
-       int timeout = tag->getInt("defer", 0);
+       // Default defer to on for TLS listeners because in TLS the client always speaks first
+       int timeout = tag->getInt("defer", (tag->getString("ssl").empty() ? 0 : 3));
        if (timeout && !rv)
        {
 #if defined TCP_DEFER_ACCEPT