Do not leak 1012 to longpoll

lib/phoenix/socket.ex

@@ -519,8 +519,12 @@ defmodule Phoenix.Socket do
     {:stop, {:shutdown, :disconnected}, state}
   end
 
-  def __info__(:socket_drain, state) do
-    {:stop, {:shutdown, :draining}, {1012, 'restart'}, state}
+  def __info__(:socket_drain, {_state, socket} = state) do
+    # TODO handle {:stop, :draining} reason inside websock_adapter and convert to 1012 there
+    case socket.transport do
+      :websocket -> {:stop, {:shutdown, :draining}, {1012, 'restart'}, state}
+      _ -> {:stop, {:shutdown, :draining}, state}
+    end
   end
 
   def __info__({:socket_push, opcode, payload}, state) do

lib/phoenix/transports/long_poll_server.ex

@@ -102,10 +102,6 @@ defmodule Phoenix.Transports.LongPoll.Server do
         state = %{state | handler: {handler, handler_state}}
         {:noreply, state}
 
-      {:stop, reason, {_close_code, _msg}, handler_state} ->
-        state = %{state | handler: {handler, handler_state}}
-        {:stop, reason, state}
-
       {:stop, reason, handler_state} ->
         state = %{state | handler: {handler, handler_state}}
         {:stop, reason, state}