Merge branch 'maint'

14 files changed, 362 insertions, 326 deletions

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index e29144f014..596c0d77f4 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2013</year>
+      <year>2002</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,7 +32,37 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 5.10</title>
+  <section><title>Inets 5.10.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Correct distirbing mode for httpd:reload_config/2</p>
+          <p>
+	    Own Id: OTP-11914</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improved handling of invalid strings in the HTTP request
+	    line.</p>
+          <p>
+	    Impact: May improve memory consumption</p>
+          <p>
+	    Own Id: OTP-11925 Aux Id: Sequence 12601 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 5.10</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/inets/src/http_lib/http_internal.hrl b/lib/inets/src/http_lib/http_internal.hrl
index 97cf474ab9..53b776c4e7 100644
--- a/lib/inets/src/http_lib/http_internal.hrl
+++ b/lib/inets/src/http_lib/http_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2014. 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
@@ -26,6 +26,8 @@
 -define(HTTP_MAX_BODY_SIZE,   nolimit).
 -define(HTTP_MAX_HEADER_SIZE, 10240).
 -define(HTTP_MAX_URI_SIZE,    nolimit).
+-define(HTTP_MAX_VERSION_STRING, 8).
+-define(HTTP_MAX_METHOD_STRING, 20).
 
 -ifndef(HTTP_DEFAULT_SSL_KIND).
 -define(HTTP_DEFAULT_SSL_KIND, essl).
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 5ba79b2706..712c73599f 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2014. 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
@@ -44,26 +44,26 @@
 %%%=========================================================================
 parse([Bin, MaxSizes]) ->
     ?hdrt("parse", [{bin, Bin}, {max_sizes, MaxSizes}]),    
-    parse_method(Bin, [], MaxSizes, []);
+    parse_method(Bin, [], 0, proplists:get_value(max_method, MaxSizes), MaxSizes, []);
 parse(Unknown) ->
     ?hdrt("parse", [{unknown, Unknown}]),
     exit({bad_args, Unknown}).
 
 %% Functions that may be returned during the decoding process
 %% if the input data is incompleate. 
-parse_method([Bin, Method, MaxSizes, Result]) ->
-    parse_method(Bin, Method, MaxSizes, Result).
+parse_method([Bin, Method, Current, Max, MaxSizes, Result]) ->
+    parse_method(Bin, Method, Current, Max, MaxSizes, Result).
 
-parse_uri([Bin, URI, CurrSize, MaxSizes, Result]) ->
-    parse_uri(Bin, URI, CurrSize, MaxSizes, Result).
+parse_uri([Bin, URI, Current, Max, MaxSizes, Result]) ->
+    parse_uri(Bin, URI, Current, Max, MaxSizes, Result).
 
-parse_version([Bin, Rest, Version, MaxSizes, Result]) ->
-    parse_version(<<Rest/binary, Bin/binary>>, Version, MaxSizes, 
+parse_version([Bin, Rest, Version, Current, Max, MaxSizes, Result]) ->
+    parse_version(<<Rest/binary, Bin/binary>>, Version, Current, Max, MaxSizes, 
 		  Result).
 
-parse_headers([Bin, Rest, Header, Headers, CurrSize, MaxSizes, Result]) ->
+parse_headers([Bin, Rest, Header, Headers, Current, Max, MaxSizes, Result]) ->
     parse_headers(<<Rest/binary, Bin/binary>>, 
-		  Header, Headers, CurrSize, MaxSizes, Result).
+		  Header, Headers, Current, Max, MaxSizes, Result).
 
 whole_body([Bin, Body, Length])  ->
     whole_body(<<Body/binary, Bin/binary>>, Length).    
@@ -107,8 +107,12 @@ validate("POST", Uri, "HTTP/1." ++ _N) ->
 validate("TRACE", Uri, "HTTP/1." ++ N) when hd(N) >= $1 ->
     validate_uri(Uri);
 validate(Method, Uri, Version) ->
-    {error, {not_supported, {Method, Uri, Version}}}.
-
+    case validate_version(Version) of
+	true ->
+	    {error, {not_supported, {Method, Uri, Version}}};
+	false ->
+	    {error, {bad_version, Version}}
+    end.
 %%----------------------------------------------------------------------
 %% The request is passed through the server as a record of type mod 
 %% create it.
@@ -131,104 +135,75 @@ update_mod_data(ModData, Method, RequestURI, HTTPVersion, Headers)->
 %%%========================================================================
 %%% Internal functions
 %%%========================================================================
-parse_method(<<>>, Method, MaxSizes, Result) ->
-    ?hdrt("parse_method - empty bin", 
-	  [{method, Method}, {max_sizes, MaxSizes}, {result, Result}]),    
-    {?MODULE, parse_method, [Method, MaxSizes, Result]};
-parse_method(<<?SP, Rest/binary>>, Method, MaxSizes, Result) ->
-    ?hdrt("parse_method - SP begin", 
-	  [{rest,      Rest}, 
-	   {method,    Method}, 
-	   {max_sizes, MaxSizes}, 
-	   {result,    Result}]),    
-    parse_uri(Rest, [], 0, MaxSizes,
+parse_method(<<>>, Method, Current, Max, MaxSizes, Result) ->
+    {?MODULE, parse_method, [Method, Current, Max, MaxSizes, Result]};
+parse_method(<<?SP, Rest/binary>>, Method, _Current, _Max, MaxSizes, Result) ->
+    parse_uri(Rest, [], 0,  proplists:get_value(max_uri, MaxSizes), MaxSizes,
 	      [string:strip(lists:reverse(Method)) | Result]);
-parse_method(<<Octet, Rest/binary>>, Method, MaxSizes, Result) ->
-    ?hdrt("parse_method", 
-	  [{octet,     Octet}, 
-	   {rest,      Rest}, 
-	   {method,    Method}, 
-	   {max_sizes, MaxSizes}, 
-	   {result,    Result}]),    
-    parse_method(Rest, [Octet | Method], MaxSizes, Result).
-
-parse_uri(_, _, CurrSize, {MaxURI, _}, _) 
-  when (CurrSize > MaxURI) andalso (MaxURI =/= nolimit) -> 
-    ?hdrt("parse_uri", 
-	  [{current_size, CurrSize}, 
-	   {max_uri,      MaxURI}]),    
+parse_method(<<Octet, Rest/binary>>, Method, Current, Max, MaxSizes, Result) when Current =< Max ->
+    parse_method(Rest, [Octet | Method], Current + 1, Max, MaxSizes, Result);
+parse_method(_, _, _, Max, _, _) ->
+    %% We do not know the version of the client as it comes after the
+    %% method send the lowest version in the response so that the client
+    %% will be able to handle it.
+    {error, {too_long, Max, 413, "Method unreasonably long"}, lowest_version()}.
+
+parse_uri(_, _, Current, MaxURI, _, _) 
+  when (Current > MaxURI) andalso (MaxURI =/= nolimit) -> 
     %% We do not know the version of the client as it comes after the
     %% uri send the lowest version in the response so that the client
     %% will be able to handle it.
-    HttpVersion = "HTTP/0.9", 
-    {error, {uri_too_long, MaxURI}, HttpVersion};
-parse_uri(<<>>, URI, CurrSize, MaxSizes, Result) ->
-    ?hdrt("parse_uri - empty bin", 
-	  [{uri,          URI},
-	   {current_size, CurrSize}, 
-	   {max_sz,       MaxSizes}, 
-	   {result,       Result}]),    
-    {?MODULE, parse_uri, [URI, CurrSize, MaxSizes, Result]};
-parse_uri(<<?SP, Rest/binary>>, URI, _, MaxSizes, Result) -> 
-    ?hdrt("parse_uri - SP begin", 
-	  [{uri,          URI},
-	   {max_sz,       MaxSizes}, 
-	   {result,       Result}]),    
-    parse_version(Rest, [], MaxSizes, 
+    {error, {too_long, MaxURI, 414, "URI unreasonably long"},lowest_version()};
+parse_uri(<<>>, URI, Current, Max, MaxSizes, Result) ->
+    {?MODULE, parse_uri, [URI, Current, Max, MaxSizes, Result]};
+parse_uri(<<?SP, Rest/binary>>, URI, _, _, MaxSizes, Result) -> 
+    parse_version(Rest, [], 0, proplists:get_value(max_version, MaxSizes), MaxSizes, 
 		  [string:strip(lists:reverse(URI)) | Result]);
 %% Can happen if it is a simple HTTP/0.9 request e.i "GET /\r\n\r\n"
-parse_uri(<<?CR, _Rest/binary>> = Data, URI, _, MaxSizes, Result) ->
-    ?hdrt("parse_uri - CR begin", 
-	  [{uri,          URI},
-	   {max_sz,       MaxSizes}, 
-	   {result,       Result}]),    
-    parse_version(Data, [], MaxSizes, 
+parse_uri(<<?CR, _Rest/binary>> = Data, URI, _, _, MaxSizes, Result) ->
+    parse_version(Data, [], 0, proplists:get_value(max_version, MaxSizes), MaxSizes, 
 		  [string:strip(lists:reverse(URI)) | Result]);
-parse_uri(<<Octet, Rest/binary>>, URI, CurrSize, MaxSizes, Result) ->
-    ?hdrt("parse_uri", 
-	  [{octet,        Octet}, 
-	   {uri,          URI},
-	   {curr_sz,      CurrSize}, 
-	   {max_sz,       MaxSizes}, 
-	   {result,       Result}]),    
-    parse_uri(Rest, [Octet | URI], CurrSize + 1, MaxSizes, Result).
-
-parse_version(<<>>, Version, MaxSizes, Result) ->
-    {?MODULE, parse_version, [<<>>, Version, MaxSizes, Result]};
-parse_version(<<?LF, Rest/binary>>, Version, MaxSizes, Result) ->
+parse_uri(<<Octet, Rest/binary>>, URI, Current, Max, MaxSizes, Result) ->
+    parse_uri(Rest, [Octet | URI], Current + 1, Max, MaxSizes, Result).
+
+parse_version(<<>>, Version, Current, Max, MaxSizes, Result) ->
+    {?MODULE, parse_version, [<<>>, Version, Current, Max, MaxSizes, Result]};
+parse_version(<<?LF, Rest/binary>>, Version, Current, Max, MaxSizes, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_version(<<?CR, ?LF, Rest/binary>>, Version, MaxSizes, Result);
-parse_version(<<?CR, ?LF, Rest/binary>>, Version, MaxSizes, Result) ->
-    parse_headers(Rest, [], [], 0, MaxSizes, 
+    parse_version(<<?CR, ?LF, Rest/binary>>, Version, Current, Max, MaxSizes, Result);
+parse_version(<<?CR, ?LF, Rest/binary>>, Version, _, _,  MaxSizes, Result) ->
+    parse_headers(Rest, [], [], 0, proplists:get_value(max_header, MaxSizes), MaxSizes, 
 		  [string:strip(lists:reverse(Version)) | Result]);
-parse_version(<<?CR>> = Data, Version, MaxSizes, Result) ->
-    {?MODULE, parse_version, [Data, Version, MaxSizes, Result]};
-parse_version(<<Octet, Rest/binary>>, Version, MaxSizes, Result) ->
-    parse_version(Rest, [Octet | Version], MaxSizes, Result).
-
-parse_headers(_, _, _, CurrSize, {_, MaxHeaderSize}, Result) 
-  when CurrSize > MaxHeaderSize, MaxHeaderSize =/= nolimit -> 
+parse_version(<<?CR>> = Data, Version, Current, Max, MaxSizes, Result) ->
+    {?MODULE, parse_version, [Data, Version, Current, Max, MaxSizes, Result]};
+parse_version(<<Octet, Rest/binary>>, Version, Current, Max, MaxSizes, Result)  when Current =< Max ->
+    parse_version(Rest, [Octet | Version], Current + 1, Max, MaxSizes, Result);
+parse_version(_, _, _, Max,_,_) ->
+    {error, {too_long, Max, 413, "Version string unreasonably long"}, lowest_version()}.
+
+parse_headers(_, _, _, Current, Max, _, Result) 
+  when Max =/= nolimit andalso Current > Max -> 
     HttpVersion = lists:nth(3, lists:reverse(Result)),
-    {error, {header_too_long, MaxHeaderSize}, HttpVersion};
+    {error, {too_long, Max, 413, "Headers unreasonably long"}, HttpVersion};
 
-parse_headers(<<>>, Header, Headers, CurrSize, MaxSizes, Result) ->
-    {?MODULE, parse_headers, [<<>>, Header, Headers, CurrSize, 
+parse_headers(<<>>, Header, Headers, Current, Max, MaxSizes, Result) ->
+    {?MODULE, parse_headers, [<<>>, Header, Headers, Current, Max, 
 			      MaxSizes, Result]};
-parse_headers(<<?CR,?LF,?LF,Body/binary>>, [], [], CurrSize, MaxSizes, Result) ->
+parse_headers(<<?CR,?LF,?LF,Body/binary>>, [], [], Current, Max, MaxSizes, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], CurrSize,  
+    parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], Current, Max,  
 		  MaxSizes, Result);
 
-parse_headers(<<?LF,?LF,Body/binary>>, [], [], CurrSize, MaxSizes, Result) ->
+parse_headers(<<?LF,?LF,Body/binary>>, [], [], Current, Max,  MaxSizes, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], CurrSize,  
+    parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], Current, Max, 
 		  MaxSizes, Result);
 
-parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], _,  _, Result) ->
+parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], _, _,  _, Result) ->
     NewResult = list_to_tuple(lists:reverse([Body, {#http_request_h{}, []} |
 					     Result])),
     {ok, NewResult};
-parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, Header, Headers, _,
+parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, Header, Headers, _, _,
 	      _, Result) ->
     HTTPHeaders = [lists:reverse(Header) | Headers],
     RequestHeaderRcord = 
@@ -238,52 +213,51 @@ parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, Header, Headers, _,
 						    HTTPHeaders} | Result])),
     {ok, NewResult};
 
-parse_headers(<<?CR,?LF,?CR>> = Data, Header, Headers, CurrSize, 
+parse_headers(<<?CR,?LF,?CR>> = Data, Header, Headers, Current, Max, 
 	      MaxSizes, Result) ->
-    {?MODULE, parse_headers, [Data, Header, Headers, CurrSize, 
+    {?MODULE, parse_headers, [Data, Header, Headers, Current, Max, 
 			      MaxSizes, Result]};
-parse_headers(<<?LF>>, [], [], CurrSize, MaxSizes, Result) ->
+parse_headers(<<?LF>>, [], [], Current, Max, MaxSizes, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_headers(<<?CR,?LF>>, [], [], CurrSize, MaxSizes, Result);
+    parse_headers(<<?CR,?LF>>, [], [], Current, Max, MaxSizes, Result);
 
 %% There where no headers, which is unlikely to happen.
-parse_headers(<<?CR,?LF>>, [], [], _, _, Result) ->
+parse_headers(<<?CR,?LF>>, [], [], _, _, _, Result) ->
      NewResult = list_to_tuple(lists:reverse([<<>>, {#http_request_h{}, []} |
 					      Result])),
     {ok, NewResult};
 
-parse_headers(<<?LF>>, Header, Headers, CurrSize, 
+parse_headers(<<?LF>>, Header, Headers, Current, Max,  
 	      MaxSizes, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_headers(<<?CR,?LF>>, Header, Headers, CurrSize, MaxSizes, Result);
+    parse_headers(<<?CR,?LF>>, Header, Headers, Current, Max, MaxSizes, Result);
 
-parse_headers(<<?CR,?LF>> = Data, Header, Headers, CurrSize, 
+parse_headers(<<?CR,?LF>> = Data, Header, Headers, Current, Max, 
 	      MaxSizes, Result) ->
-    {?MODULE, parse_headers, [Data, Header, Headers, CurrSize, 
+    {?MODULE, parse_headers, [Data, Header, Headers, Current, Max, 
 			      MaxSizes, Result]};
-parse_headers(<<?LF, Octet, Rest/binary>>, Header, Headers, CurrSize,
+parse_headers(<<?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
 	      MaxSizes, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, CurrSize,
+    parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
 		  MaxSizes, Result); 
-parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, CurrSize,
+parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, _, Max,
 	      MaxSizes, Result) ->
     parse_headers(Rest, [Octet], [lists:reverse(Header) | Headers], 
-		  CurrSize + 1, MaxSizes, Result);
-
-parse_headers(<<?CR>> = Data, Header, Headers, CurrSize,  
+		  0, Max, MaxSizes, Result);
+parse_headers(<<?CR>> = Data, Header, Headers, Current, Max,  
 	      MaxSizes, Result) ->
-    {?MODULE, parse_headers, [Data, Header, Headers, CurrSize, 
+    {?MODULE, parse_headers, [Data, Header, Headers, Current, Max, 
 			      MaxSizes, Result]};
-parse_headers(<<?LF>>, Header, Headers, CurrSize,  
+parse_headers(<<?LF>>, Header, Headers, Current,  Max, 
 	      MaxSizes, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_headers(<<?CR, ?LF>>, Header, Headers, CurrSize,  
+    parse_headers(<<?CR, ?LF>>, Header, Headers, Current, Max,  
 		  MaxSizes, Result);
 
-parse_headers(<<Octet, Rest/binary>>, Header, Headers, 
-	      CurrSize, MaxSizes, Result) ->
-    parse_headers(Rest, [Octet | Header], Headers, CurrSize + 1,
+parse_headers(<<Octet, Rest/binary>>, Header, Headers, Current,
+	      Max, MaxSizes, Result) ->
+    parse_headers(Rest, [Octet | Header], Headers, Current + 1, Max,
 		  MaxSizes, Result).
 
 whole_body(Body, Length) ->
@@ -326,6 +300,14 @@ validate_path([".." | Rest], N, RequestURI) ->
 validate_path([_ | Rest], N, RequestURI) ->
     validate_path(Rest, N + 1, RequestURI).
 
+validate_version("HTTP/1.1") ->
+    true;
+validate_version("HTTP/1.0") ->
+    true;
+validate_version("HTTP/0.9") ->
+    true;
+validate_version(_) ->
+    false.
 %%----------------------------------------------------------------------
 %% There are 3 possible forms of the reuqest URI 
 %%
@@ -430,3 +412,5 @@ tag([$:|Rest], Tag) ->
 tag([Chr|Rest], Tag) ->
     tag(Rest, [Chr|Tag]).
 
+lowest_version()->    
+    "HTTP/0.9".
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl
index bd37066ff6..b3c9cbc46a 100644
--- a/lib/inets/src/http_server/httpd_request_handler.erl
+++ b/lib/inets/src/http_server/httpd_request_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. 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
@@ -123,7 +123,8 @@ continue_init(Manager, ConfigDB, SocketType, Socket, TimeOut) ->
     
     {_, Status} = httpd_manager:new_connection(Manager),
     
-    MFA = {httpd_request, parse, [{MaxURISize, MaxHeaderSize}]}, 
+    MFA = {httpd_request, parse, [[{max_uri, MaxURISize}, {max_header, MaxHeaderSize},
+				   {max_version, ?HTTP_MAX_VERSION_STRING}, {max_method, ?HTTP_MAX_METHOD_STRING}]]}, 
 
     State = #state{mod                    = Mod, 
 		   manager                = Manager, 
@@ -207,23 +208,15 @@ handle_info({Proto, Socket, Data},
 			       set_new_data_size(cancel_request_timeout(State), NewDataSize)
 		       end,
             handle_http_msg(Result, NewState); 
-
-	{error, {uri_too_long, MaxSize}, Version} ->
-	    NewModData =  ModData#mod{http_version = Version},
-	    httpd_response:send_status(NewModData, 414, "URI too long"),
-	    Reason = io_lib:format("Uri too long, max size is ~p~n", 
-				   [MaxSize]),
-	    error_log(Reason, NewModData),
-	    {stop, normal, State#state{response_sent = true, 
-				       mod = NewModData}};
-	{error, {header_too_long, MaxSize}, Version} ->
+	{error, {too_long, MaxSize, ErrCode, ErrStr}, Version} ->
 	    NewModData =  ModData#mod{http_version = Version},
-	    httpd_response:send_status(NewModData, 413, "Header too long"),
-	    Reason = io_lib:format("Header too long, max size is ~p~n", 
-				   [MaxSize]),
+	    httpd_response:send_status(NewModData, ErrCode, ErrStr),
+	    Reason = io_lib:format("~p: ~p max size is ~p~n", 
+				   [ErrCode, ErrStr, MaxSize]),
 	    error_log(Reason, NewModData),
 	    {stop, normal, State#state{response_sent = true, 
 				       mod = NewModData}};
+
 	NewMFA ->
 	    http_transport:setopts(SockType, Socket, [{active, once}]),
 	    case NewDataSize of
@@ -382,6 +375,11 @@ handle_http_msg({Method, Uri, Version, {RecordHeaders, Headers}, Body},
 				       400, URI),
 	    Reason = io_lib:format("Malformed syntax in URI: ~p~n", [URI]),
 	    error_log(Reason, ModData),
+	    {stop, normal, State#state{response_sent = true}};
+	{error, {bad_version, Ver}} ->
+	    httpd_response:send_status(ModData#mod{http_version = "HTTP/0.9"}, 400, Ver),
+	    Reason = io_lib:format("Malformed syntax version: ~p~n", [Ver]),
+	    error_log(Reason, ModData),
 	    {stop, normal, State#state{response_sent = true}}
     end;
 handle_http_msg({ChunkedHeaders, Body}, 
@@ -549,7 +547,8 @@ handle_next_request(#state{mod = #mod{connection = true} = ModData,
     MaxHeaderSize = max_header_size(ModData#mod.config_db), 
     MaxURISize    = max_uri_size(ModData#mod.config_db), 
 
-    MFA = {httpd_request, parse, [{MaxURISize, MaxHeaderSize}]}, 
+    MFA = {httpd_request, parse, [[{max_uri, MaxURISize}, {max_header, MaxHeaderSize},
+				   {max_version, ?HTTP_MAX_VERSION_STRING}, {max_method, ?HTTP_MAX_METHOD_STRING}]]}, 
     TmpState = State#state{mod                    = NewModData,
 			   mfa                    = MFA,
 			   max_keep_alive_request = decrease(Max),
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index dd081962cc..5499596bbd 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -17,11 +17,20 @@
 %% %CopyrightEnd%
 {"%VSN%",
  [
-  {"5.9.8", [{load_module, ftp, soft_purge, soft_purge, []}]},
+  {"5.10", 
+   [{load_module, httpd, soft_purge, soft_purge, []},
+    {load_module, httpd_manager, soft_purge, soft_purge, []},
+    {load_module, httpd_request, soft_purge, soft_purge, []},
+    {load_module, httpd_request_handler, soft_purge, soft_purge, 
+     []}]},
   {<<"5\\..*">>,[{restart_application, inets}]}
  ],
  [
-  {"5.9.8", [{load_module, ftp, soft_purge, soft_purge, []}]},
+  {"5.10", 
+   [{load_module, httpd, soft_purge, soft_purge, []},
+    {load_module, httpd_manager, soft_purge, soft_purge, []},
+    {load_module, httpd_request, soft_purge, soft_purge, []},
+    {load_module, httpd_request_handler, soft_purge, soft_purge, []}]},
   {<<"5\\..*">>,[{restart_application, inets}]}
  ]
 }.
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index c5920a3968..d4a3f28f38 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. 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
@@ -356,7 +356,10 @@ http_request(Config) when is_list(Config) ->
      "HTTP/1.1",
      {#http_request_h{host = "www.erlang.org", te = []},
       ["te: ","host:www.erlang.org"]}, <<>>} =
-	parse(httpd_request, parse, [?HTTP_MAX_HEADER_SIZE], HttpHead),
+	parse(httpd_request, parse, [[{max_header, ?HTTP_MAX_HEADER_SIZE},
+				      {max_version, ?HTTP_MAX_VERSION_STRING}, 
+				      {max_method, ?HTTP_MAX_METHOD_STRING}]],
+	      HttpHead),
 
     HttpHead1 = ["GET http://www.erlang.org HTTP/1.1" ++ 
 		 [?CR], [?LF, ?CR, ?LF]],
@@ -364,7 +367,9 @@ http_request(Config) when is_list(Config) ->
      "http://www.erlang.org",
      "HTTP/1.1",
      {#http_request_h{}, []}, <<>>} =
-	parse(httpd_request, parse, [?HTTP_MAX_HEADER_SIZE], HttpHead1),
+	parse(httpd_request, parse,  [[{max_header, ?HTTP_MAX_HEADER_SIZE},
+				       {max_version, ?HTTP_MAX_VERSION_STRING}, 
+				       {max_method, ?HTTP_MAX_METHOD_STRING}]], HttpHead1),
 
 
     HttpHead2 = ["GET http://www.erlang.org HTTP/1.1" ++ 
@@ -373,7 +378,9 @@ http_request(Config) when is_list(Config) ->
      "http://www.erlang.org",
      "HTTP/1.1",
      {#http_request_h{}, []}, <<>>} =
-	parse(httpd_request, parse, [?HTTP_MAX_HEADER_SIZE], HttpHead2),
+	parse(httpd_request, parse, [[{max_header, ?HTTP_MAX_HEADER_SIZE},
+				      {max_version, ?HTTP_MAX_VERSION_STRING}, 
+				      {max_method, ?HTTP_MAX_METHOD_STRING}]], HttpHead2),
 
     %% Note the following body is not related to the headers above
     HttpBody = ["<HTML>\n<HEAD>\n<TITLE> dummy </TITLE>\n</HEAD>\n<BODY>\n",
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 1c3bbcaa9c..41021db7f0 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -27,15 +27,14 @@
 -include_lib("kernel/include/file.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include("inets_test_lib.hrl").
-
+-include("http_internal.hrl").
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
 -define(URL_START, "http://").
 -define(TLS_URL_START, "https://").
 -define(NOT_IN_USE_PORT, 8997).
--define(LF, $\n).
--define(HTTP_MAX_HEADER_SIZE, 10240).
+
 -record(sslsocket, {fd = nil, pid = nil}).
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
@@ -1234,7 +1233,10 @@ dummy_server_init(Caller, ip_comm, Inet, _) ->
     {ok, ListenSocket} = gen_tcp:listen(0, [Inet | BaseOpts]),
     {ok, Port} = inet:port(ListenSocket),
     Caller ! {port, Port},
-    dummy_ipcomm_server_loop({httpd_request, parse, [?HTTP_MAX_HEADER_SIZE]},
+    dummy_ipcomm_server_loop({httpd_request, parse, [[{max_uri,    ?HTTP_MAX_URI_SIZE},
+						      {max_header, ?HTTP_MAX_HEADER_SIZE},
+						      {max_version,?HTTP_MAX_VERSION_STRING}, 
+						      {max_method, ?HTTP_MAX_METHOD_STRING}]]},
 			     [], ListenSocket);
 
 dummy_server_init(Caller, ssl, Inet, SSLOptions) ->
@@ -1246,7 +1248,10 @@ dummy_ssl_server_init(Caller, BaseOpts, Inet) ->
     {ok, ListenSocket} = ssl:listen(0, [Inet | BaseOpts]),
     {ok, {_, Port}} = ssl:sockname(ListenSocket),
     Caller ! {port, Port},
-    dummy_ssl_server_loop({httpd_request, parse, [?HTTP_MAX_HEADER_SIZE]},
+    dummy_ssl_server_loop({httpd_request, parse, [[{max_uri,    ?HTTP_MAX_URI_SIZE},
+						   {max_method, ?HTTP_MAX_METHOD_STRING},
+						   {max_version,?HTTP_MAX_VERSION_STRING}, 
+						   {max_method, ?HTTP_MAX_METHOD_STRING}]]},
 			  [], ListenSocket).
 
 dummy_ipcomm_server_loop(MFA, Handlers, ListenSocket) ->
@@ -1322,10 +1327,16 @@ handle_request(Module, Function, Args, Socket) ->
 		stop ->
 		    stop;
 		<<>> ->
-		    {httpd_request, parse, [[<<>>, ?HTTP_MAX_HEADER_SIZE]]};
+		    {httpd_request, parse, [[<<>>, [{max_uri,    ?HTTP_MAX_URI_SIZE},
+						    {max_header, ?HTTP_MAX_HEADER_SIZE},
+						    {max_version,?HTTP_MAX_VERSION_STRING}, 
+						    {max_method, ?HTTP_MAX_METHOD_STRING}]]]};
 		Data ->	
 		    handle_request(httpd_request, parse, 
-				   [Data |[?HTTP_MAX_HEADER_SIZE]], Socket)
+				   [Data, [{max_uri,    ?HTTP_MAX_URI_SIZE},
+					   {max_header, ?HTTP_MAX_HEADER_SIZE},
+					   {max_version,?HTTP_MAX_VERSION_STRING}, 
+					   {max_method, ?HTTP_MAX_METHOD_STRING}]], Socket)
 	    end;
 	NewMFA ->
 	    NewMFA
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index fbe65145dc..1fcc5f257e 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -32,9 +32,9 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [
-     uri_too_long_414, 
+    [uri_too_long_414, 
      header_too_long_413,
+     entity_too_long,
      erl_script_nocache_opt,
      script_nocache,
      escaped_url_in_error_body,
@@ -63,15 +63,13 @@ end_per_group(_GroupName, Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    tsp("init_per_suite -> entry with"
-	"~n   Config: ~p", [Config]),
     inets_test_lib:stop_apps([inets]),
     inets_test_lib:start_apps([inets]),
     PrivDir = ?config(priv_dir, Config),
     DataDir = ?config(data_dir, Config), 
-
+    
     Dummy = 
-"<HTML>
+	"<HTML>
 <HEAD>
 <TITLE>/index.html</TITLE>
 </HEAD>
@@ -79,7 +77,7 @@ init_per_suite(Config) ->
 DUMMY
 </BODY>
 </HTML>",
-
+    
     DummyFile = filename:join([PrivDir,"dummy.html"]),
     CgiDir =  filename:join(PrivDir, "cgi-bin"),
     ok = file:make_dir(CgiDir),
@@ -116,8 +114,6 @@ DUMMY
 %% Description: Cleanup after the whole suite
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
-    tsp("end_per_suite -> entry with"
-	"~n   Config: ~p", [_Config]),
     inets:stop(),
     ok.
 
@@ -134,8 +130,6 @@ end_per_suite(_Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_testcase(Case, Config) ->
-    tsp("init_per_testcase(~w) -> entry with"
-	"~n   Config: ~p", [Case, Config]),
     Config.
 
 
@@ -147,22 +141,18 @@ init_per_testcase(Case, Config) ->
 %%   A list of key/value pairs, holding the test case configuration.
 %% Description: Cleanup after each test case
 %%--------------------------------------------------------------------
-end_per_testcase(Case, Config) ->
-    tsp("end_per_testcase(~w) -> entry with"
-	"~n   Config: ~p", [Case, Config]),
+end_per_testcase(_Case, Config) ->
     Config.
 
 
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-uri_too_long_414(doc) ->
-    ["Test that too long uri's get 414 HTTP code"];
-uri_too_long_414(suite) ->
-    [];
+uri_too_long_414() ->
+    [{doc, "Test that too long uri's get 414 HTTP code"}].
 uri_too_long_414(Config) when is_list(Config) ->
     HttpdConf =   ?config(httpd_conf, Config),    
-    {ok, Pid} = inets:start(httpd, [{port, 0}, {max_uri_size, 10} 
+    {ok, Pid} = inets:start(httpd, [{max_uri_size, 10} 
 				    | HttpdConf]),
     Info = httpd:info(Pid),
     Port = proplists:get_value(port, Info),
@@ -178,17 +168,12 @@ 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) ->
-    [];
+header_too_long_413() ->
+    [{doc,"Test that too long headers's get 413 HTTP code"}].
 header_too_long_413(Config) when is_list(Config) ->
     HttpdConf = ?config(httpd_conf, Config), 
-    {ok, Pid} = inets:start(httpd, [{port, 0}, {max_header_size, 10}
+    {ok, Pid} = inets:start(httpd, [{max_header_size, 10}
 				    | HttpdConf]),
     Info = httpd:info(Pid),
     Port = proplists:get_value(port, Info),
@@ -202,8 +187,72 @@ header_too_long_413(Config) when is_list(Config) ->
     inets:stop(httpd, Pid).
    
 %%-------------------------------------------------------------------------
+
+entity_too_long() ->
+    [{doc, "Test that too long versions and method strings are rejected"}].
+entity_too_long(Config) when is_list(Config) ->
+    HttpdConf =   ?config(httpd_conf, Config),    
+    {ok, Pid} = inets:start(httpd, HttpdConf),
+    Info = httpd:info(Pid),
+    Port = proplists:get_value(port, Info),
+    Address = proplists:get_value(bind_address, Info),
+    
+    %% Not so long but wrong
+    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(), 
+     				       "GET / " ++
+					   lists:duplicate(5, $A) ++ "\r\n\r\n",
+     				       [{statuscode, 400},
+     					%% Server will send lowest version
+    					%% as it will not get to the 
+     					%% client version
+     					%% before aborting
+     				        {version, "HTTP/0.9"}]),
+    
+    %% Too long
+    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(), 
+ 				       "GET / " ++
+					   lists:duplicate(100, $A) ++ "\r\n\r\n",
+ 				       [{statuscode, 413},
+					%% Server will send lowest version
+					%% as it will not get to the 
+					%% client version
+					%% before aborting
+ 				        {version, "HTTP/0.9"}]),
+    %% Not so long but wrong
+    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(), 
+				       lists:duplicate(5, $A) ++ " / "
+				       "HTTP/1.1\r\n\r\n",
+ 				       [{statuscode, 501},
+					%% Server will send lowest version
+					%% as it will not get to the 
+					%% client version
+					%% before aborting
+ 				        {version, "HTTP/1.1"}]),
+    %% Too long
+    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(), 
+				       lists:duplicate(100, $A) ++ " / "
+				       "HTTP/1.1\r\n\r\n",
+ 				       [{statuscode, 413},
+					%% Server will send lowest version
+					%% as it will not get to the 
+					%% client version
+					%% before aborting
+ 				        {version, "HTTP/0.9"}]),   
+    inets:stop(httpd, Pid).
+    
 %%-------------------------------------------------------------------------
 
+script_nocache() ->
+    [{doc,"Test nocache option for mod_cgi and mod_esi"}].
+script_nocache(Config) when is_list(Config) ->
+    Normal = {no_header, "cache-control"},
+    NoCache = {header, "cache-control", "no-cache"},
+    verify_script_nocache(Config, false, false, Normal, Normal),
+    verify_script_nocache(Config, true, false, NoCache, Normal),
+    verify_script_nocache(Config, false, true, Normal, NoCache),
+    verify_script_nocache(Config, true, true, NoCache, NoCache).
+
+%%-------------------------------------------------------------------------
 erl_script_nocache_opt(doc) ->
     ["Test that too long headers's get 413 HTTP code"];
 erl_script_nocache_opt(suite) ->
@@ -225,155 +274,49 @@ erl_script_nocache_opt(Config) when is_list(Config) ->
     inets:stop(httpd, Pid).
 
 %%-------------------------------------------------------------------------
-%%-------------------------------------------------------------------------
 
-script_nocache(doc) ->
-    ["Test nocache option for mod_cgi and mod_esi"];
-script_nocache(suite) ->
-    [];
-script_nocache(Config) when is_list(Config) ->
-    Normal = {no_header, "cache-control"},
-    NoCache = {header, "cache-control", "no-cache"},
-    verify_script_nocache(Config, false, false, Normal, Normal),
-    verify_script_nocache(Config, true, false, NoCache, Normal),
-    verify_script_nocache(Config, false, true, Normal, NoCache),
-    verify_script_nocache(Config, true, true, NoCache, NoCache),
-    ok.
 
-verify_script_nocache(Config, CgiNoCache, EsiNoCache, CgiOption, EsiOption) ->
-    HttpdConf = ?config(httpd_conf, Config),
-    CgiScript = ?config(cgi_printenv, Config),
-    CgiDir = ?config(cgi_dir, Config),
-    {ok, Pid} = inets:start(httpd, [{port, 0},
-				    {script_alias,
-				     {"/cgi-bin/", CgiDir ++ "/"}},
-				    {script_nocache, CgiNoCache},
-				    {erl_script_alias,
-				     {"/cgi-bin/erl", [httpd_example,io]}},
-				    {erl_script_nocache, EsiNoCache}
-				    | HttpdConf]),
-    Info = httpd:info(Pid),
-    Port = proplists:get_value(port, Info),
-    Address = proplists:get_value(bind_address, Info),
-    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(),
-				       "GET /cgi-bin/" ++ CgiScript ++
-					   " HTTP/1.0\r\n\r\n",
-				       [{statuscode, 200},
-					CgiOption,
-					{version, "HTTP/1.0"}]),
-    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(),
-				       "GET /cgi-bin/erl/httpd_example:get "
-				       "HTTP/1.0\r\n\r\n",
-				       [{statuscode, 200},
-					EsiOption,
-					{version, "HTTP/1.0"}]),
-    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) ->
-    %% <CONDITIONAL-SKIP>
-    %% This skip is due to a problem on windows with long path's
-    %% If a path is too long file:open fails with, for example, eio.
-    %% Until that problem is fixed, we skip this case...
-    Skippable = [win32],
-    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
-    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
-    %% </CONDITIONAL-SKIP>
-
-    tsp("escaped_url_in_error_body -> entry"),
+escaped_url_in_error_body() ->
+    [{doc, "Test Url-encoding see OTP-8940"}].
+escaped_url_in_error_body(Config) when is_list(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),
-
-    %% Request 1
-    tss(1000), 
-    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, {StatusCode1, Body1}} ->
-	    tsf({unexpected_ok_1, StatusCode1, Body1})
-    end,
-
-    %% Request 2
-    tss(1000), 
-    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, {StatusCode2, Body2}} ->
-	    tsf({unexpected_ok_2, StatusCode2, Body2})
-    end,
-
-    %% Request 3
-    tss(1000), 
-    tsp("escaped_url_in_error_body -> request 3"),
+   
+    %% Sanity check
+    {ok, {200, _}} = httpc:request(get, {URL1 ++ "/dummy.html", []},
+     				   [{url_encode,  false}, 
+     				    {version,     "HTTP/1.0"}],
+     				   [{full_result, false}]),
+    {ok, {200, _}} = httpc:request(get, {URL1 ++ "/dummy.html", []},
+     				   [{url_encode,  true}, 
+     				    {version,     "HTTP/1.0"}],
+     				   [{full_result, false}]),
+    
     %% Ask for a non-existing page(1)
     Path            = "/<b>this_is_bold<b>",
     HTMLEncodedPath = http_util:html_encode(Path),
     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_3, UnexpectedOK3})
-    end,
+    {ok, {404, Body3}} = httpc:request(get, {URL2, []},
+				       [{url_encode,  true}, 
+					{version,     "HTTP/1.0"}],
+				       [{full_result, false}]),
 
-    %% Request 4
-    tss(1000), 
-    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_4, HTMLEncodedPath, BadPath4})
-	    end;
-	{ok, UnexpectedOK4} ->
-	    tsf({unexpected_ok_4, UnexpectedOK4})
-    end, 
-    tss(1000), 
-    tsp("escaped_url_in_error_body -> stop inets"),
-    inets:stop(httpd, Pid),
-    tsp("escaped_url_in_error_body -> done"),    
-    ok.
+    HTMLEncodedPath = find_URL_path(string:tokens(Body3, " ")),
 
+    {ok, {404, Body4}} = httpc:request(get, {URL2, []}, 
+				       [{url_encode,  false}, 
+					{version,     "HTTP/1.0"}],
+				       [{full_result, false}]),
+    
+    HTMLEncodedPath = find_URL_path(string:tokens(Body4, " ")),
+    inets:stop(httpd, Pid).
 
 %%-------------------------------------------------------------------------
-%%-------------------------------------------------------------------------
 
 keep_alive_timeout(doc) ->
     ["Test the keep_alive_timeout option"];
@@ -393,7 +336,6 @@ keep_alive_timeout(Config) when is_list(Config) ->
     inets:stop(httpd, Pid).
 
 %%-------------------------------------------------------------------------
-%%-------------------------------------------------------------------------
 
 script_timeout(doc) ->
     ["Test the httpd script_timeout option"];
@@ -423,12 +365,10 @@ verify_script_timeout(Config, ScriptTimeout, StatusCode) ->
 					{version, "HTTP/1.0"}]),
     inets:stop(httpd, Pid).
 
-
-%%-------------------------------------------------------------------------
 %%-------------------------------------------------------------------------
 
-slowdose(doc) ->
-    ["Testing minimum bytes per second option"];
+slowdose() ->
+    [{doc, "Testing minimum bytes per second option"}].
 slowdose(Config) when is_list(Config) ->
     HttpdConf =   ?config(httpd_conf, Config),
     {ok, Pid} = inets:start(httpd, [{port, 0}, {minimum_bytes_per_second, 200}|HttpdConf]),
@@ -439,6 +379,40 @@ slowdose(Config) when is_list(Config) ->
     after 6000 ->
 	    {error, closed} = gen_tcp:send(Socket, "Hey")
     end.
+
+%%-------------------------------------------------------------------------
+%% Internal functions
+%%-------------------------------------------------------------------------
+
+verify_script_nocache(Config, CgiNoCache, EsiNoCache, CgiOption, EsiOption) ->
+    HttpdConf = ?config(httpd_conf, Config),
+    CgiScript = ?config(cgi_printenv, Config),
+    CgiDir = ?config(cgi_dir, Config),
+    {ok, Pid} = inets:start(httpd, [{port, 0},
+				    {script_alias,
+				     {"/cgi-bin/", CgiDir ++ "/"}},
+				    {script_nocache, CgiNoCache},
+				    {erl_script_alias,
+				     {"/cgi-bin/erl", [httpd_example,io]}},
+				    {erl_script_nocache, EsiNoCache}
+				    | HttpdConf]),
+    Info = httpd:info(Pid),
+    Port = proplists:get_value(port, Info),
+    Address = proplists:get_value(bind_address, Info),
+    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(),
+				       "GET /cgi-bin/" ++ CgiScript ++
+					   " HTTP/1.0\r\n\r\n",
+				       [{statuscode, 200},
+					CgiOption,
+					{version, "HTTP/1.0"}]),
+    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(),
+				       "GET /cgi-bin/erl/httpd_example:get "
+				       "HTTP/1.0\r\n\r\n",
+				       [{statuscode, 200},
+					EsiOption,
+					{version, "HTTP/1.0"}]),
+    inets:stop(httpd, Pid).
+
 find_URL_path([]) ->
     "";
 find_URL_path(["URL", URL | _]) ->
@@ -446,21 +420,6 @@ find_URL_path(["URL", URL | _]) ->
 find_URL_path([_ | Rest]) ->
     find_URL_path(Rest).
 
-
-tsp(F) ->
-    inets_test_lib:tsp(F).
-tsp(F, A) ->
-    inets_test_lib:tsp(F, A).
-
-tsf(Reason) ->
-    inets_test_lib:tsf(Reason).
-
-tss(Time) ->
-    inets_test_lib:tss(Time).
-
-
-
-
 skip(Reason) ->
     {skip, Reason}.
 
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index ed466fd727..36a5bb9e71 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -103,7 +103,7 @@ verify_request(SocketType, Host, Port, TranspOpts0, Node, RequestStr, Options, T
     
     try inets_test_lib:connect_bin(SocketType, Host, Port, TranspOpts) of
 	{ok, Socket} ->
-	    SendRes = inets_test_lib:send(SocketType, Socket, RequestStr),
+	    ok = inets_test_lib:send(SocketType, Socket, RequestStr),
 	    State = case inets_regexp:match(RequestStr, "printenv") of
 			nomatch ->
 			    #state{};
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index cbcf0362c9..bbd86c3eb3 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 5.10
+INETS_VSN   = 5.10.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index bce02966ae..84d5e5c86e 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2013</year>
+      <year>2004</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,6 +29,36 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 3.0.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed timeout bug in ssh:connect.</p>
+          <p>
+	    Own Id: OTP-11908</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Option <c>max_sessions</c> added to
+	    <c>ssh:daemon/{2,3}</c>. This option, if set, limits the
+	    number of simultaneous connections accepted by the
+	    daemon.</p>
+          <p>
+	    Own Id: OTP-11885</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 3.0.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 1917c95f5a..42eb2167e0 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,9 +19,13 @@
 
 {"%VSN%",	
  [
+  {"3.0.1", [{load_module, ssh, soft_purge, soft_purge, []},
+	     {load_module, ssh_acceptor, soft_purge, soft_purge, []}]},
   {<<".*">>, [{restart_application, ssh}]}
  ],
  [
+  {"3.0.1", [{load_module, ssh, soft_purge, soft_purge, []},
+	     {load_module, ssh_acceptor, soft_purge, soft_purge, []}]},
   {<<".*">>, [{restart_application, ssh}]}
  ]
 }.
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 37a307d783..ba38c1da40 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. 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
@@ -49,6 +49,7 @@ all() ->
      server_userpassword_option,
      double_close,
      ssh_connect_timeout,
+     ssh_connect_arg4_timeout,
      {group, hardening_tests}
     ].
 
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index c8cac3e852..40ed27d8f5 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 3.1
+SSH_VSN = 3.0.2
 APP_VSN    = "ssh-$(SSH_VSN)"