[inets/httpc] The client incorrectly streams 404 responses

The client incorrectly streams 404 responses. The documentation
specifies that only 200 and 206 responses shall be streamed.

OTP-9860

2 files changed, 22 insertions, 89 deletions

diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 587e24cc8d..0f9e039643 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -157,12 +157,12 @@ info(Pid) ->
 %%              memory in vain.)
 %%--------------------------------------------------------------------
 %% Request should not be streamed
-stream(BodyPart, Request = #request{stream = none}, _) ->
+stream(BodyPart, #request{stream = none} = Request, _) ->
     ?hcrt("stream - none", []),
     {BodyPart, Request};
 
 %% Stream to caller
-stream(BodyPart, Request = #request{stream = Self}, Code) 
+stream(BodyPart, #request{stream = Self} = Request, Code) 
   when ((Code =:= 200) orelse  (Code =:= 206)) andalso 
        ((Self =:= self) orelse (Self =:= {self, once})) ->
     ?hcrt("stream - self", [{stream, Self}, {code, Code}]),
@@ -170,17 +170,10 @@ stream(BodyPart, Request = #request{stream = Self}, Code)
 			{Request#request.id, stream, BodyPart}),
     {<<>>, Request};
 
-stream(BodyPart, Request = #request{stream = Self}, 404) 
-  when (Self =:= self) orelse (Self =:= {self, once}) ->
-    ?hcrt("stream - self with 404", [{stream, Self}]),
-    httpc_response:send(Request#request.from, 
-			{Request#request.id, stream, BodyPart}),
-    {<<>>, Request};
-
 %% Stream to file
 %% This has been moved to start_stream/3
 %% We keep this for backward compatibillity...
-stream(BodyPart, Request = #request{stream = Filename}, Code)
+stream(BodyPart, #request{stream = Filename} = Request, Code)
   when ((Code =:= 200) orelse (Code =:= 206)) andalso is_list(Filename) -> 
     ?hcrt("stream - filename", [{stream, Filename}, {code, Code}]),
     case file:open(Filename, [write, raw, append, delayed_write]) of
@@ -192,7 +185,7 @@ stream(BodyPart, Request = #request{stream = Filename}, Code)
     end;
 
 %% Stream to file
-stream(BodyPart, Request = #request{stream = Fd}, Code)  
+stream(BodyPart, #request{stream = Fd} = Request, Code)  
   when ((Code =:= 200) orelse (Code =:= 206)) -> 
     ?hcrt("stream to file", [{stream, Fd}, {code, Code}]),
     case file:write(Fd, BodyPart) of
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index fb605351b4..6864558781 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -1,7 +1,7 @@
 %% This is an -*- erlang -*- file.
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,6 +18,11 @@
 
 {"%VSN%",
  [
+  {"5.7.2",
+   [
+    {update, httpc_handler, soft, soft_purge, soft_purge, []} 
+   ]
+  }, 
   {"5.7.1",
    [
     {load_module, http_uri,       soft_purge, soft_purge, []},
@@ -26,7 +31,8 @@
     {load_module, httpd_file,     soft_purge, soft_purge, []}, 
     {load_module, httpd_request,  soft_purge, soft_purge, []}, 
     {load_module, mod_responsecontrol, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}
+    {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}, 
+    {update, httpc_handler, soft, soft_purge, soft_purge, []} 
    ]
   }, 
   {"5.7", 
@@ -38,48 +44,17 @@
     {load_module, httpc_cookie,   soft_purge, soft_purge, [http_util]}, 
     {load_module, http_util,      soft_purge, soft_purge, []}, 
     {load_module, mod_responsecontrol, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}
-   ]
-  }, 
-  {"5.6", 
-   [
-    {load_module, http_uri,          soft_purge, soft_purge, []},
-    {load_module, httpd_util,        soft_purge, soft_purge, [http_util]},
-    {load_module, httpd_file,        soft_purge, soft_purge, []}, 
-    {load_module, httpd_request,     soft_purge, soft_purge, []}, 
-    {load_module, httpc,             soft_purge, soft_purge, [httpc_manager]}, 
-    {load_module, http_transport,    soft_purge, soft_purge, [http_transport]},
-    {load_module, httpc_cookie,      soft_purge, soft_purge, [http_util]}, 
-    {load_module, http_util,         soft_purge, soft_purge, []}, 
-    {load_module, mod_responsecontrol, soft_purge, soft_purge, []},
     {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}, 
-    {update, httpc_handler, soft,    soft_purge, soft_purge, []}, 
-    {update, httpc_manager, soft,    soft_purge, soft_purge, [httpc_handler]}, 
-    {update, ftp, soft, soft_purge,  soft_purge, []}
-   ]
-  }, 
-  {"5.5.2", 
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.5.1", 
-   [
-    {restart_application, inets}
+    {update, httpc_handler, soft, soft_purge, soft_purge, []} 
    ]
-  }, 
-  {"5.5",
+  }
+ ],
+ [
+  {"5.7.2",
    [
-    {restart_application, inets}
+    {update, httpc_handler, soft, soft_purge, soft_purge, []} 
    ]
   }, 
-  {"5.4",
-   [
-    {restart_application, inets}
-   ]
-  } 
- ],
- [
   {"5.7.1",
    [
     {load_module, http_uri,       soft_purge, soft_purge, []},
@@ -88,7 +63,8 @@
     {load_module, httpd_file,     soft_purge, soft_purge, []}, 
     {load_module, httpd_request,  soft_purge, soft_purge, []}, 
     {load_module, mod_responsecontrol, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}
+    {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}, 
+    {update, httpc_handler, soft, soft_purge, soft_purge, []} 
    ]
   }, 
   {"5.7", 
@@ -100,45 +76,9 @@
     {load_module, httpc_cookie,   soft_purge, soft_purge, [http_util]}, 
     {load_module, http_util,      soft_purge, soft_purge, []}, 
     {load_module, mod_responsecontrol, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}
-   ]
-  }, 
-  {"5.6", 
-   [
-    {load_module, http_uri,         soft_purge, soft_purge, []},
-    {load_module, httpd_util,       soft_purge, soft_purge, [http_util]},
-    {load_module, httpd_file,       soft_purge, soft_purge, []}, 
-    {load_module, httpd_request,    soft_purge, soft_purge, []}, 
-    {load_module, httpc,            soft_purge, soft_purge, [httpc_manager]}, 
-    {load_module, http_transport,   soft_purge, soft_purge, [http_transport]},
-    {load_module, httpc_cookie,     soft_purge, soft_purge, [http_util]}, 
-    {load_module, http_util,        soft_purge, soft_purge, []}, 
-    {load_module, mod_responsecontrol, soft_purge, soft_purge, []},
     {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}, 
-    {update, httpc_handler, soft,   soft_purge, soft_purge, []}, 
-    {update, httpc_manager, soft,   soft_purge, soft_purge, [httpc_handler]}, 
-    {update, ftp, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.5.2",
-   [
-    {restart_application, inets}
-   ]
-  },
-  {"5.5.1", 
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.5",
-   [
-    {restart_application, inets}
-   ]
-  },     
-  {"5.4",
-   [
-    {restart_application, inets}
+    {update, httpc_handler, soft, soft_purge, soft_purge, []} 
    ]
-  }     
+  }
  ]
 }.