From ea1c8a23cd39475f8bd5e1facc6c3b524038eb70 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Tue, 19 Nov 2013 22:07:29 +0100
Subject: [PATCH] http_client: changed some default settings `connect_timeout'
 and `timeout' to 0 (never timeout) Updated comments

---
 library/network/http_client/src/http_client_request.e |  4 +++-
 .../http_client/src/http_client_request_context.e     |  2 +-
 library/network/http_client/src/http_client_session.e | 11 +++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/library/network/http_client/src/http_client_request.e b/library/network/http_client/src/http_client_request.e
index 7d8cd09c..030eddf6 100644
--- a/library/network/http_client/src/http_client_request.e
+++ b/library/network/http_client/src/http_client_request.e
@@ -111,12 +111,14 @@ feature -- Settings
 
 	timeout: INTEGER
 			-- HTTP transaction timeout in seconds.
+			--| 0 means it nevers timeout
 		do
 			Result := session.timeout
 		end
 
 	connect_timeout: INTEGER
 			-- HTTP connection timeout in seconds.
+			--| 0 means it nevers timeout			
 		do
 			Result := session.connect_timeout
 		end
@@ -218,7 +220,7 @@ feature {NONE} -- Utilities: encoding
 		end
 
 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/network/http_client/src/http_client_request_context.e b/library/network/http_client/src/http_client_request_context.e
index 89ced4e2..09661290 100644
--- a/library/network/http_client/src/http_client_request_context.e
+++ b/library/network/http_client/src/http_client_request_context.e
@@ -5,7 +5,7 @@ note
 					- headers
 					- query_parameters
 					- form parameters
-					- upload_data or upload_filename
+					- upload_data xor upload_filename
 				And in addition it has 
 					- credentials_required
 					- proxy
diff --git a/library/network/http_client/src/http_client_session.e b/library/network/http_client/src/http_client_session.e
index 831d399f..2a9b04c8 100644
--- a/library/network/http_client/src/http_client_session.e
+++ b/library/network/http_client/src/http_client_session.e
@@ -36,9 +36,10 @@ feature {NONE} -- Initialization
 		end
 
 	set_defaults
+			-- Set default settings.
 		do
-			timeout := 5
-			connect_timeout := 1
+			timeout := 0 --| never timeout
+			connect_timeout := 0 --| never timeout
 			max_redirects := 5
 			set_basic_auth_type
 		end
@@ -149,10 +150,12 @@ feature -- Status report
 feature -- Settings
 
 	timeout: INTEGER
-			-- HTTP transaction timeout in seconds. Defaults to 5 seconds.
+			-- HTTP transaction timeout in seconds.
+			-- Defaults to 0 second  i.e never timeout.
 
 	connect_timeout: INTEGER
-			-- HTTP connection timeout in seconds. Defaults to 1 second.
+			-- HTTP connection timeout in seconds.
+			-- Defaults to 0 second i.e never timeout.
 
 	max_redirects: INTEGER
     		-- Maximum number of times to follow redirects.