Don't use IRC_QUIT_HTTP() if STRICT_RFC is #define'd

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 7e752179185724e1211193e3c3af6002629be29a..92d54ab15e42ad64d2e7d05bd605bccc1cd7f734 100644 (file)
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -683,6 +683,18 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req )
 } /* IRC_QUIT */
 
 
+#ifndef STRICT_RFC
+
+/**
+ * Handler for HTTP command, e.g. GET and POST
+ *
+ * We handle these commands here to avoid the quite long timeout when
+ * some user tries to access this IRC daemon using an web browser ...
+ *
+ * @param Client       The client from which this command has been received.
+ * @param Req          Request structure with prefix and all parameters.
+ * @returns            CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req )
 {
@@ -691,6 +703,8 @@ IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req )
        return IRC_QUIT(Client, Req);
 } /* IRC_QUIT_HTTP */
 
+#endif
+
 
 /**
  * Handler for the IRC "PING" command.

diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c
index 51149da52108b5c1f92151cdb94e490f9e3a5dc8..11bb3d114735687175cae48b78dde48e7c8090da 100644 (file)
--- a/src/ngircd/parse.c
+++ b/src/ngircd/parse.c
@@ -85,8 +85,6 @@ static COMMAND My_Commands[] =
        { "PONG", IRC_PONG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
        { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
        { "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 },
-       { "GET",  IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 },
-       { "POST", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 },
        { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 },
        { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0 },
        { "SERVER", IRC_SERVER, 0xFFFF, 0, 0, 0 },
@@ -110,6 +108,10 @@ static COMMAND My_Commands[] =
        { "WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
 #ifdef IRCPLUS
        { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 },
+#endif
+#ifndef STRICT_RFC
+       { "GET",  IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 },
+       { "POST", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 },
 #endif
        { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */
 };