commit 38747b40dcadd320220bb050974d5e5860a8ecbb
from: Alexander Barton <alex@barton.de>
date: Wed Mar 16 22:58:39 2011 UTC

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

commit - dbb66695c938a7c13e0d399937f191456c7b1119
commit + 38747b40dcadd320220bb050974d5e5860a8ecbb
blob - 7e752179185724e1211193e3c3af6002629be29a
blob + 92d54ab15e42ad64d2e7d05bd605bccc1cd7f734
--- src/ngircd/irc-login.c
+++ 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 )
 {
@@ -690,6 +702,8 @@ IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req )
 	Req->argv[0] = "Oops, HTTP request received? This is IRC!";
 	return IRC_QUIT(Client, Req);
 } /* IRC_QUIT_HTTP */
+
+#endif
 
 
 /**
blob - 51149da52108b5c1f92151cdb94e490f9e3a5dc8
blob + 11bb3d114735687175cae48b78dde48e7c8090da
--- src/ngircd/parse.c
+++ 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 */
 };