Merge https://github.com/EiffelWebFramework/EWF

library/network/http_client/src/http_client_request_context.e

@@ -124,8 +124,6 @@ feature -- Element change
 		end
 
 	add_header_lines (lst: ITERABLE [READABLE_STRING_8])
-		local
-			i: INTEGER
 		do
 			across
 				lst as c
@@ -151,14 +149,14 @@ feature -- Element change
 
 	set_upload_data (a_data: like upload_data)
 		require
-			has_no_upload_data: not has_upload_data
+			has_no_upload_data: a_data /= Void implies not has_upload_data
 		do
 			upload_data := a_data
 		end
 
 	set_upload_filename (a_fn: like upload_filename)
 		require
-			has_no_upload_filename: not has_upload_filename
+			has_no_upload_filename: a_fn /= Void implies not has_upload_filename
 		do
 			upload_filename := a_fn
 		end
@@ -233,7 +231,7 @@ feature {NONE} -- Implementation
 		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