diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-27 10:02:03 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-27 10:02:03 -0300 |
| commit | aee36a292a950dc7715c20590c6f3eb3749cb058 (patch) | |
| tree | e8e3b0654fc12587058402be1604b257ce6f225a | |
| parent | 3e9127fad7ffac58e176050ae64241649f7ad6f8 (diff) | |
| download | pfsense-aee36a292a950dc7715c20590c6f3eb3749cb058.zip pfsense-aee36a292a950dc7715c20590c6f3eb3749cb058.tar.gz | |
Remove ioncube references from php.ini, and set zend_extensions properly
| -rwxr-xr-x | src/etc/rc.php_ini_setup | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup index 6b26386..3d53233 100755 --- a/src/etc/rc.php_ini_setup +++ b/src/etc/rc.php_ini_setup @@ -137,8 +137,7 @@ PHPMODULES="$PHPMODULES bcmath" # filter PHPMODULES="$PHPMODULES filter" -PHP_ZEND_MODULES="ioncube_loader" -PHP_ZEND_MODULES_TS="ioncube_loader_ts" +PHP_ZEND_MODULES="" if [ "$LOWMEM" != "TRUE" ]; then PHP_ZEND_MODULES="$PHP_ZEND_MODULES opcache" @@ -207,35 +206,6 @@ EOF # Copy php.ini file to etc/ too (cli) /bin/cp /usr/local/lib/php.ini /usr/local/etc/php.ini -# Ensure directory exists -if [ ! -d /etc/php_dynamodules ]; then - /bin/mkdir /etc/php_dynamodules -fi -if [ ! -d /etc/php_dynamodules_zend ]; then - /bin/mkdir /etc/php_dynamodules_zend -fi -if [ ! -d /etc/php_dynamodules_zend_ts ]; then - /bin/mkdir /etc/php_dynamodules_zend_ts -fi - -# Read in dynamodules -if [ -d /etc/php_dynamodules ]; then - DYNA_MODULES=`/bin/ls -Utr /etc/php_dynamodules/` - PHPMODULES="$PHPMODULES $DYNA_MODULES" -fi - -# Read in zend modules -if [ -d /etc/php_dynamodules_zend ]; then - DYNA_MODULES=`/bin/ls /etc/php_dynamodules_zend/` - PHP_ZEND_MODULES="$PHP_ZEND_MODULES $DYNA_MODULES" -fi - -# Read in zend threaded modules -if [ -d /etc/php_dynamodules_zend_ts ]; then - DYNA_MODULES=`/bin/ls /etc/php_dynamodules_zend_ts/` - PHP_ZEND_MODULES_TS="$PHP_ZEND_MODULES_TS $DYNA_MODULES" -fi - # Loop through and generate modules to load. # Take into account modules built into php. for EXT in $PHPMODULES; do @@ -257,20 +227,11 @@ done # Zend modules for EXT in $PHP_ZEND_MODULES; do # Ensure extension exists before adding. - if [ -f "${EXTENSIONSDIR}/ioncube/${EXT}.so" ]; then - echo "zend_extension=${EXTENSIONSDIR}/ioncube/${EXT}.so" >> /usr/local/lib/php.ini + if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then + echo "zend_extension=${EXT}.so" >> /usr/local/lib/php.ini fi done -# Zend threaded modules -for EXT in $PHP_ZEND_MODULES_TS; do - # Ensure extension exists before adding. - if [ -f "${EXTENSIONSDIR}/ioncube/${EXT}.so" ]; then - echo "zend_extension_ts=${EXTENSIONSDIR}/ioncube/${EXT}.so" >> /usr/local/lib/php.ini - fi -done - - if [ "$LOWMEM" != "TRUE" ]; then /bin/cat >>/usr/local/lib/php.ini <<EOF |
