OTP-8016, OTP-8056, OTP-8103, OTP-8106, OTP-8312, OTP-8315, OTP-8327, OTP-8349,

OTP-8351, OTP-8359 & OTP-8371.

1 files changed, 28 insertions, 7 deletions

diff --git a/lib/inets/src/http_lib/http_util.erl b/lib/inets/src/http_lib/http_util.erl
index b03b780cf8..ddb58c7116 100644
--- a/lib/inets/src/http_lib/http_util.erl
+++ b/lib/inets/src/http_lib/http_util.erl
@@ -1,27 +1,33 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-2010. 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
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 %%
 -module(http_util).
 
--export([to_upper/1, to_lower/1, convert_netscapecookie_date/1,
+-export([
+	 to_upper/1, to_lower/1, 
+	 convert_netscapecookie_date/1,
 	 hexlist_to_integer/1, integer_to_hexlist/1, 
-	 convert_month/1, is_hostname/1]).
+	 convert_month/1, 
+	 is_hostname/1,
+	 timestamp/0, timeout/2
+	]).
+
 
 %%%=========================================================================
 %%%  Internal application API
@@ -100,6 +106,21 @@ convert_month("Dec") -> 12.
 is_hostname(Dest) ->
     inet_parse:domain(Dest).
 
+
+timestamp() ->
+    {A,B,C} = os:timestamp(),
+    A*1000000000+B*1000+(C div 1000).
+
+timeout(Timeout, Started) ->
+    %% NewTimeout = Timeout - (timestamp() - Started),
+    case Timeout - (timestamp() - Started) of
+	NewTimeout when Timeout > 0 ->
+	    NewTimeout;
+	_ ->
+	    0
+    end.
+    
+
 %%%========================================================================
 %%% Internal functions
 %%%========================================================================