From 83dae67f6ba49f0b861610337d46cb8a7a10f810 Mon Sep 17 00:00:00 2001
From: Mitchell <mitchellb@activestate.com>
Date: Fri, 1 Jul 2016 15:01:27 -0400
Subject: [PATCH] PHP: Added hidden preference for PHP interpreter output
 timeout - fixes #1684 Some PHP versions may take longer than the hord-coded 5
 seconds to initialize. Changed this into a preference.

rn=
---
 src/components/koAppInfo.py | 2 +-
 src/prefs/prefs.p.xml       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/koAppInfo.py b/src/components/koAppInfo.py
index 8b129251d6..86272a911b 100644
--- a/src/components/koAppInfo.py
+++ b/src/components/koAppInfo.py
@@ -842,7 +842,7 @@ def _GetPHPOutputAndError(self, phpCode, php=None):
                     log.error("Caught PHP execution exception: %s", e.strerror)
                 return None, e.strerror
             try:
-                p.wait(5)
+                p.wait(self._prefs.getLong("phpGetOutputAndErrorTimeout", 5))
             except process.ProcessError:
                 # Timed out.
                 log.error("PHP command timed out: %r", argv)
diff --git a/src/prefs/prefs.p.xml b/src/prefs/prefs.p.xml
index ee74599dca..3f6be66f1b 100644
--- a/src/prefs/prefs.p.xml
+++ b/src/prefs/prefs.p.xml
@@ -178,6 +178,7 @@
   <string id="phpCommentStyle">//,#</string>
   <boolean id="phpDoubleClickSelectsEntireVariable">1</boolean>
   <boolean id="phpLintWithINIFile">1</boolean>
+  <long id="phpGetOutputAndErrorTimeout">5</long>
 
   <!-- Additional  directories for Python, Perl, etc. These are
        stored as pathsep-separated local paths. -->