Merge branches 'CloakUserHost', 'QuitOnHTTP' and 'bug72-WHOIS-List'

[ngircd-alex.git] / src / ngircd / irc-login.c

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 3c4eb189d58b7035d2c7bd7df7c53d47bceddced..92d54ab15e42ad64d2e7d05bd605bccc1cd7f734 100644 (file)
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -683,10 +683,13 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req )
 } /* IRC_QUIT */
 
 
+#ifndef STRICT_RFC
+
 /**
- * Handler for the IRC "PING" command.
+ * Handler for HTTP command, e.g. GET and POST
  *
- * See RFC 2812, 3.7.2 "Ping message".
+ * 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.
@@ -695,11 +698,23 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req )
 GLOBAL bool
 IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req )
 {
-       Req->argc = 0;
+       Req->argc = 1;
+       Req->argv[0] = "Oops, HTTP request received? This is IRC!";
        return IRC_QUIT(Client, Req);
-}
+} /* IRC_QUIT_HTTP */
+
+#endif
 
 
+/**
+ * Handler for the IRC "PING" command.
+ *
+ * See RFC 2812, 3.7.2 "Ping message".
+ *
+ * @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_PING(CLIENT *Client, REQUEST *Req)
 {