From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 11 Apr 2014 18:39:10 +0000 (-0700)
Subject: Revert "Work around HHVM bug with stdin/stdout in proc_open()"
X-Git-Tag: 1.31.0-rc.0~16251
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=1f19a345bc201e801073d2209d94cea772d0bacb;p=lhc%2Fweb%2Fwiklou.git

Revert "Work around HHVM bug with stdin/stdout in proc_open()"

This was fixed in HHVM (https://github.com/facebook/hhvm/issues/1247).

This reverts commit 52e546640c5c0c0e817ae1fc5451a934b2c34de9.

bug: 56597
Change-Id: I9c97ba5645d794ff562347979e3f2027eb8b4534
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index cef19e12bb..c900306ed7 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2881,15 +2881,6 @@ function wfShellExec( $cmd, &$retval = null, $environ = array(),
 	if ( $useLogPipe ) {
 		$desc[3] = array( 'pipe', 'w' );
 	}
-
-	# TODO/FIXME: This is a bad hack to workaround an HHVM bug that prevents
-	# proc_open() from opening stdin/stdout, so use /dev/null *for now*
-	# See bug 56597 / https://github.com/facebook/hhvm/issues/1247 for more info
-	if ( wfIsHHVM() ) {
-		$desc[0] = array( 'file', '/dev/null', 'r' );
-		$desc[2] = array( 'file', '/dev/null', 'w' );
-	}
-
 	$pipes = null;
 	$proc = proc_open( $cmd, $desc, $pipes );
 	if ( !$proc ) {