Revert "Work around HHVM bug with stdin/stdout in proc_open()"
authorAaron Schulz <aschulz@wikimedia.org>
Fri, 11 Apr 2014 18:39:10 +0000 (11:39 -0700)
committerOri.livneh <ori@wikimedia.org>
Fri, 11 Apr 2014 22:07:19 +0000 (22:07 +0000)
This was fixed in HHVM (https://github.com/facebook/hhvm/issues/1247).

This reverts commit 52e546640c5c0c0e817ae1fc5451a934b2c34de9.

bug: 56597
Change-Id: I9c97ba5645d794ff562347979e3f2027eb8b4534

includes/GlobalFunctions.php

index cef19e1..c900306 100644 (file)
@@ -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 ) {