[httpd] XSS prevention did not work for hex-encoded URL's.

OTP-9655
Merge branch 'bmk/inets/httpd/xss_when_erl_encoded/r14/OTP-9655' into bmk/inets/inets572_integration

14 files changed, 382 insertions, 160 deletions

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 5b5dfdde21..2090c201dd 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,41 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.7.2</title>
+
+    <section><title>Improvements and New Features</title>
+    <p>-</p>
+
+<!--
+      <list>
+        <item>
+          <p>[httpc|httpd] Added support for IPv6 with ssl. </p>
+	  <p>Own Id: OTP-5566</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+<!--
+    <p>-</p>
+-->
+
+      <list>
+        <item>
+          <p>[httpd] XSS prevention did not work for hex-encoded URL's. </p>
+          <p>Own Id: OTP-9655</p>
+        </item>
+
+      </list>
+
+    </section>
+
+  </section> <!-- 5.7.2 -->
+
+
   <section><title>Inets 5.7.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/inets/src/http_lib/http_uri.erl b/lib/inets/src/http_lib/http_uri.erl
index 44b9face0b..607475c359 100644
--- a/lib/inets/src/http_lib/http_uri.erl
+++ b/lib/inets/src/http_lib/http_uri.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -20,7 +20,9 @@
 
 -module(http_uri).
 
--export([parse/1, encode/1, decode/1]).
+-export([parse/1]).
+-export([encode/1, decode/1]).
+
 
 %%%=========================================================================
 %%%  API
@@ -42,20 +44,24 @@ encode(URI) ->
     Reserved = sets:from_list([$;, $:, $@, $&, $=, $+, $,, $/, $?,
 			       $#, $[, $], $<, $>, $\", ${, $}, $|,
 			       $\\, $', $^, $%, $ ]),
-    lists:append(lists:map(fun(Char) ->
-				   uri_encode(Char, Reserved)
-			   end, URI)).
-
-decode([$%,Hex1,Hex2|Rest]) ->
-    [hex2dec(Hex1)*16+hex2dec(Hex2)|decode(Rest)];
-decode([First|Rest]) ->
-    [First|decode(Rest)];
-decode([]) ->
+    %% lists:append(lists:map(fun(Char) -> uri_encode(Char, Reserved) end, URI)).
+    lists:append([uri_encode(Char, Reserved) || Char <- URI]).
+
+decode(String) ->
+    do_decode(String).
+
+do_decode([$%,Hex1,Hex2|Rest]) ->
+    [hex2dec(Hex1)*16+hex2dec(Hex2)|do_decode(Rest)];
+do_decode([First|Rest]) ->
+    [First|do_decode(Rest)];
+do_decode([]) ->
     [].
 
+
 %%%========================================================================
 %%% Internal functions
 %%%========================================================================
+
 parse_scheme(AbsURI) ->
     case split_uri(AbsURI, ":", {error, no_scheme}, 1, 1) of
 	{error, no_scheme} ->
diff --git a/lib/inets/src/http_lib/http_util.erl b/lib/inets/src/http_lib/http_util.erl
index 973600d7be..5b21170b78 100644
--- a/lib/inets/src/http_lib/http_util.erl
+++ b/lib/inets/src/http_lib/http_util.erl
@@ -206,9 +206,7 @@ timeout(Timeout, Started) ->
 
 html_encode(Chars) ->
     Reserved = sets:from_list([$&, $<, $>, $\", $', $/]),
-    lists:append(lists:map(fun(Char) ->
-	               char_to_html_entity(Char, Reserved)
-	           end, Chars)).
+    lists:append([char_to_html_entity(Char, Reserved) || Char <- Chars]).
 
 
 %%%========================================================================
diff --git a/lib/inets/src/http_server/httpd_file.erl b/lib/inets/src/http_server/httpd_file.erl
index e8a8ab6411..f2ba33099e 100644
--- a/lib/inets/src/http_server/httpd_file.erl
+++ b/lib/inets/src/http_server/httpd_file.erl
@@ -36,9 +36,9 @@ handle_error(emfile, Op, _ModData, Path) ->
     handle_error(500, Op, none, Path, ": Too many open files");
 handle_error({enfile,_}, Op, _ModData, Path) ->
     handle_error(500, Op, none, Path, ": File table overflow");
-handle_error(_Reason, Op, ModData, Path) ->
-    handle_error(404, Op, ModData, Path, ": File not found").
-
+handle_error(_Reason, Op, _ModData, Path) ->
+    handle_error(500, Op, none, Path, "").
+	    
 handle_error(StatusCode, Op, none, Path, Reason) ->
     {StatusCode, none, ?NICE("Can't " ++ Op ++ " " ++ Path ++ Reason)};
 handle_error(StatusCode, Op, ModData, Path, Reason) ->
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index a04bcc2778..5ba79b2706 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -309,12 +309,12 @@ validate_uri(RequestURI) ->
 		(catch http_uri:decode(string:left(RequestURI, Ndx)))
 	end,
     case UriNoQueryNoHex of
-	{'EXIT',_Reason} ->
+	{'EXIT', _Reason} ->
 	    {error, {bad_request, {malformed_syntax, RequestURI}}};
 	_ ->
 	    Path  = format_request_uri(UriNoQueryNoHex),
-	    Path2 = [X||X<-string:tokens(Path, "/\\"),X=/="."], 
-	    validate_path( Path2,0, RequestURI)
+	    Path2 = [X||X<-string:tokens(Path, "/"),X=/="."], %% OTP-5938
+	    validate_path(Path2, 0, RequestURI)
     end.
 
 validate_path([], _, _) ->
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl
index c3b47ce390..d2f22fce93 100644
--- a/lib/inets/src/http_server/httpd_request_handler.erl
+++ b/lib/inets/src/http_server/httpd_request_handler.erl
@@ -1,8 +1,8 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 1997-2011. 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
 %% compliance with the License. You should have received a copy of the
@@ -355,7 +355,7 @@ handle_http_msg({Method, Uri, Version, {RecordHeaders, Headers}, Body},
 	    Reason = io_lib:format("Forbidden URI: ~p~n", [URI]),
 	    error_log(Reason, ModData),
 	    {stop, normal, State#state{response_sent = true}};
-	{error,{bad_request, {malformed_syntax, URI}}} ->
+	{error, {bad_request, {malformed_syntax, URI}}} ->
 	    ?hdrd("validation failed: bad request - malformed syntax", 
 		  [{uri, URI}]),
 	    httpd_response:send_status(ModData#mod{http_version = Version},
diff --git a/lib/inets/src/http_server/httpd_response.erl b/lib/inets/src/http_server/httpd_response.erl
index ea9cfbf4f2..1301f27081 100644
--- a/lib/inets/src/http_server/httpd_response.erl
+++ b/lib/inets/src/http_server/httpd_response.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -100,12 +100,19 @@ send_status(#mod{socket_type = SocketType,
 		 socket      = Socket, 
 		 config_db   = ConfigDB} = ModData, StatusCode, PhraseArgs) ->
 
+    ?hdrd("send status", [{status_code, StatusCode}, 
+			  {phrase_args, PhraseArgs}]), 
+
     ReasonPhrase = httpd_util:reason_phrase(StatusCode),
     Message      = httpd_util:message(StatusCode, PhraseArgs, ConfigDB),
     Body         = get_body(ReasonPhrase, Message),
 
-    send_header(ModData, StatusCode, [{content_type, "text/html"},
-			    {content_length, integer_to_list(length(Body))}]),
+    ?hdrt("send status - header", [{reason_phrase, ReasonPhrase}, 
+     				   {message,       Message}]), 
+    send_header(ModData, StatusCode, 
+		[{content_type,   "text/html"},
+		 {content_length, integer_to_list(length(Body))}]),
+
     httpd_socket:deliver(SocketType, Socket, Body).
 
 
@@ -345,8 +352,9 @@ transform({Field, Value}) when is_list(Field) ->
 %% Leave this method and go on to the newer form of response
 %% OTP-4408
 %%----------------------------------------------------------------------
-send_response_old(#mod{method      = "HEAD"} = ModData,
+send_response_old(#mod{method = "HEAD"} = ModData,
 		  StatusCode, Response) ->
+
     NewResponse = lists:flatten(Response),
     
     case httpd_util:split(NewResponse, [?CR, ?LF, ?CR, ?LF],2) of
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl
index c051422529..b0b18b9c3d 100644
--- a/lib/inets/src/http_server/httpd_util.erl
+++ b/lib/inets/src/http_server/httpd_util.erl
@@ -178,11 +178,12 @@ message(301,URL,_) ->
     "The document has moved <A HREF=\""++ maybe_encode(URL) ++"\">here</A>.";
 message(304, _URL,_) ->
     "The document has not been changed.";
-message(400,none,_) ->
-    "Your browser sent a query that this server could not understand.";
-message(400,Msg,_) ->
-    "Your browser sent a query that this server could not understand. "++ http_util:html_encode(Msg);
-message(401,none,_) ->
+message(400, none, _) ->
+    "Your browser sent a query that this server could not understand. ";
+message(400, Msg, _) ->
+    "Your browser sent a query that this server could not understand. " ++ 
+	html_encode(Msg);
+message(401, none, _) ->
     "This server could not verify that you
 are authorized to access the document you
 	requested.  Either you supplied the wrong
@@ -190,40 +191,49 @@ credentials (e.g., bad password), or your
 browser doesn't understand how to supply
 the credentials required.";
 message(403,RequestURI,_) ->
-    "You don't have permission to access "++ http_util:html_encode(RequestURI) ++" on this server.";
+    "You don't have permission to access " ++ 
+	html_encode(RequestURI) ++ 
+	" on this server.";
 message(404,RequestURI,_) ->
-    "The requested URL " ++ http_util:html_encode(RequestURI) ++ " was not found on this server.";
+    "The requested URL " ++ 
+	html_encode(RequestURI) ++ 
+	" was not found on this server.";
 message(408, Timeout, _) ->
     Timeout;
 message(412,none,_) ->
     "The requested preconditions were false";
 message(413, Reason,_) ->
-    "Entity: " ++ http_util:html_encode(Reason);
+    "Entity: " ++ html_encode(Reason);
 message(414,ReasonPhrase,_) ->
-    "Message "++ http_util:html_encode(ReasonPhrase) ++".";
+    "Message " ++ html_encode(ReasonPhrase) ++ ".";
 message(416,ReasonPhrase,_) ->
-    http_util:html_encode(ReasonPhrase);
+    html_encode(ReasonPhrase);
 
 message(500,_,ConfigDB) ->
     ServerAdmin=lookup(ConfigDB,server_admin,"unknown@unknown"),
     "The server encountered an internal error or "
 	"misconfiguration and was unable to complete "
 	"your request.<P>Please contact the server administrator "
-	++ http_util:html_encode(ServerAdmin) ++ ", and inform them of the time the error occurred "
+	++ html_encode(ServerAdmin) ++ 
+	", and inform them of the time the error occurred "
 	"and anything you might have done that may have caused the error.";
 
 message(501,{Method, RequestURI, HTTPVersion}, _ConfigDB) ->
     if
 	is_atom(Method) ->
-        http_util:html_encode(atom_to_list(Method))++
-		" to "++ http_util:html_encode(RequestURI)++" ("++ http_util:html_encode(HTTPVersion)++") not supported.";
+	    atom_to_list(Method) ++
+		" to " ++ 
+		html_encode(RequestURI) ++ 
+		" (" ++ HTTPVersion ++ ") not supported.";
 	is_list(Method) ->
-	    http_util:html_encode(Method)++
-		" to "++ http_util:html_encode(RequestURI)++" ("++ http_util:html_encode(HTTPVersion)++") not supported."
+	    Method ++
+		" to " ++ 
+		html_encode(RequestURI) ++ 
+		" (" ++ HTTPVersion ++ ") not supported."
     end;
 
 message(503, String, _ConfigDB) ->
-    "This service in unavailable due to: "++ http_util:html_encode(String).
+    "This service in unavailable due to: " ++ html_encode(String).
 
 maybe_encode(URI) ->
     Decoded = try http_uri:decode(URI) of
@@ -233,6 +243,15 @@ maybe_encode(URI) ->
     end,
     http_uri:encode(Decoded).
 
+html_encode(String) ->
+    try http_uri:decode(String) of
+	Decoded when is_list(Decoded) ->
+	    http_util:html_encode(Decoded)
+    catch 
+	_:_ ->
+	    http_util:html_encode(String)
+    end.
+
 %%convert_rfc_date(Date)->{{YYYY,MM,DD},{HH,MIN,SEC}}
 
 convert_request_date([D,A,Y,DateType| Rest])->
@@ -245,7 +264,7 @@ convert_request_date([D,A,Y,DateType| Rest])->
 		 fun convert_rfc850_date/1
 	 end,
     case catch Func([D,A,Y,DateType| Rest]) of
-	{ok,Date} ->
+	{ok, Date} ->
 	    Date;
 	_Error->
 	    bad_date
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index d5fdf86a60..ede0c10bef 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,23 +18,38 @@
 
 {"%VSN%",
  [
+  {"5.7.1",
+   [
+    {load_module, http_uri,       soft_purge, soft_purge, []},
+    {load_module, http_util,      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, []}
+   ]
+  }, 
   {"5.7", 
    [
-    {load_module, httpd_request, soft_purge, soft_purge, []}, 
-    {load_module, httpc_cookie, soft_purge, soft_purge, [http_util]}, 
-    {load_module, http_util, soft_purge, soft_purge, []}
+    {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_cookie,   soft_purge, soft_purge, [http_util]}, 
+    {load_module, http_util,      soft_purge, soft_purge, []}
    ]
   }, 
   {"5.6", 
    [
-    {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, []}, 
-    {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, []}
+    {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, []}, 
+    {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", 
@@ -59,22 +74,37 @@
   } 
  ],
  [
+  {"5.7.1",
+   [
+    {load_module, http_uri,       soft_purge, soft_purge, []},
+    {load_module, http_util,      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, []}, 
+   ]
+  }, 
   {"5.7", 
    [
-    {load_module, httpd_request, soft_purge, soft_purge, []}, 
-    {load_module, httpc_cookie, soft_purge, soft_purge, [http_util]}, 
-    {load_module, http_util, soft_purge, soft_purge, []}
+    {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_cookie,   soft_purge, soft_purge, [http_util]}, 
+    {load_module, http_util,      soft_purge, soft_purge, []}
    ]
   }, 
   {"5.6", 
    [
-    {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, []}, 
-    {update, httpc_handler, soft, soft_purge, soft_purge, []}, 
-    {update, httpc_manager, soft, soft_purge, soft_purge, [httpc_handler]}, 
+    {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, []}, 
+    {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, []}
    ]
   }, 
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 6edd5371af..adea1666b4 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -253,10 +253,10 @@ init_per_testcase(Case, Config) ->
     init_per_testcase(Case, 2, Config).
 
 init_per_testcase(Case, Timeout, Config) ->
-    io:format(user, "~n~n*** INIT ~w:~w[~w] ***~n~n", 
-	      [?MODULE, Case, Timeout]),
-    PrivDir     = ?config(priv_dir, Config),
-    tsp("init_per_testcase -> stop inets"),
+    io:format(user, 
+	      "~n~n*** INIT ~w:~w[~w] ***"
+	      "~n~n", [?MODULE, Case, Timeout]),
+    PrivDir = ?config(priv_dir, Config),
     application:stop(inets),
     Dog         = test_server:timetrap(inets_test_lib:minutes(Timeout)),
     TmpConfig   = lists:keydelete(watchdog, 1, Config),
@@ -296,12 +296,12 @@ init_per_testcase(Case, Timeout, Config) ->
 			    throw:{error, {failed_starting, App, _}} ->
 				SkipString = 
 				    "Could not start " ++ atom_to_list(App),
-				{skip, SkipString};
-			    _:X ->
+				skip(SkipString);
+			      _:X ->
 				SkipString = 
 				    lists:flatten(
 				      io_lib:format("Failed starting apps: ~p", [X])), 
-				{skip, SkipString}
+				skip(SkipString)
 			end;
 
 		    _ ->
@@ -330,14 +330,14 @@ init_per_testcase(Case, Timeout, Config) ->
 				    ],
 				case lists:member(Rest, BadCases) of
 				    true ->
-					[{skip, "TC and server not compatible"}|
+					[skip("TC and server not compatible") | 
 					 TmpConfig];
 				    false ->
 					inets:start(),
 					[{watchdog, Dog} | TmpConfig]
 				end;
 			    false ->
-				[{skip, "proxy not responding"} | TmpConfig]
+				[skip("proxy not responding") | TmpConfig]
 			end
 		end;
 
@@ -367,12 +367,11 @@ init_per_testcase(Case, Timeout, Config) ->
 			      io_lib:format("Failed starting apps: ~p", [X])), 
 			{skip, SkipString}
 		end;
+
 	    _ -> 
 		TmpConfig2 = lists:keydelete(local_server, 1, TmpConfig),
-		Server = 
-		    %% Will start inets 
-		    inets_test_lib:start_http_server(
-		      filename:join(PrivDir, IpConfFile)),
+		%% Will start inets 
+		Server = start_http_server(PrivDir, IpConfFile),
 		[{watchdog, Dog}, {local_server, Server} | TmpConfig2]
 	end,
     
@@ -397,7 +396,17 @@ init_per_testcase_ssl(Tag, PrivDir, SslConfFile, Config) ->
     tsp("init_per_testcase(~w) -> Server: ~p", [Tag, Server]),
     [{local_ssl_server, Server} | Config2].
 
-    
+    ProxyExceptions = ["localhost", ?IPV6_LOCAL_HOST], 
+    http:set_options([{proxy, {{?PROXY, ?PROXY_PORT}, ProxyExceptions}}]),
+    inets:enable_trace(max, io, httpc),
+    %% inets:enable_trace(max, io, all),
+    %% snmp:set_trace([gen_tcp, inet_tcp, prim_inet]),
+    NewConfig.
+
+start_http_server(ConfDir, ConfFile) ->
+    inets_test_lib:start_http_server( filename:join(ConfDir, ConfFile) ).
+
+
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(Case, Config) -> _
 %% Case - atom()
@@ -733,7 +742,7 @@ test_pipeline(URL) ->
 		    p("test_pipeline -> received reply for (async) request 2"),
 		    ok;
 		{http, Msg1} ->
-		    test_server:fail(Msg1)
+		    tsf(Msg1)
 	    end;
 	{http, {RequestId2, {{_, 200, _}, _, _}}} ->
 	    io:format("test_pipeline -> received reply for (async) request 2 - now wait for 1"),
@@ -742,14 +751,14 @@ test_pipeline(URL) ->
 		    io:format("test_pipeline -> received reply for (async) request 1"),
 		    ok;
 		{http, Msg2} ->
-		    test_server:fail(Msg2)
+		    tsf(Msg2)
 	    end;
 	{http, Msg3} ->
-	    test_server:fail(Msg3)
+	    tsf(Msg3)
     after 60000 ->
 	    receive Any1 ->
 		    tsp("received crap after timeout: ~n   ~p", [Any1]),
-		    test_server:fail({error, {timeout, Any1}})
+		    tsf({error, {timeout, Any1}})
 	    end
     end,
 
@@ -774,7 +783,7 @@ test_pipeline(URL) ->
      p("test_pipeline -> expect *no* reply for cancelled (async) request 4 (for 3 secs)"),
      receive
 	 {http, {RequestId3, _}} ->
-	     test_server:fail(http_cancel_request_failed)
+	     tsf(http_cancel_request_failed)
      after 3000 ->
 	     ok
      end,
@@ -787,11 +796,11 @@ test_pipeline(URL) ->
 		tsp("Receive : ~p", [Res]),
 		BinBody4;
 	    {http, Msg4} ->
-		test_server:fail(Msg4)
+		tsf(Msg4)
 	after 60000 ->
 		receive Any2 ->
 			tsp("received crap after timeout: ~n   ~p", [Any2]),
-			test_server:fail({error, {timeout, Any2}})
+			tsf({error, {timeout, Any2}})
 		end
 	end,
 
@@ -801,7 +810,7 @@ test_pipeline(URL) ->
     p("test_pipeline -> ensure no unexpected incomming"),
     receive
 	{http, Any} ->
-	    test_server:fail({unexpected_message, Any})
+	    tsf({unexpected_message, Any})
     after 500 ->
 	    ok
     end,
@@ -823,11 +832,11 @@ http_trace(Config) when is_list(Config) ->
 		{ok, {{_,200,_}, [_ | _], "TRACE /dummy.html" ++ _}} ->
 		    ok;
 		{ok, {{_,200,_}, [_ | _], WrongBody}} ->
-		    test_server:fail({wrong_body, WrongBody});
+		    tsf({wrong_body, WrongBody});
 		{ok, WrongReply} ->
-		    test_server:fail({wrong_reply, WrongReply});
+		    tsf({wrong_reply, WrongReply});
 		Error ->
-		    test_server:fail({failed, Error})
+		    tsf({failed, Error})
 	    end;
 	_ ->
 	    {skip, "Failed to start local http-server"}
@@ -850,7 +859,7 @@ http_async(Config) when is_list(Config) ->
 		    {http, {RequestId, {{_, 200, _}, _, BinBody}}} ->
 			BinBody;
 		    {http, Msg} ->
-			test_server:fail(Msg)
+			tsf(Msg)
 		end,
 	    
 	    inets_test_lib:check_body(binary_to_list(Body)),
@@ -860,7 +869,7 @@ http_async(Config) when is_list(Config) ->
 	    ok = httpc:cancel_request(NewRequestId),
 	    receive 
 		{http, {NewRequestId, _NewResult}} ->
-		    test_server:fail(http_cancel_request_failed)
+		    tsf(http_cancel_request_failed)
 	    after 3000 ->
 		    ok
 	    end;
@@ -909,7 +918,7 @@ http_save_to_file_async(Config) when is_list(Config) ->
 		{http, {RequestId, saved_to_file}} ->
 		    ok;
 		{http, Msg} ->
-		    test_server:fail(Msg)
+		    tsf(Msg)
 	    end,
 
 	    {ok, Bin} = file:read_file(FilePath), 
@@ -1482,10 +1491,10 @@ proxy_options(Config) when is_list(Config) ->
 			{value, {"allow", _}} ->
 			    ok;
 			_ ->
-			    test_server:fail(http_options_request_failed)
+			    tsf(http_options_request_failed)
 		    end;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1506,7 +1515,7 @@ proxy_head(Config) when is_list(Config) ->
 		{ok, {{_,200, _}, [_ | _], []}} ->
 		    ok;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1525,7 +1534,7 @@ proxy_get(Config) when is_list(Config) ->
 		{ok, {{_,200,_}, [_ | _], Body = [_ | _]}} ->
 		    inets_test_lib:check_body(Body);
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1604,7 +1613,7 @@ proxy_post(Config) when is_list(Config) ->
 		{ok, {{_,405,_}, [_ | _], [_ | _]}} ->
 		    ok;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1629,7 +1638,7 @@ proxy_put(Config) when is_list(Config) ->
 		{ok, {{_,405,_}, [_ | _], [_ | _]}} ->
 		    ok;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1654,7 +1663,7 @@ proxy_delete(Config) when is_list(Config) ->
 		{ok, {{_,404,_}, [_ | _], [_ | _]}} ->
 		    ok;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1710,7 +1719,7 @@ proxy_auth(Config) when is_list(Config) ->
 		{ok, {{_,200, _}, [_ | _], [_|_]}} ->
 		    ok;
 		Unexpected ->
-		    test_server:fail({unexpected_result, Unexpected})
+		    tsf({unexpected_result, Unexpected})
 	    end;
 	Reason ->
 	    {skip, Reason}
@@ -1796,7 +1805,7 @@ http_stream(Config) when is_list(Config) ->
 	{http, {RequestId, stream_start, _Headers}} ->
 	    ok;
 	{http, Msg} ->
-	    test_server:fail(Msg)
+	    tsf(Msg)
     end,
 
     StreamedBody = receive_streamed_body(RequestId, <<>>),
@@ -1851,7 +1860,7 @@ once(URL) ->
 		  [RequestId, Pid]),
 		Pid;
 	    {http, Msg} ->
-		test_server:fail(Msg)
+		tsf(Msg)
 	end,
 
     tsp("once -> request handler: ~p", [NewPid]),
@@ -1894,7 +1903,7 @@ proxy_stream(Config) when is_list(Config) ->
 		{http, {RequestId, stream_start, _Headers}} ->
 		    ok;
 		{http, Msg} ->
-		    test_server:fail(Msg)
+		    tsf(Msg)
 	    end,
 	    
 	    StreamedBody = receive_streamed_body(RequestId, <<>>),
@@ -2979,7 +2988,7 @@ receive_streamed_body(RequestId, Body) ->
 	{http, {RequestId, stream_end, _Headers}} ->
 	    Body;
 	{http, Msg} ->	    
-	    test_server:fail(Msg)
+	    tsf(Msg)
     end.
 
 receive_streamed_body(RequestId, Body, Pid) ->
@@ -2993,7 +3002,7 @@ receive_streamed_body(RequestId, Body, Pid) ->
 	{http, {RequestId, stream_end, _Headers}} ->
 	    Body;
 	{http, Msg} ->	    
-	    test_server:fail(Msg)
+	    tsf(Msg)
     end.
 
 %% Perform a synchronous stop
@@ -3455,7 +3464,7 @@ handle_auth("Basic " ++ UserInfo, Challange, DefaultResponse) ->
     end.
 
 check_cookie([]) ->
-    test_server:fail(no_cookie_header);
+    tsf(no_cookie_header);
 check_cookie(["cookie:" ++ _Value | _]) ->
     ok;
 check_cookie([_Head | Tail]) ->
@@ -3515,7 +3524,21 @@ p(F, A) ->
 tsp(F) ->
     tsp(F, []).
 tsp(F, A) ->
-    test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
+    Timestamp = formated_timestamp(), 
+    test_server:format("** ~s ** ~p ~p:" ++ F ++ "~n", 
+		       [Timestamp, self(), ?MODULE | A]).
+
+formated_timestamp() ->
+    format_timestamp( os:timestamp() ).
+
+format_timestamp({_N1, _N2, N3} = Now) ->
+    {Date, Time}   = calendar:now_to_datetime(Now),
+    {YYYY,MM,DD}   = Date,
+    {Hour,Min,Sec} = Time,
+    FormatDate =
+        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
+                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
+    lists:flatten(FormatDate).
 
 tsf(Reason) ->
     test_server:fail(Reason).
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 1112208295..f500fa1da4 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -2571,24 +2571,24 @@ ticket_5913(doc) ->
     ["Tests that a header without last-modified is handled"];
 ticket_5913(suite) -> [];
 ticket_5913(Config) ->
-    ok=httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
-				     ?IP_PORT, ?config(node, Config),
+    ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
+				       ?IP_PORT, ?config(node, Config),
 				       "GET /cgi-bin/erl/httpd_example:get_bin "
 				       "HTTP/1.0\r\n\r\n", 
 				       [{statuscode, 200},
-				       {version, "HTTP/1.0"}]),
+					{version, "HTTP/1.0"}]),
     ok.
 
 ticket_6003(doc) ->
     ["Tests that a URI with a bad hexadecimal code is handled"];
 ticket_6003(suite) -> [];
 ticket_6003(Config) ->
-    ok=httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
-				     ?IP_PORT, ?config(node, Config),
-				     "GET http://www.erlang.org/%skalle "
-				     "HTTP/1.0\r\n\r\n",
-				     [{statuscode, 400},
-				      {version, "HTTP/1.0"}]),
+    ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
+				       ?IP_PORT, ?config(node, Config),
+				       "GET http://www.erlang.org/%skalle "
+				       "HTTP/1.0\r\n\r\n",
+				       [{statuscode, 400},
+					{version, "HTTP/1.0"}]),
     ok.
 
 ticket_7304(doc) ->
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index f23d0b4765..355f81da17 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -59,9 +59,28 @@ init_per_suite(Config) ->
 	"~n   Config: ~p", [Config]),
     ok = inets:start(),
     PrivDir = ?config(priv_dir, Config),
-    HttpdConf = [{port, 0}, {ipfamily, inet}, 
-		 {server_name, "httpd_test"}, {server_root, PrivDir},
-		 {document_root, PrivDir}, {bind_address, "localhost"}],
+
+    Dummy = 
+"<HTML>
+<HEAD>
+<TITLE>/index.html</TITLE>
+</HEAD>
+<BODY>
+DUMMY
+</BODY>
+</HTML>",
+
+    DummyFile = filename:join([PrivDir,"dummy.html"]),
+    {ok, Fd}  = file:open(DummyFile, [write]),
+    ok        = file:write(Fd, Dummy),
+    ok        = file:close(Fd), 
+    HttpdConf = [{port,          0}, 
+		 {ipfamily,      inet}, 
+		 {server_name,   "httpd_test"}, 
+		 {server_root,   PrivDir},
+		 {document_root, PrivDir}, 
+		 {bind_address,  "localhost"}],
+
     [{httpd_conf, HttpdConf} |  Config].
 
 %%--------------------------------------------------------------------
@@ -133,6 +152,10 @@ uri_too_long_414(Config) when is_list(Config) ->
  				        {version, "HTTP/0.9"}]),    
     inets:stop(httpd, Pid).
     
+
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+
 header_too_long_413(doc) ->
     ["Test that too long headers's get 413 HTTP code"];
 header_too_long_413(suite) ->
@@ -152,34 +175,92 @@ header_too_long_413(Config) when is_list(Config) ->
  				        {version, "HTTP/1.1"}]),
     inets:stop(httpd, Pid).
    
+
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+
 escaped_url_in_error_body(doc) ->
     ["Test Url-encoding see OTP-8940"];
 escaped_url_in_error_body(suite) ->
     [];
 escaped_url_in_error_body(Config) when is_list(Config) ->
-    tsp("escaped_url_in_error_body -> entry with"
-	"~n   Config: ~p", [Config]),
-    HttpdConf = ?config(httpd_conf, Config),
-    {ok, Pid} = inets:start(httpd, [{port, 0} | HttpdConf]),
-    Info = httpd:info(Pid),
-    Port = proplists:get_value(port, Info),
-    _Address = proplists:get_value(bind_address, Info),
-    Path = "/<b>this_is_bold</b>",
-    URL = ?URL_START ++ integer_to_list(Port) ++ Path,
-    EscapedPath = http_uri:encode(Path),
-    {ok, {404, Body1}} = httpc:request(get, {URL, []},
-				       [{url_encode, true}, 
-					{version,    "HTTP/1.0"}],
-				      [{full_result, false}]),
-    EscapedPath = find_URL_path(string:tokens(Body1, " ")),
-    {ok, {404, Body2}} = httpc:request(get, {URL, []},
-				       [{url_encode,  false}, 
-					{version,     "HTTP/1.0"}], 
-				       [{full_result, false}]),
+    tsp("escaped_url_in_error_body -> entry"),
+    HttpdConf   = ?config(httpd_conf, Config),
+    {ok, Pid}   = inets:start(httpd, [{port, 0} | HttpdConf]),
+    Info        = httpd:info(Pid),
+    Port        = proplists:get_value(port,         Info),
+    _Address    = proplists:get_value(bind_address, Info),
+
+    %% Request 1
+    tsp("escaped_url_in_error_body -> request 1"),
+    URL1        = ?URL_START ++ integer_to_list(Port),
+    %% Make sure the server is ok, by making a request for a valid page
+    case httpc:request(get, {URL1 ++ "/dummy.html", []},
+		       [{url_encode,  false}, 
+			{version,     "HTTP/1.0"}],
+		       [{full_result, false}]) of
+	{ok, {200, _}} ->
+	    %% Don't care about the the body, just that we get a ok response
+	    ok;
+	{ok, UnexpectedOK1} ->
+	    tsf({unexpected_ok_1, UnexpectedOK1})
+    end,
+
+    %% Request 2
+    tsp("escaped_url_in_error_body -> request 2"),
+    %% Make sure the server is ok, by making a request for a valid page
+    case httpc:request(get, {URL1 ++ "/dummy.html", []},
+		       [{url_encode,  true}, 
+			{version,     "HTTP/1.0"}],
+		       [{full_result, false}]) of
+	{ok, {200, _}} ->
+	    %% Don't care about the the body, just that we get a ok response
+	    ok;
+	{ok, UnexpectedOK2} ->
+	    tsf({unexpected_ok_2, UnexpectedOK2})
+    end,
+
+    %% Request 3
+    tsp("escaped_url_in_error_body -> request 3"),
+    %% Ask for a non-existing page(1)
+    Path            = "/<b>this_is_bold<b>",
     HTMLEncodedPath = http_util:html_encode(Path),
-    HTMLEncodedPath = find_URL_path(string:tokens(Body2, " ")),
+    URL2            = URL1 ++ Path,
+    case httpc:request(get, {URL2, []},
+		       [{url_encode,  true}, 
+			{version,     "HTTP/1.0"}],
+		       [{full_result, false}]) of
+	{ok, {404, Body3}} ->
+	    case find_URL_path(string:tokens(Body3, " ")) of
+		HTMLEncodedPath ->
+		    ok;
+		BadPath3 ->
+		    tsf({unexpected_path_3, HTMLEncodedPath, BadPath3})
+	    end;
+	{ok, UnexpectedOK3} ->
+	    tsf({unexpected_ok_1, UnexpectedOK3})
+    end,
+
+    %% Request 4
+    tsp("escaped_url_in_error_body -> request 4"),
+    %% Ask for a non-existing page(2)
+    case httpc:request(get, {URL2, []}, 
+		       [{url_encode,  false}, 
+			{version,     "HTTP/1.0"}],
+		       [{full_result, false}]) of
+	{ok, {404, Body4}} ->
+	    case find_URL_path(string:tokens(Body4, " ")) of
+		HTMLEncodedPath ->
+		    ok;
+		BadPath4 ->
+		    tsf({unexpected_path_2, HTMLEncodedPath, BadPath4})
+	    end;
+	{ok, UnexpectedOK4} ->
+	    tsf({unexpected_ok_4, UnexpectedOK4})
+    end, 
+    tsp("escaped_url_in_error_body -> stop inets"),
     inets:stop(httpd, Pid),
-    tsp("escaped_url_in_error_body -> done"),
+    tsp("escaped_url_in_error_body -> done"),    
     ok.
 
 find_URL_path([]) ->
@@ -195,3 +276,27 @@ tsp(F) ->
 tsp(F, A) ->
     test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
 
+
+tsp(F) ->
+    tsp(F, []).
+tsp(F, A) ->
+    Timestamp = formated_timestamp(), 
+    test_server:format("** ~s ** ~p ~p:" ++ F ++ "~n", 
+		       [Timestamp, self(), ?MODULE | A]).
+
+formated_timestamp() ->
+    format_timestamp( os:timestamp() ).
+
+format_timestamp({_N1, _N2, N3} = Now) ->
+    {Date, Time}   = calendar:now_to_datetime(Now),
+    {YYYY,MM,DD}   = Date,
+    {Hour,Min,Sec} = Time,
+    FormatDate =
+        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
+                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
+    lists:flatten(FormatDate).
+
+
+skip(Reason) ->
+    {skip, Reason}.
+
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index 581461fe03..e8082fcf97 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -1,8 +1,8 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2001-2011. 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
 %% compliance with the License. You should have received a copy of the
@@ -235,13 +235,14 @@ handle_http_body(Body, State = #state{headers = Headers,
      end.
 
 validate(RequestStr, #state{status_line = {Version, StatusCode, _},
-		headers = Headers, 
-		body = Body}, Options, N, P) ->
+			    headers     = Headers, 
+			    body        = Body}, Options, N, P) ->
     
     %% tsp("validate -> entry with"
     %% 	"~n   StatusCode: ~p"
     %% 	"~n   Headers:    ~p"
     %% 	"~n   Body:       ~p", [StatusCode, Headers, Body]),
+
     check_version(Version, Options),
     case lists:keysearch(statuscode, 1, Options) of
 	{value, _} ->
@@ -255,6 +256,7 @@ validate(RequestStr, #state{status_line = {Version, StatusCode, _},
 	       list_to_integer(Headers#http_response_h.'content-length'),
 	       Body).
 
+
 %%--------------------------------------------------------------------
 %% Internal functions
 %%------------------------------------------------------------------
@@ -263,21 +265,20 @@ check_version(Version, Options) ->
 	{value, {version, Version}} ->
 	    	   ok;
 	{value, {version, Ver}} ->
-	    test_server:fail({wrong_version, [{got, Version},
-						     {expected, Ver}]});
+	    tsf({wrong_version, [{got, Version},
+					      {expected, Ver}]});
 	_ ->
 	   case Version of
 	       "HTTP/1.1" ->
 		   ok;
 	       _ ->
-		   test_server:fail({wrong_version, [{got, Version},
-						     {expected, "HTTP/1.1"}]})
+		   tsf({wrong_version, [{got,      Version}, 
+					{expected, "HTTP/1.1"}]})
 	   end
     end.
 
 check_status_code(StatusCode, [], Options) ->
-    test_server:fail({wrong_status_code, [{got, StatusCode}, 
-					  {expected, Options}]});
+    tsf({wrong_status_code, [{got, StatusCode}, {expected, Options}]});
 check_status_code(StatusCode, Current = [_ | Rest], Options) ->
     case lists:keysearch(statuscode, 1, Current) of
 	{value, {statuscode, StatusCode}} ->
@@ -285,8 +286,7 @@ check_status_code(StatusCode, Current = [_ | Rest], Options) ->
 	{value, {statuscode, _OtherStatus}} ->
 	    check_status_code(StatusCode, Rest, Options);
 	false ->
-	    test_server:fail({wrong_status_code, [{got, StatusCode}, 
-				       {expected, Options}]})
+	    tsf({wrong_status_code, [{got, StatusCode}, {expected, Options}]})
     end.
 
 do_validate(_, [], _, _) ->
@@ -317,8 +317,7 @@ do_validate(Header, [{header, HeaderField, Value}|Rest],N,P) ->
 			      Header})
     end,
     do_validate(Header, Rest, N, P);
-do_validate(Header,[{no_last_modified,HeaderField}|Rest],N,P) ->
-%    io:format("Header: ~p~nHeaderField: ~p~n",[Header,HeaderField]),
+do_validate(Header,[{no_last_modified, HeaderField}|Rest],N,P) ->
     case lists:keysearch(HeaderField,1,Header) of
 	{value,_} ->
 	    test_server:fail({wrong_header_field_value, HeaderField, 
@@ -331,7 +330,6 @@ do_validate(Header, [_Unknown | Rest], N, P) ->
     do_validate(Header, Rest, N, P).
 
 is_expect(RequestStr) ->
-   
     case inets_regexp:match(RequestStr, "xpect:100-continue") of
 	{match, _, _}->
 	    true;
@@ -340,15 +338,15 @@ is_expect(RequestStr) ->
     end.
 
 %% OTP-5775, content-length
-check_body("GET /cgi-bin/erl/httpd_example:get_bin HTTP/1.0\r\n\r\n", 200, "text/html", Length, _Body) when Length /= 274->
-    test_server:fail(content_length_error);
+check_body("GET /cgi-bin/erl/httpd_example:get_bin HTTP/1.0\r\n\r\n", 200, "text/html", Length, _Body) when (Length =/= 274) ->
+    tsf(content_length_error);
 check_body("GET /cgi-bin/cgi_echo HTTP/1.0\r\n\r\n", 200, "text/plain", 
 	   _, Body) ->
     case size(Body) of
 	100 ->
 	    ok;
 	_ ->
-	    test_server:fail(content_length_error)
+	    tsf(content_length_error)
     end;
 
 check_body(RequestStr, 200, "text/html", _, Body) ->
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 0e77bf913d..d294d0006e 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 5.7.1
+INETS_VSN   = 5.7.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"