summaryrefslogtreecommitdiffstats
path: root/drush-issue2065.patch
diff options
context:
space:
mode:
Diffstat (limited to 'drush-issue2065.patch')
-rw-r--r--drush-issue2065.patch8
1 files changed, 3 insertions, 5 deletions
diff --git a/drush-issue2065.patch b/drush-issue2065.patch
index de8cebf..90b256d 100644
--- a/drush-issue2065.patch
+++ b/drush-issue2065.patch
@@ -2,13 +2,11 @@ diff --git a/includes/startup.inc b/includes/startup.inc
index 693fede..fedccbf 100644
--- a/includes/startup.inc
+++ b/includes/startup.inc
-@@ -326,8 +326,8 @@ function drush_startup($argv) {
- }
+@@ -383,7 +383,7 @@ function drush_startup($argv) {
}
-- // Always use pcntl_exec if it exists.
-- $use_pcntl_exec = function_exists("pcntl_exec");
-+ // https://github.com/drush-ops/drush/issues/2065
+ // Always use pcntl_exec if it exists.
+- $use_pcntl_exec = function_exists("pcntl_exec") && (strpos(ini_get('disable_functions'), 'pcntl_exec') === FALSE);
+ $use_pcntl_exec = FALSE;
// If we have posix_getppid, then pass in the shell pid so