Merge remote-tracking branch 'capflam/set_outh_in_rw_resp'

francois2metz · Jan 9, 2012 · 22806cd · 22806cd
2 parents 3cfc219 + a77d2e9
commit 22806cd
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/yaws_server.erl b/src/yaws_server.erl
@@ -1600,7 +1600,11 @@ handle_request(CliSock, ARG, _N)
     State = ARG#arg.state,
     ?Debug("SrvReq=~s - RwResp=~s~n",[?format_record(ARG#arg.req, http_request),
                                       ?format_record(State, rewrite_response)]),
-    yaws:outh_set_status_code(State#rewrite_response.status),
+    OutH = #outh{status  = State#rewrite_response.status,
+                 chunked = false,
+                 date    = yaws:make_date_header(),
+                 server  = yaws:make_server_header()},
+    put(outh, OutH),
     deepforeach(fun(X) ->
                         case X of
                             {header, H} -> yaws:accumulate_header(H);
@@ -1611,6 +1615,11 @@ handle_request(CliSock, ARG, _N)
         <<>> ->
             deliver_accumulated(CliSock);
         _ ->
+            %% Define a default content type if needed
+            case yaws:outh_get_content_type() of
+                undefined -> yaws:outh_set_content_type("text/plain");
+                _         -> ok
+            end,
             accumulate_content(State#rewrite_response.content),
             deliver_accumulated(ARG, CliSock, decide, undefined, final)
     end,