From 58c3fd175cb3ab30633fbc3e86314154ecc38e89 Mon Sep 17 00:00:00 2001 From: Jared Markell Date: Wed, 19 Nov 2014 12:13:43 -0800 Subject: [PATCH] Load opcache as a zend_extension. --- 5.4/apache/docker-php-ext-install | 7 ++++++- 5.4/docker-php-ext-install | 7 ++++++- 5.4/fpm/docker-php-ext-install | 7 ++++++- 5.5/apache/docker-php-ext-install | 7 ++++++- 5.5/docker-php-ext-install | 7 ++++++- 5.5/fpm/docker-php-ext-install | 7 ++++++- 5.6/apache/docker-php-ext-install | 7 ++++++- 5.6/docker-php-ext-install | 7 ++++++- 5.6/fpm/docker-php-ext-install | 7 ++++++- docker-php-ext-install | 7 ++++++- 10 files changed, 60 insertions(+), 10 deletions(-) diff --git a/5.4/apache/docker-php-ext-install b/5.4/apache/docker-php-ext-install index abca7fff..ca65449d 100755 --- a/5.4/apache/docker-php-ext-install +++ b/5.4/apache/docker-php-ext-install @@ -44,7 +44,12 @@ for ext in "${exts[@]}"; do ini="/usr/local/etc/php/conf.d/docker-php-ext-$ext.ini" for module in modules/*.so; do if [ -f "$module" ]; then - line="extension=$(basename "$module")" + if grep -q zend_extension_entry "$module"; then + # https://wiki.php.net/internals/extensions#loading_zend_extensions + line="zend_extension=$(basename "$module")" + else + line="extension=$(basename "$module")" + fi if ! grep -q "$line" "$ini"; then echo "$line" >> "/usr/local/etc/php/conf.d/ext-$ext.ini" fi diff --git a/5.4/docker-php-ext-install b/5.4/docker-php-ext-install index abca7fff..ca65449d 100755 --- a/5.4/docker-php-ext-install +++ b/5.4/docker-php-ext-install @@ -44,7 +44,12 @@ for ext in "${exts[@]}"; do ini="/usr/local/etc/php/conf.d/docker-php-ext-$ext.ini" for module in modules/*.so; do if [ -f "$module" ]; then - line="extension=$(basename "$module")" + if grep -q zend_extension_entry "$module"; then + # https://wiki.php.net/internals/extensions#loading_zend_extensions + line="zend_extension=$(basename "$module")" + else + line="extension=$(basename "$module")" + fi if ! grep -q "$line" "$ini"; then echo "$line" >> "/usr/local/etc/php/conf.d/ext-$ext.ini" fi diff --git a/5.4/fpm/docker-php-ext-install b/5.4/fpm/docker-php-ext-install index abca7fff..ca65449d 100755 --- a/5.4/fpm/docker-php-ext-install +++ b/5.4/fpm/docker-php-ext-install @@ -44,7 +44,12 @@ for ext in "${exts[@]}"; do ini="/usr/local/etc/php/conf.d/docker-php-ext-$ext.ini" for module in modules/*.so; do if [ -f "$module" ]; then - line="extension=$(basename "$module")" + if grep -q zend_extension_entry "$module"; then + # https://wiki.php.net/internals/extensions#loading_zend_extensions + line="zend_extension=$(basename "$module")" + else + line="extension=$(basename "$module")" + fi if ! grep -q "$line" "$ini"; then echo "$line" >> "/usr/local/etc/php/conf.d/ext-$ext.ini" fi diff --git a/5.5/apache/docker-php-ext-install b/5.5/apache/docker-php-ext-install index abca7fff..ca65449d 100755 --- a/5.5/apache/docker-php-ext-install +++ b/5.5/apache/docker-php-ext-install @@ -44,7 +44,12 @@ for ext in "${exts[@]}"; do ini="/usr/local/etc/php/conf.d/docker-php-ext-$ext.ini" for module in modules/*.so; do if [ -f "$module" ]; then - line="extension=$(basename "$module")" + if grep -q zend_extension_entry "$module"; then + # https://wiki.php.net/internals/extensions#loading_zend_extensions + line="zend_extension=$(basename "$module")" + else + line="extension=$(basename "$module")" + fi if ! grep -q "$line" "$ini"; then echo "$line" >> "/usr/local/etc/php/conf.d/ext-$ext.ini" fi diff --git a/5.5/docker-php-ext-install b/5.5/docker-php-ext-install index abca7fff..ca65449d 100755 --- a/5.5/docker-php-ext-install +++ b/5.5/docker-php-ext-install @@ -44,7 +44,12 @@ for ext in "${exts[@]}"; do ini="/usr/local/etc/php/conf.d/docker-php-ext-$ext.ini" for module in modules/*.so; do if [ -f "$module" ]; then - line="extension=$(basename "$module")" + if grep -q zend_extension_entry "$module"; then + # https://wiki.php.net/internals/extensions#loading_zend_extensions + line="zend_extension=$(basename "$module")" + else + line="extension=$(basename "$module")" + fi if ! grep -q "$line" "$ini"; then echo "$line" >> "/usr/local/etc/php/conf.d/ext-$ext.ini" fi diff --git a/5.5/fpm/docker-php-ext-install b/5.5/fpm/docker-php-ext-install index abca7fff..ca65449d 100755 --- a/5.5/fpm/docker-php-ext-install +++ b/5.5/fpm/docker-php-ext-install @@ -44,7 +44,12 @@ for ext in "${exts[@]}"; do ini="/usr/local/etc/php/conf.d/docker-php-ext-$ext.ini" for module in modules/*.so; do if [ -f "$module" ]; then - line="extension=$(basename "$module")" + if grep -q zend_extension_entry "$module"; then + # https://wiki.php.net/internals/extensions#loading_zend_extensions + line="zend_extension=$(basename "$module")" + else + line="extension=$(basename "$module")" + fi if ! grep -q "$line" "$ini"; then echo "$line" >> "/usr/local/etc/php/conf.d/ext-$ext.ini" fi diff --git a/5.6/apache/docker-php-ext-install b/5.6/apache/docker-php-ext-install index abca7fff..ca65449d 100755 --- a/5.6/apache/docker-php-ext-install +++ b/5.6/apache/docker-php-ext-install @@ -44,7 +44,12 @@ for ext in "${exts[@]}"; do ini="/usr/local/etc/php/conf.d/docker-php-ext-$ext.ini" for module in modules/*.so; do if [ -f "$module" ]; then - line="extension=$(basename "$module")" + if grep -q zend_extension_entry "$module"; then + # https://wiki.php.net/internals/extensions#loading_zend_extensions + line="zend_extension=$(basename "$module")" + else + line="extension=$(basename "$module")" + fi if ! grep -q "$line" "$ini"; then echo "$line" >> "/usr/local/etc/php/conf.d/ext-$ext.ini" fi diff --git a/5.6/docker-php-ext-install b/5.6/docker-php-ext-install index abca7fff..ca65449d 100755 --- a/5.6/docker-php-ext-install +++ b/5.6/docker-php-ext-install @@ -44,7 +44,12 @@ for ext in "${exts[@]}"; do ini="/usr/local/etc/php/conf.d/docker-php-ext-$ext.ini" for module in modules/*.so; do if [ -f "$module" ]; then - line="extension=$(basename "$module")" + if grep -q zend_extension_entry "$module"; then + # https://wiki.php.net/internals/extensions#loading_zend_extensions + line="zend_extension=$(basename "$module")" + else + line="extension=$(basename "$module")" + fi if ! grep -q "$line" "$ini"; then echo "$line" >> "/usr/local/etc/php/conf.d/ext-$ext.ini" fi diff --git a/5.6/fpm/docker-php-ext-install b/5.6/fpm/docker-php-ext-install index abca7fff..ca65449d 100755 --- a/5.6/fpm/docker-php-ext-install +++ b/5.6/fpm/docker-php-ext-install @@ -44,7 +44,12 @@ for ext in "${exts[@]}"; do ini="/usr/local/etc/php/conf.d/docker-php-ext-$ext.ini" for module in modules/*.so; do if [ -f "$module" ]; then - line="extension=$(basename "$module")" + if grep -q zend_extension_entry "$module"; then + # https://wiki.php.net/internals/extensions#loading_zend_extensions + line="zend_extension=$(basename "$module")" + else + line="extension=$(basename "$module")" + fi if ! grep -q "$line" "$ini"; then echo "$line" >> "/usr/local/etc/php/conf.d/ext-$ext.ini" fi diff --git a/docker-php-ext-install b/docker-php-ext-install index abca7fff..ca65449d 100755 --- a/docker-php-ext-install +++ b/docker-php-ext-install @@ -44,7 +44,12 @@ for ext in "${exts[@]}"; do ini="/usr/local/etc/php/conf.d/docker-php-ext-$ext.ini" for module in modules/*.so; do if [ -f "$module" ]; then - line="extension=$(basename "$module")" + if grep -q zend_extension_entry "$module"; then + # https://wiki.php.net/internals/extensions#loading_zend_extensions + line="zend_extension=$(basename "$module")" + else + line="extension=$(basename "$module")" + fi if ! grep -q "$line" "$ini"; then echo "$line" >> "/usr/local/etc/php/conf.d/ext-$ext.ini" fi