From d1ff787b46885d493e28314e516c45f78e573265 Mon Sep 17 00:00:00 2001
From: Patrick Dowell <pdowell@fb.com>
Date: Wed, 18 Dec 2013 09:26:38 -0800
Subject: [PATCH] fix to allow proc_open() to accept php://stdin as stdin

I added some code to the openFile function in runtime/ext/ext_process.cpp that accounts for the case when the user calls proc_open() using
php://stdin as stdin for the process spawned.

Reviewed By: @ptarjan

Differential Revision: D1094713
---
 hphp/runtime/ext/ext_process.cpp                 | 18 +++++++++++-----
 hphp/test/slow/ext_process/proc_open.php         | 26 ++++++++++++++++++++++++
 hphp/test/slow/ext_process/proc_open.php.expectf |  7 +++++++
 hphp/test/slow/ext_process/proc_open.php.in      |  3 +++
 hphp/test/slow/ext_process/test_proc_open.sh     |  4 ++++
 hphp/test/slow/ext_process/test_proc_open.txt    |  1 +
 6 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 hphp/test/slow/ext_process/proc_open.php
 create mode 100644 hphp/test/slow/ext_process/proc_open.php.expectf
 create mode 100644 hphp/test/slow/ext_process/proc_open.php.in
 create mode 100755 hphp/test/slow/ext_process/test_proc_open.sh
 create mode 100644 hphp/test/slow/ext_process/test_proc_open.txt

diff --git a/hphp/runtime/ext/ext_process.cpp b/hphp/runtime/ext/ext_process.cpp
index e7d4d8e9c2c..66b3a6af5de 100644
--- a/hphp/runtime/ext/ext_process.cpp
+++ b/hphp/runtime/ext/ext_process.cpp
@@ -627,15 +627,23 @@ public:
 
   bool openFile(const String& zfile, const String& zmode) {
     mode = DESC_FILE;
-    /* try a wrapper */
-    FILE *file = fopen(zfile.c_str(), zmode.c_str());
-    if (!file) {
+      /* try a wrapper */
+    Variant vfile = f_fopen(zfile.c_str(), zmode.c_str());
+    if (!vfile.isResource()) {
       raise_warning("Unable to open specified file: %s (mode %s)",
                       zfile.data(), zmode.data());
       return false;
+    } else {
+      File *file = vfile.toResource().getTyped<File>();
+      file->flush();
+      childend = dup(file->fd());
+      if (childend < 0) {
+        raise_warning("unable to dup File-Handle for descriptor %d - %s",
+                        index, folly::errnoStr(errno).c_str());
+        return false;
+      }
+      return true;
     }
-    childend = fileno(file);
-    return true;
   }
 
   void dupChild() {
diff --git a/hphp/test/slow/ext_process/proc_open.php b/hphp/test/slow/ext_process/proc_open.php
new file mode 100644
index 00000000000..8328cc0e519
--- /dev/null
+++ b/hphp/test/slow/ext_process/proc_open.php
@@ -0,0 +1,26 @@
+<?php
+
+function test_me($desc) {
+  $pipes = null;
+  $process = proc_open(__DIR__."/test_proc_open.sh", $desc, $pipes);
+  $status = proc_get_status($process);
+  pcntl_waitpid($status["pid"], $child_status);
+}
+
+$desc = array(array("file", "php://stdin", "r"));
+test_me($desc);
+
+$desc = array(array("file", __DIR__ . "/test_proc_open.txt", "r"));
+test_me($desc);
+
+$desc = array(array("file", __DIR__, "r"));
+test_me($desc);
+
+$desc = array(array("file", "php://fd/0", "r"));
+test_me($desc);
+
+$desc = array(array("file", "php://temp", "r"));
+test_me($desc);
+
+$desc = array(array("file", "php://memory", "r"));
+test_me($desc);
diff --git a/hphp/test/slow/ext_process/proc_open.php.expectf b/hphp/test/slow/ext_process/proc_open.php.expectf
new file mode 100644
index 00000000000..79add4fc798
--- /dev/null
+++ b/hphp/test/slow/ext_process/proc_open.php.expectf
@@ -0,0 +1,7 @@
+hello foo
+hello foo
+%stest/slow/ext_process/test_proc_open.sh: line 3: read: read error: 0: Is a directory
+hello 
+hello foo
+hello 
+hello
diff --git a/hphp/test/slow/ext_process/proc_open.php.in b/hphp/test/slow/ext_process/proc_open.php.in
new file mode 100644
index 00000000000..7cd519a1d24
--- /dev/null
+++ b/hphp/test/slow/ext_process/proc_open.php.in
@@ -0,0 +1,3 @@
+foo
+foo
+
diff --git a/hphp/test/slow/ext_process/test_proc_open.sh b/hphp/test/slow/ext_process/test_proc_open.sh
new file mode 100755
index 00000000000..272a1f9245f
--- /dev/null
+++ b/hphp/test/slow/ext_process/test_proc_open.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+read a;
+echo "hello $a";
diff --git a/hphp/test/slow/ext_process/test_proc_open.txt b/hphp/test/slow/ext_process/test_proc_open.txt
new file mode 100644
index 00000000000..257cc5642cb
--- /dev/null
+++ b/hphp/test/slow/ext_process/test_proc_open.txt
@@ -0,0 +1 @@
+foo
-- 
2.11.4.GIT