From d012c3ca920a2bfb487b4973601d92e92591d48f Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 19 Dec 2011 15:14:09 +0100
Subject: [inets] Added verbosity printout to improve error detection

Added verbosity printouts to detect error reason for
file access error on windows.
---
 lib/inets/src/http_server/mod_get.erl | 16 ++++++++++++----
 lib/inets/test/httpd_basic_SUITE.erl  | 12 ++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/inets/src/http_server/mod_get.erl b/lib/inets/src/http_server/mod_get.erl
index 5cb30e3d97..c58d1f3508 100644
--- a/lib/inets/src/http_server/mod_get.erl
+++ b/lib/inets/src/http_server/mod_get.erl
@@ -18,9 +18,16 @@
 %%
 %%
 -module(mod_get).
+
 -export([do/1]).
+
 -include("httpd.hrl").
 -include("httpd_internal.hrl").
+-include("inets_internal.hrl").
+
+-define(VMODULE,"GET").
+
+
 %% do
 
 do(Info) ->
@@ -84,15 +91,16 @@ send_response(_Socket, _SocketType, Path, Info)->
 	    file:close(FileDescriptor),
 	    {proceed,[{response,{already_sent,200,
 				 FileInfo#file_info.size}},
-		      {mime_type,MimeType}|Info#mod.data]};
+		      {mime_type,MimeType} | Info#mod.data]};
 	{error, Reason} ->
+	    ?hdrt("send_response -> failed open file", 
+		  [{path, Path}, {reason, Reason}]), 
 	    Status = httpd_file:handle_error(Reason, "open", Info, Path),
-	    {proceed,
-	     [{status, Status}| Info#mod.data]}
+	    {proceed, [{status, Status} | Info#mod.data]}
     end.
 
 %% send
-
+	       
 send(#mod{socket = Socket, socket_type = SocketType} = Info,
      StatusCode, Headers, FileDescriptor) ->
     ?DEBUG("send -> send header",[]),
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 4cd38f2ec4..be0bcc67d5 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -202,8 +202,8 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
 	{ok, {200, _}} ->
 	    %% Don't care about the the body, just that we get a ok response
 	    ok;
-	{ok, UnexpectedOK1} ->
-	    tsf({unexpected_ok_1, UnexpectedOK1})
+	{ok, {StatusCode1, Body1}} ->
+	    tsf({unexpected_ok_1, StatusCode1, Body1})
     end,
 
     %% Request 2
@@ -216,8 +216,8 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
 	{ok, {200, _}} ->
 	    %% Don't care about the the body, just that we get a ok response
 	    ok;
-	{ok, UnexpectedOK2} ->
-	    tsf({unexpected_ok_2, UnexpectedOK2})
+	{ok, {StatusCode2, Body2}} ->
+	    tsf({unexpected_ok_2, StatusCode2, Body2})
     end,
 
     %% Request 3
@@ -238,7 +238,7 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
 		    tsf({unexpected_path_3, HTMLEncodedPath, BadPath3})
 	    end;
 	{ok, UnexpectedOK3} ->
-	    tsf({unexpected_ok_1, UnexpectedOK3})
+	    tsf({unexpected_ok_3, UnexpectedOK3})
     end,
 
     %% Request 4
@@ -253,7 +253,7 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
 		HTMLEncodedPath ->
 		    ok;
 		BadPath4 ->
-		    tsf({unexpected_path_2, HTMLEncodedPath, BadPath4})
+		    tsf({unexpected_path_4, HTMLEncodedPath, BadPath4})
 	    end;
 	{ok, UnexpectedOK4} ->
 	    tsf({unexpected_ok_4, UnexpectedOK4})
-- 
cgit v1.2.3