Browse Source

Remove duplicate setting of response headers for Phoenix (#2350)

José Valim 8 years ago
parent
commit
c0783ce09f
1 changed files with 2 additions and 7 deletions
  1. 2 7
      frameworks/Elixir/phoenix/web/controllers/page_controller.ex

+ 2 - 7
frameworks/Elixir/phoenix/web/controllers/page_controller.ex

@@ -5,20 +5,17 @@ defmodule Hello.PageController do
 
 
   def index(conn, _params) do
   def index(conn, _params) do
     conn
     conn
-    |> merge_resp_headers(%{"content-type" => "application/json"})
     |> json(%{"TE Benchmarks\n" => "Started"})
     |> json(%{"TE Benchmarks\n" => "Started"})
   end
   end
 
 
   # avoid namespace collision
   # avoid namespace collision
   def _json(conn, _params) do
   def _json(conn, _params) do
     conn
     conn
-    |> merge_resp_headers(%{"content-type" => "application/json"})
     |> json(%{message: "Hello, world!"})
     |> json(%{message: "Hello, world!"})
   end
   end
 
 
   def db(conn, _params) do
   def db(conn, _params) do
     conn
     conn
-    |> merge_resp_headers(%{"content-type" => "application/json"})
     |> json(Repo.get(World, :rand.uniform(10000)))
     |> json(Repo.get(World, :rand.uniform(10000)))
   end
   end
 
 
@@ -34,7 +31,6 @@ defmodule Hello.PageController do
     end
     end
 
 
     conn
     conn
-    |> merge_resp_headers(%{"content-type" => "application/json"})
     |> json(Enum.map(1..q, fn _ -> Repo.get(World, :rand.uniform(10000)) end))
     |> json(Enum.map(1..q, fn _ -> Repo.get(World, :rand.uniform(10000)) end))
   end
   end
 
 
@@ -61,17 +57,16 @@ defmodule Hello.PageController do
     end
     end
 
 
     conn
     conn
-    |> merge_resp_headers(%{"content-type" => "application/json"})
     |> json(Enum.map(1..q, fn _ ->
     |> json(Enum.map(1..q, fn _ ->
       w = Repo.get(World, :rand.uniform(10000))
       w = Repo.get(World, :rand.uniform(10000))
       changeset = World.changeset(w, %{randomNumber: :rand.uniform(10000)})
       changeset = World.changeset(w, %{randomNumber: :rand.uniform(10000)})
       Repo.update(changeset)
       Repo.update(changeset)
-      w end))
+      w
+    end))
   end
   end
 
 
   def plaintext(conn, _params) do
   def plaintext(conn, _params) do
     conn
     conn
-    |> merge_resp_headers(%{"content-type" => "text/plain"})
     |> text("Hello, world!")
     |> text("Hello, world!")
   end
   end
 end
 end