Merge branch 'master' of git-server:otp

Conflicts:
	lib/orber/src/orber.app.src

2 files changed, 15 insertions, 4 deletions

diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index dbdc1be272..a21eb915d4 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -785,8 +785,15 @@ fix_mime_types(ConfigList0) ->
 			  [{"html","text/html"},{"htm","text/html"}]} 
 			 | ConfigList0]
 		end;
-	_ ->
-	    ConfigList0
+    MimeTypes ->
+        case filelib:is_file(MimeTypes) of
+            true ->
+                {ok, MimeTypesList} = load_mime_types(MimeTypes),
+                ConfigList = proplists:delete(mime_types, ConfigList0),
+                [{mime_types, MimeTypesList} | ConfigList];
+            false ->
+                ConfigList0
+        end
     end.
 
 store({mime_types,MimeTypesList},ConfigList) ->
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 6985065c3e..3ff07616f9 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -417,8 +417,12 @@ check_header({"content-length", Value}, Maxsizes) ->
     case length(Value) =< MaxLen of
 	true ->
 	    try 
-		_ = list_to_integer(Value),
-		ok
+		list_to_integer(Value)
+	    of
+		I when I>= 0 ->
+		    ok;
+		_ ->
+		    {error, {size_error, Max, 411, "negative content-length"}}
 	    catch _:_ ->
 		    {error, {size_error, Max, 411, "content-length not an integer"}}
 	    end;