From 52bc4e79f83e56f7f90563aa2bd97b98b4cc2715 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 17 Dec 2014 12:18:11 +0100
Subject: [PATCH] Close standard input in Gitlab::Popen.popen
---
CHANGELOG | 1 +
lib/gitlab/popen.rb | 3 +++
2 files changed, 4 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 8052181a961..aaf6c40c024 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@ v 7.7.0
- Add alert message in case of outdated browser (IE < 10)
-
- Added API support for sorting projects
+ - Close standard input in Gitlab::Popen.popen
v 7.6.0
- Fork repository to groups
diff --git a/lib/gitlab/popen.rb b/lib/gitlab/popen.rb
index e2fbafb3899..fea4d2d55d2 100644
--- a/lib/gitlab/popen.rb
+++ b/lib/gitlab/popen.rb
@@ -21,6 +21,9 @@ module Gitlab
@cmd_output = ""
@cmd_status = 0
Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
+ # We are not using stdin so we should close it, in case the command we
+ # are running waits for input.
+ stdin.close
@cmd_output << stdout.read
@cmd_output << stderr.read
@cmd_status = wait_thr.value.exitstatus
--
GitLab