Merge branch 'ia/R15B03/inets-5.9.8' into maint-r15

* refs/heads/fetch-and-merge.maint-r15-opu/FETCH_HEAD/11632: (73 commits)
  Changed to correct errorcode in testcase
  inets: Prepare for release
  inets: Make test suites independent of each other
  inets: Rewrite of test case to avoid timing issues in test code
  Add missing brackets to report formatting on ftp_progress process exit
  inets: Remove log message as it causes more harm than use at the moment
  inets: Mend broken max_clients check
  inets: Start CT'ify httpd_SUITE
  inets: Remove use of default gen_server timeout
  Fix http_request:http_headers/1 to send content-length when length is zero
  Fix httpd config option 'keep_alive_timeout'
  Fix httpd config option 'script_timeout'
  inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail
  inets: Add crypto start check to ssl test cases
  ftp: fix sockname dialyzer warning including ftp:sockname/1 bug
  ftp,ssl: Fixes broken type link (ssloption).
  ftp: Adds dynamic cert generation to tests.
  ftp: Clean Makefile and conf file
  ftp: Linking rfc-refs.
  ftp: Add documentation.
  ...

1 files changed, 3 insertions, 11 deletions

diff --git a/lib/inets/src/http_lib/http_request.erl b/lib/inets/src/http_lib/http_request.erl
index c214aca4a4..5f787db0ce 100644
--- a/lib/inets/src/http_lib/http_request.erl
+++ b/lib/inets/src/http_lib/http_request.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. 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
@@ -40,9 +40,6 @@ headers([Header | Tail], Headers) ->
 	    headers(Tail, headers(http_util:to_lower(string:strip(Key)), 
 				  string:strip(Value), Headers));
 	{_, []} -> 
-	    Report = io_lib:format("Ignored invalid HTTP-header: ~p~n", 
-				   [Header]),
-	    error_logger:error_report(Report),
 	    headers(Tail, Headers)
     end.
 
@@ -248,13 +245,8 @@ key_value_str(Key = 'content-language', Headers) ->
     key_value_str(atom_to_list(Key), 
 		    Headers#http_request_h.'content-language');
 key_value_str(Key = 'content-length', Headers) ->
-    case Headers#http_request_h.'content-length' of
-	"0" ->
-	    undefined;
-	_ -> 
-	    key_value_str(atom_to_list(Key), 
-			    Headers#http_request_h.'content-length')
-    end;
+    key_value_str(atom_to_list(Key),
+		    Headers#http_request_h.'content-length');
 key_value_str(Key = 'content-location', Headers) ->
     key_value_str(atom_to_list(Key),
 		    Headers#http_request_h.'content-location');