commit f178822e46362ae8be523493da678ff239c8c1a4 Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Apr 25 09:30:18 2015 -0400

Add patch for disabling CTCP ping (#15161) --- projects/instantbird/config | 1 + projects/instantbird/ctcp-ping.patch | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config index f0c81a9..d8f2b38 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -69,6 +69,7 @@ input_files: - filename: installer.patch - filename: cert_override.txt - filename: ctcp-time.patch + - filename: ctcp-ping.patch - filename: branding/name.patch - filename: branding/default.png - filename: branding/default16.png diff --git a/projects/instantbird/ctcp-ping.patch b/projects/instantbird/ctcp-ping.patch new file mode 100644 index 0000000..fb09179 --- /dev/null +++ b/projects/instantbird/ctcp-ping.patch @@ -0,0 +1,25 @@ +diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm +index 5722479..4c2d5bf 100644 +--- a/chat/protocols/irc/ircCTCP.jsm ++++ b/chat/protocols/irc/ircCTCP.jsm +@@ -167,19 +167,7 @@ var ctcpBase = { + }, + + // Used to measure the delay of the IRC network between clients. +- "PING": function(aMessage) { +- // PING timestamp +- if (aMessage.command == "PRIVMSG") { +- // Received PING request, send PING response. +- this.LOG("Received PING request from " + aMessage.origin + +- ". Sending PING response: "" + aMessage.ctcp.param + ""."); +- this.sendCTCPMessage(aMessage.origin, true, "PING", +- aMessage.ctcp.param); +- return true; +- } +- else +- return this.handlePingReply(aMessage.origin, aMessage.ctcp.param); +- }, ++ // "PING": function(aMessage) { + + // These are commented out since CLIENTINFO automatically returns the + // supported CTCP parameters and this is not supported.