From 3a5dd51b42c2d649f21b01e980565cb08558cb78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
Date: Wed, 5 Aug 2015 16:08:06 +0200
Subject: [PATCH] Use websocket pings also on old style connections

---
 src/ejabberd_http_ws.erl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl
index 66a0542d4..902c32f25 100644
--- a/src/ejabberd_http_ws.erl
+++ b/src/ejabberd_http_ws.erl
@@ -263,10 +263,9 @@ setup_timers(StateData) ->
     Timer = erlang:start_timer(StateData#state.timeout,
                                self(), []),
     cancel_timer(StateData#state.ping_timer),
-    PingTimer = case {StateData#state.ping_interval, StateData#state.rfc_compilant} of
-                    {0, _} -> StateData#state.ping_timer;
-                    {_, false} -> StateData#state.ping_timer;
-                    {V, _} -> erlang:start_timer(V, self(), [])
+    PingTimer = case StateData#state.ping_interval of
+                    0 -> StateData#state.ping_timer;
+                    V -> erlang:start_timer(V, self(), [])
                 end,
      StateData#state{timer = Timer, ping_timer = PingTimer,
                      pong_expected = false}.