From 69b27c16e5abf4d3bb1fa478bc615162e2e7ea3f Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 23 Dec 2008 00:47:25 +0000
Subject: [PATCH] Test modules correctly

---
 etc/rc.php_ini_setup | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup
index a01fb27613..b1232e67ac 100755
--- a/etc/rc.php_ini_setup
+++ b/etc/rc.php_ini_setup
@@ -69,7 +69,13 @@ PHPMODULES="apc \
 	zlib"
 
 # Get a loaded module list in the stock php
-LOADED_MODULES=`php -m | grep -v "\[" | grep "[a-z][A-Z]"`
+if [ -f /usr/local/etc/php.ini ]; then
+	rm /usr/local/etc/php.ini
+fi
+if [ -f /usr/local/lib/php.ini ]; then
+	rm /usr/local/lib/php.ini
+fi
+LOADED_MODULES=`php -m | grep -v "\["`
 
 # Populate a dummy php.ini to avoid
 # the file being clobbered and the firewall
@@ -109,7 +115,7 @@ for EXT in $PHPMODULES; do
 	done
 	if [ "$SHOULDADD" = "true" ]; then
 		# Ensure extension exists before adding.
-		if [ -f "${EXTENSIONSDIR}/${EXT}.so" ]; then
+		if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then
 			echo "extension=${EXT}.so" >> /usr/local/lib/php.ini
 		fi
 	fi