Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'ruby/gitlab-shell/lib/http_helper.rb')
-rw-r--r--ruby/gitlab-shell/lib/http_helper.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/ruby/gitlab-shell/lib/http_helper.rb b/ruby/gitlab-shell/lib/http_helper.rb
index c6a4bb845..5cadb6196 100644
--- a/ruby/gitlab-shell/lib/http_helper.rb
+++ b/ruby/gitlab-shell/lib/http_helper.rb
@@ -120,6 +120,9 @@ module HTTPHelper
end
def read_timeout
- config.http_settings['read_timeout'] || READ_TIMEOUT
+ read_timeout = config.http_settings['read_timeout']
+ return read_timeout unless read_timeout == 0
+
+ READ_TIMEOUT
end
end