Have pcntl compiled in, disabled opcache for cli by default (#258)

* Have pcntl compiled in, disabled opcache for cli by default * Added libuv1 runtime explicitly
GoogleCloudPlatform · Apr 20, 2017 · d564031 · d564031
1 parent 9383750
commit d564031
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 11 deletions.
diff --git a/deb-package-builder/debian/rules.in b/deb-package-builder/debian/rules.in
@@ -26,7 +26,7 @@ override_dh_auto_configure:
 	--enable-mbstring \
 	--enable-mysqlnd \
 	--enable-opcache \
-	--enable-pcntl=shared \
+	--enable-pcntl \
 	--enable-shared \
 	--enable-shmop=shared \
 	--enable-soap=shared \

diff --git a/deb-package-builder/extensions/libuv/build.sh b/deb-package-builder/extensions/libuv/build.sh
@@ -7,3 +7,7 @@ echo "Downloading libuv and libuv-dev from backports"
 for PKG in `apt-get install --reinstall --print-uris -qq libuv1-dev | cut -d"'" -f2`; do
   curl -o ${ARTIFACT_DIR}/$(basename $PKG) $PKG
 done
+
+for PKG in `apt-get install --reinstall --print-uris -qq libuv1 | cut -d"'" -f2`; do
+  curl -o ${ARTIFACT_DIR}/$(basename $PKG) $PKG
+done
diff --git a/php-nginx/README.md b/php-nginx/README.md
@@ -213,6 +213,7 @@ These extensions are enabled as builtin:
 - MySQLi (uses mysqlnd)
 - OPcache
 - OpenSSL
+- PCNTL (pcntl)
 - PostgreSQL
 - PostgreSQL (PDO)
 - Readline
@@ -239,7 +240,6 @@ These extensions are compiled as shared, but disabled by default. You will need
 - mongodb (mongodb)
 - MySQL (mysql, not available for PHP 7+)
 - OAuth (oauth)
-- PCNTL (pcntl)
 - Phalcon (phalcon, third-party, not available for PHP 7.1)
 - PostgreSQL (pq, also requires raphf)
 - RAPHF (raphf)

diff --git a/php-nginx/install_extensions.php b/php-nginx/install_extensions.php
@@ -27,7 +27,6 @@ class InstallExtensions
         'intl',
         'mbstring',
         'mysql',
-        'pcntl',
         'shmop',
         'soap',
         'sqlite3',

diff --git a/php-nginx/php.ini b/php-nginx/php.ini
@@ -1891,7 +1891,7 @@ ldap.max_links = -1
 opcache.enable=1
 
 ; Determines if Zend OPCache is enabled for the CLI version of PHP
-;opcache.enable_cli=0
+opcache.enable_cli=0
 
 ; The OPcache shared memory storage size.
 ;opcache.memory_consumption=64

diff --git a/testapps/php56_extensions/composer.json b/testapps/php56_extensions/composer.json
@@ -10,7 +10,6 @@
         "ext-gettext": "*",
         "ext-intl": "*",
         "ext-memcache": "*",
-        "ext-pcntl": "*",
         "ext-shmop": "*",
         "ext-soap": "*",
         "ext-sqlite3": "*",

diff --git a/testapps/php70_custom/php.ini b/testapps/php70_custom/php.ini
@@ -20,7 +20,6 @@ extension=ftp.so
 extension=gd.so
 extension=gettext.so
 extension=intl.so
-extension=pcntl.so
 extension=shmop.so
 extension=soap.so
 extension=sqlite3.so

diff --git a/testapps/php70_custom/tests/tests/PHP7CustomTest.php b/testapps/php70_custom/tests/tests/PHP7CustomTest.php
@@ -46,6 +46,7 @@ class PHP7CustomTest extends \PHPUnit_Framework_TestCase
         'session',
         'PDO',
         'standard',
+        'pcntl',
         'pdo_pgsql',
         'pgsql',
         'Phar',
@@ -75,7 +76,6 @@ class PHP7CustomTest extends \PHPUnit_Framework_TestCase
         'mbstring',
         'memcached',
         'mysql',
-        'pcntl',
         'redis',
         'shmop',
         'soap',

diff --git a/testapps/php70_extensions/composer.json b/testapps/php70_extensions/composer.json
@@ -9,7 +9,6 @@
         "ext-gd": "*",
         "ext-gettext": "*",
         "ext-intl": "*",
-        "ext-pcntl": "*",
         "ext-shmop": "*",
         "ext-soap": "*",
         "ext-sqlite3": "*",

diff --git a/testapps/php71_custom/php.ini b/testapps/php71_custom/php.ini
@@ -19,7 +19,6 @@ extension=ftp.so
 extension=gd.so
 extension=gettext.so
 extension=intl.so
-extension=pcntl.so
 extension=shmop.so
 extension=soap.so
 extension=sqlite3.so

diff --git a/testapps/php71_custom/tests/tests/PHP71CustomTest.php b/testapps/php71_custom/tests/tests/PHP71CustomTest.php
@@ -46,6 +46,7 @@ class PHP7CustomTest extends \PHPUnit_Framework_TestCase
         'session',
         'PDO',
         'standard',
+        'pcntl',
         'pdo_pgsql',
         'pgsql',
         'Phar',
@@ -75,7 +76,6 @@ class PHP7CustomTest extends \PHPUnit_Framework_TestCase
         'mbstring',
         'memcached',
         'mysql',
-        'pcntl',
         'redis',
         'shmop',
         'soap',

diff --git a/testapps/php71_extensions/composer.json b/testapps/php71_extensions/composer.json
@@ -9,7 +9,6 @@
         "ext-gd": "*",
         "ext-gettext": "*",
         "ext-intl": "*",
-        "ext-pcntl": "*",
         "ext-shmop": "*",
         "ext-soap": "*",
         "ext-sqlite3": "*",