From cb7d18d561622f6071efec92a4c5d8f0fde2fcdc Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Thu, 20 Aug 2015 10:34:37 -0300
Subject: Replace php calls to php-cgi, binary is not being renamed anymore

---
 etc/inc/ipsec.auth-user.php                      | 2 +-
 etc/inc/openvpn.auth-user.php                    | 2 +-
 etc/inc/openvpn.tls-verify.php                   | 2 +-
 etc/inc/pfsense-utils.inc                        | 6 +++---
 etc/inc/rrd.inc                                  | 2 +-
 etc/inc/services.inc                             | 2 +-
 etc/inc/system.inc                               | 2 +-
 etc/rc.banner                                    | 2 +-
 etc/rc.bootup                                    | 2 +-
 etc/rc.captiveportal_configure                   | 2 +-
 etc/rc.captiveportal_configure_mac               | 2 +-
 etc/rc.carpbackup                                | 2 +-
 etc/rc.carpmaster                                | 2 +-
 etc/rc.conf_mount_ro                             | 2 +-
 etc/rc.conf_mount_rw                             | 2 +-
 etc/rc.dhclient_cron                             | 2 +-
 etc/rc.dyndns.update                             | 2 +-
 etc/rc.expireaccounts                            | 2 +-
 etc/rc.filter_configure                          | 4 ++--
 etc/rc.filter_configure_sync                     | 2 +-
 etc/rc.filter_configure_xmlrpc                   | 2 +-
 etc/rc.filter_synchronize                        | 2 +-
 etc/rc.firmware                                  | 2 +-
 etc/rc.firmware_auto                             | 2 +-
 etc/rc.initial.defaults                          | 2 +-
 etc/rc.initial.firmware_update                   | 2 +-
 etc/rc.initial.halt                              | 2 +-
 etc/rc.initial.password                          | 2 +-
 etc/rc.initial.ping                              | 2 +-
 etc/rc.initial.reboot                            | 2 +-
 etc/rc.initial.setlanip                          | 2 +-
 etc/rc.initial.setports                          | 4 ++--
 etc/rc.initial.store_config_to_removable_device  | 2 +-
 etc/rc.initial.toggle_sshd                       | 2 +-
 etc/rc.interfaces_carp_configure                 | 4 ++--
 etc/rc.interfaces_lan_configure                  | 2 +-
 etc/rc.interfaces_opt_configure                  | 2 +-
 etc/rc.interfaces_wan_configure                  | 2 +-
 etc/rc.kill_states                               | 2 +-
 etc/rc.linkup                                    | 2 +-
 etc/rc.nanobsd_switch_boot_slice                 | 2 +-
 etc/rc.newipsecdns                               | 2 +-
 etc/rc.newroutedns                               | 2 +-
 etc/rc.newwanip                                  | 2 +-
 etc/rc.newwanipv6                                | 2 +-
 etc/rc.notify_message                            | 2 +-
 etc/rc.ntpdate                                   | 2 +-
 etc/rc.openvpn                                   | 2 +-
 etc/rc.packages                                  | 2 +-
 etc/rc.php_ini_setup                             | 4 ++--
 etc/rc.prunecaptiveportal                        | 2 +-
 etc/rc.reload_all                                | 2 +-
 etc/rc.reload_interfaces                         | 2 +-
 etc/rc.resolv_conf_generate                      | 2 +-
 etc/rc.restart_webgui                            | 2 +-
 etc/rc.restore_config_backup                     | 4 ++--
 etc/rc.savevoucher                               | 2 +-
 etc/rc.start_packages                            | 2 +-
 etc/rc.stop_packages                             | 4 ++--
 etc/rc.update_alias_url_data                     | 2 +-
 etc/rc.update_urltables                          | 2 +-
 etc/sshd                                         | 2 +-
 usr/local/bin/3gstats.php                        | 2 +-
 usr/local/bin/captiveportal_gather_stats.php     | 2 +-
 usr/local/bin/easyrule                           | 2 +-
 usr/local/bin/filterparser.php                   | 2 +-
 usr/local/bin/mail.php                           | 4 ++--
 usr/local/sbin/gmirror_status_check.php          | 2 +-
 usr/local/sbin/pfSsh.php                         | 2 +-
 usr/local/sbin/show_filter_reload_status.php     | 2 +-
 usr/local/share/pfSense/post_upgrade_command.php | 2 +-
 71 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/etc/inc/ipsec.auth-user.php b/etc/inc/ipsec.auth-user.php
index 8e8386d..2589598 100755
--- a/etc/inc/ipsec.auth-user.php
+++ b/etc/inc/ipsec.auth-user.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	ipsec.auth-user.php
diff --git a/etc/inc/openvpn.auth-user.php b/etc/inc/openvpn.auth-user.php
index d017c61..e108a4f 100644
--- a/etc/inc/openvpn.auth-user.php
+++ b/etc/inc/openvpn.auth-user.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/inc/openvpn.tls-verify.php b/etc/inc/openvpn.tls-verify.php
index 023ec19..9e21342 100644
--- a/etc/inc/openvpn.tls-verify.php
+++ b/etc/inc/openvpn.tls-verify.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 2d42ecb..91988c7 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -32,7 +32,7 @@
 */
 
 /*
-	pfSense_BUILDER_BINARIES:	/sbin/ifconfig	/sbin/pfctl	/usr/local/bin/php /usr/bin/netstat
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig	/sbin/pfctl	/usr/local/bin/php-cgi /usr/bin/netstat
 	pfSense_BUILDER_BINARIES:	/bin/df	/usr/bin/grep	/usr/bin/awk	/bin/rm	/usr/sbin/pwd_mkdb	/usr/bin/host
 	pfSense_BUILDER_BINARIES:	/sbin/kldload
 	pfSense_MODULE:	utils
@@ -676,7 +676,7 @@ if (!function_exists('php_check_syntax')) {
 		fwrite($fout, $code_to_check);
 		fwrite($fout, "\n\n?>\n");
 		fclose($fout);
-		$command = "/usr/local/bin/php -l {$g['tmp_path']}/codetocheck.php";
+		$command = "/usr/local/bin/php-cgi -l {$g['tmp_path']}/codetocheck.php";
 		$output = exec_command($command);
 		if (stristr($output, "Errors parsing") == false) {
 			echo "false\n";
@@ -695,7 +695,7 @@ if (!function_exists('php_check_syntax')) {
 if (!function_exists('php_check_syntax')) {
 	function php_check_syntax($code_to_check, &$errormessage) {
 		return false;
-		$command = "/usr/local/bin/php -l " . escapeshellarg($code_to_check);
+		$command = "/usr/local/bin/php-cgi -l " . escapeshellarg($code_to_check);
 		$output = exec_command($command);
 		if (stristr($output, "Errors parsing") == false) {
 			echo "false\n";
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc
index b15f8eb..86148d6 100644
--- a/etc/inc/rrd.inc
+++ b/etc/inc/rrd.inc
@@ -236,7 +236,7 @@ function enable_rrd_graphing() {
 	$tar = "/usr/bin/tar";
 	$pfctl = "/sbin/pfctl";
 	$sysctl = "/sbin/sysctl";
-	$php = "/usr/local/bin/php";
+	$php = "/usr/local/bin/php-cgi";
 	$cpustats = "/usr/local/sbin/cpustats";
 	$spamd_gather = "/usr/local/bin/spamd_gather_stats.php";
 	$ifconfig = "/sbin/ifconfig";
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 8eb6c6a..c254c35 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -1491,7 +1491,7 @@ EOD;
 	if (count($dhcpdv6ifs) > 0) {
 		mwexec("/usr/local/sbin/dhcpd -6 -user dhcpd -group _dhcp -chroot {$g['dhcpd_chroot_path']} -cf /etc/dhcpdv6.conf -pf {$g['varrun_path']}/dhcpdv6.pid " .
 			join(" ", $dhcpdv6ifs));
-		mwexec("/usr/local/sbin/dhcpleases6 -c \"/usr/local/bin/php -f /usr/local/sbin/prefixes.php|/bin/sh\" -l {$g['dhcpd_chroot_path']}/var/db/dhcpd6.leases");
+		mwexec("/usr/local/sbin/dhcpleases6 -c \"/usr/local/bin/php-cgi -f /usr/local/sbin/prefixes.php|/bin/sh\" -l {$g['dhcpd_chroot_path']}/var/db/dhcpd6.leases");
 	}
 	if (platform_booting()) {
 		print gettext("done.") . "\n";
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index d7c6226..41e798e 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -1232,7 +1232,7 @@ fastcgi.server = ( ".php" =>
 				"PHP_FCGI_CHILDREN" => "{$max_php_children}",
 				"PHP_FCGI_MAX_REQUESTS" => "500"
 			),
-			"bin-path" => "/usr/local/bin/php"
+			"bin-path" => "/usr/local/bin/php-cgi"
 		)
 	)
 )
diff --git a/etc/rc.banner b/etc/rc.banner
index 183e542..5e64dae 100755
--- a/etc/rc.banner
+++ b/etc/rc.banner
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	$Id$
diff --git a/etc/rc.bootup b/etc/rc.bootup
index d49adee..d27f795 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.bootup
diff --git a/etc/rc.captiveportal_configure b/etc/rc.captiveportal_configure
index c20dbdd..45c26bf 100755
--- a/etc/rc.captiveportal_configure
+++ b/etc/rc.captiveportal_configure
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.captiveportal_configure_mac b/etc/rc.captiveportal_configure_mac
index 2006f27..b0daf68 100755
--- a/etc/rc.captiveportal_configure_mac
+++ b/etc/rc.captiveportal_configure_mac
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.captiveportal_configure_mac
diff --git a/etc/rc.carpbackup b/etc/rc.carpbackup
index 4110faa..6961bc8 100755
--- a/etc/rc.carpbackup
+++ b/etc/rc.carpbackup
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.carpmaster b/etc/rc.carpmaster
index cde290d..022fe8f 100755
--- a/etc/rc.carpmaster
+++ b/etc/rc.carpmaster
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.conf_mount_ro b/etc/rc.conf_mount_ro
index f1d95c4..6beb5e8 100755
--- a/etc/rc.conf_mount_ro
+++ b/etc/rc.conf_mount_ro
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.conf_mount_rw b/etc/rc.conf_mount_rw
index b333f37..b153e36 100755
--- a/etc/rc.conf_mount_rw
+++ b/etc/rc.conf_mount_rw
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.dhclient_cron b/etc/rc.dhclient_cron
index f091a50..a38932d 100755
--- a/etc/rc.dhclient_cron
+++ b/etc/rc.dhclient_cron
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.dyndns.update b/etc/rc.dyndns.update
index 717d71a..543b5a0 100755
--- a/etc/rc.dyndns.update
+++ b/etc/rc.dyndns.update
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.expireaccounts b/etc/rc.expireaccounts
index 7aa897d..3befa17 100755
--- a/etc/rc.expireaccounts
+++ b/etc/rc.expireaccounts
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.filter_configure b/etc/rc.filter_configure
index 4fb1a45..2c996e9 100755
--- a/etc/rc.filter_configure
+++ b/etc/rc.filter_configure
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
@@ -40,4 +40,4 @@ get_interface_arr(true);
 unlink_if_exists("/tmp/config.cache");
 filter_configure();
 
-?>
\ No newline at end of file
+?>
diff --git a/etc/rc.filter_configure_sync b/etc/rc.filter_configure_sync
index b0d60d9..86ab309 100755
--- a/etc/rc.filter_configure_sync
+++ b/etc/rc.filter_configure_sync
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.filter_configure_xmlrpc b/etc/rc.filter_configure_xmlrpc
index 5dfe11e..584cc9c 100755
--- a/etc/rc.filter_configure_xmlrpc
+++ b/etc/rc.filter_configure_xmlrpc
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.filter_configure_xmlrpc
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index 85befde..f31fa34 100755
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.filter_synchronize
diff --git a/etc/rc.firmware b/etc/rc.firmware
index a366cc5..e8d549f 100755
--- a/etc/rc.firmware
+++ b/etc/rc.firmware
@@ -23,7 +23,7 @@ if [ $# -eq 3 ]; then
 fi
 
 file_notice() {
-	/usr/local/bin/php -q -d auto_prepend_file=config.inc <<ENDOFF
+	/usr/local/bin/php-cgi -q -d auto_prepend_file=config.inc <<ENDOFF
 	<?php
 		require_once("globals.inc");
 		require_once("functions.inc");
diff --git a/etc/rc.firmware_auto b/etc/rc.firmware_auto
index 45153a3..5b355df 100755
--- a/etc/rc.firmware_auto
+++ b/etc/rc.firmware_auto
@@ -53,7 +53,7 @@ if [ "$DLHASH" = "$FILEHASH" ]; then
 	echo "sha256 hashes match." | logger -p daemon.info -i -t AutoUpgrade
 	echo "Beginning ${product} upgrade." | wall
 	if [ "$PLATFORM" = "nanobsd" ]; then
-		/usr/local/bin/php /etc/rc.conf_mount_rw
+		/usr/local/bin/php-cgi /etc/rc.conf_mount_rw
 	fi
 	if [ -r "/tmp/custom.tgz" ]; then
 		sh /etc/rc.firmware pfSenseupgrade /tmp/latest.tgz /tmp/custom.tgz
diff --git a/etc/rc.initial.defaults b/etc/rc.initial.defaults
index 6c7d13d..6901dae 100755
--- a/etc/rc.initial.defaults
+++ b/etc/rc.initial.defaults
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.initial.firmware_update b/etc/rc.initial.firmware_update
index 5e17924..2dff066 100755
--- a/etc/rc.initial.firmware_update
+++ b/etc/rc.initial.firmware_update
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 
 <?php
 
diff --git a/etc/rc.initial.halt b/etc/rc.initial.halt
index 39c4086..9ff189b 100755
--- a/etc/rc.initial.halt
+++ b/etc/rc.initial.halt
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.initial.password b/etc/rc.initial.password
index f694739..b5e01ed 100755
--- a/etc/rc.initial.password
+++ b/etc/rc.initial.password
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.initial.ping b/etc/rc.initial.ping
index 32bd756..055d556 100755
--- a/etc/rc.initial.ping
+++ b/etc/rc.initial.ping
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.initial.reboot b/etc/rc.initial.reboot
index fdc426e..38f9e3b 100755
--- a/etc/rc.initial.reboot
+++ b/etc/rc.initial.reboot
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index 893146a..e33a05a 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -q
+#!/usr/local/bin/php-cgi -q
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.initial.setports b/etc/rc.initial.setports
index e85e323..147912f 100755
--- a/etc/rc.initial.setports
+++ b/etc/rc.initial.setports
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
@@ -48,4 +48,4 @@
 	/* reload graphing functions */
 	enable_rrd_graphing();
 
-?>
\ No newline at end of file
+?>
diff --git a/etc/rc.initial.store_config_to_removable_device b/etc/rc.initial.store_config_to_removable_device
index ee1dda4..a40df6f 100755
--- a/etc/rc.initial.store_config_to_removable_device
+++ b/etc/rc.initial.store_config_to_removable_device
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.initial.toggle_sshd b/etc/rc.initial.toggle_sshd
index 997f3c1..695a6c1 100755
--- a/etc/rc.initial.toggle_sshd
+++ b/etc/rc.initial.toggle_sshd
@@ -1,4 +1,4 @@
-#! /usr/local/bin/php -f
+#! /usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.initial.toggle_sshd
diff --git a/etc/rc.interfaces_carp_configure b/etc/rc.interfaces_carp_configure
index 050fbc8..33a0b38 100755
--- a/etc/rc.interfaces_carp_configure
+++ b/etc/rc.interfaces_carp_configure
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
@@ -36,4 +36,4 @@ require_once("shaper.inc");
 
 interfaces_carp_configure();
 
-?>
\ No newline at end of file
+?>
diff --git a/etc/rc.interfaces_lan_configure b/etc/rc.interfaces_lan_configure
index ed41fba..2924cf9 100755
--- a/etc/rc.interfaces_lan_configure
+++ b/etc/rc.interfaces_lan_configure
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.interfaces_opt_configure b/etc/rc.interfaces_opt_configure
index aaa27c6..c00877a 100755
--- a/etc/rc.interfaces_opt_configure
+++ b/etc/rc.interfaces_opt_configure
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.interfaces_wan_configure b/etc/rc.interfaces_wan_configure
index 7e7eb7b..9b064d0 100755
--- a/etc/rc.interfaces_wan_configure
+++ b/etc/rc.interfaces_wan_configure
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.kill_states b/etc/rc.kill_states
index ca70729..715c860 100755
--- a/etc/rc.kill_states
+++ b/etc/rc.kill_states
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.kill_states
diff --git a/etc/rc.linkup b/etc/rc.linkup
index ed7ea23..153cd49 100755
--- a/etc/rc.linkup
+++ b/etc/rc.linkup
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.linkup - devd hotplug actions
diff --git a/etc/rc.nanobsd_switch_boot_slice b/etc/rc.nanobsd_switch_boot_slice
index fa68a42..58dbcc6 100755
--- a/etc/rc.nanobsd_switch_boot_slice
+++ b/etc/rc.nanobsd_switch_boot_slice
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -q
+#!/usr/local/bin/php-cgi -q
 <?php
 require_once("globals.inc");
 require_once("config.inc");
diff --git a/etc/rc.newipsecdns b/etc/rc.newipsecdns
index 27e02d5..7c5428a 100755
--- a/etc/rc.newipsecdns
+++ b/etc/rc.newipsecdns
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.newipsecdns
diff --git a/etc/rc.newroutedns b/etc/rc.newroutedns
index ba8ca32..de3a081 100755
--- a/etc/rc.newroutedns
+++ b/etc/rc.newroutedns
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.newroutedns
diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index 6c6d617..01d211c 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.newwanip
diff --git a/etc/rc.newwanipv6 b/etc/rc.newwanipv6
index 827fcaa..1030d96 100755
--- a/etc/rc.newwanipv6
+++ b/etc/rc.newwanipv6
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.newwanipv6
diff --git a/etc/rc.notify_message b/etc/rc.notify_message
index 87988d3..fec1949 100755
--- a/etc/rc.notify_message
+++ b/etc/rc.notify_message
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php
+#!/usr/local/bin/php-cgi
 <?php
 /*
 	rc.notify_message
diff --git a/etc/rc.ntpdate b/etc/rc.ntpdate
index 4272acb..4bdc647 100755
--- a/etc/rc.ntpdate
+++ b/etc/rc.ntpdate
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id:  */
 /*
diff --git a/etc/rc.openvpn b/etc/rc.openvpn
index e54d6d5..cda8067 100755
--- a/etc/rc.openvpn
+++ b/etc/rc.openvpn
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.openvpn
diff --git a/etc/rc.packages b/etc/rc.packages
index 59fb5ca..cdca880 100755
--- a/etc/rc.packages
+++ b/etc/rc.packages
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup
index 0ee5296..0013b58 100755
--- a/etc/rc.php_ini_setup
+++ b/etc/rc.php_ini_setup
@@ -164,7 +164,7 @@ fi
 if [ -f /usr/local/lib/php.ini ]; then
 	/bin/rm /usr/local/lib/php.ini
 fi
-LOADED_MODULES=`/usr/local/bin/php -m | /usr/bin/grep -v "\["`
+LOADED_MODULES=`/usr/local/bin/php-cgi -m | /usr/bin/grep -v "\["`
 
 # Fetch the timezone from the XML and set it here. We set it later too in the running scripts
 TIMEZONE=`cat /conf/config.xml | egrep -E '<timezone>(.*?)</timezone>' | awk -F'>' '{print $2}'|awk -F'<' '{print $1}'`
@@ -386,7 +386,7 @@ for EXT in $PHPMODULES; do
 done
 
 # Check loaded modules and remove anything that did not load correctly
-LOADED_MODULES=`/usr/local/bin/php -m | /usr/bin/tr '[:upper:]' '[:lower:]' 2>/dev/null | /usr/bin/grep -v "\["`
+LOADED_MODULES=`/usr/local/bin/php-cgi -m | /usr/bin/tr '[:upper:]' '[:lower:]' 2>/dev/null | /usr/bin/grep -v "\["`
 for EXT in $PHPMODULESLC; do
 	SHOULDREMOVE="true"
 	for LM in $LOADED_MODULES; do
diff --git a/etc/rc.prunecaptiveportal b/etc/rc.prunecaptiveportal
index 7dff6a2..c4b760a 100755
--- a/etc/rc.prunecaptiveportal
+++ b/etc/rc.prunecaptiveportal
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.reload_all b/etc/rc.reload_all
index 6dcc55b..162553c 100755
--- a/etc/rc.reload_all
+++ b/etc/rc.reload_all
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.reload_interfaces b/etc/rc.reload_interfaces
index edf34a8..e34588f 100755
--- a/etc/rc.reload_interfaces
+++ b/etc/rc.reload_interfaces
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.resolv_conf_generate b/etc/rc.resolv_conf_generate
index 1ed9845..e37203b 100755
--- a/etc/rc.resolv_conf_generate
+++ b/etc/rc.resolv_conf_generate
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	rc.resolv_conf_generate
diff --git a/etc/rc.restart_webgui b/etc/rc.restart_webgui
index 8efcf9d..7a0bcd3 100755
--- a/etc/rc.restart_webgui
+++ b/etc/rc.restart_webgui
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 
 <?php
 
diff --git a/etc/rc.restore_config_backup b/etc/rc.restore_config_backup
index 295f427..b64e023 100755
--- a/etc/rc.restore_config_backup
+++ b/etc/rc.restore_config_backup
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -q
+#!/usr/local/bin/php-cgi -q
 <?php
 require_once('config.inc');
 
@@ -126,4 +126,4 @@ while (true) {
 
 fclose($fp);
 die;
-?>
\ No newline at end of file
+?>
diff --git a/etc/rc.savevoucher b/etc/rc.savevoucher
index 8f2d88d..22e592d 100755
--- a/etc/rc.savevoucher
+++ b/etc/rc.savevoucher
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	part of m0n0wall (http://m0n0.ch/wall)
diff --git a/etc/rc.start_packages b/etc/rc.start_packages
index 66f4f63..3d8bbbc 100755
--- a/etc/rc.start_packages
+++ b/etc/rc.start_packages
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.stop_packages b/etc/rc.stop_packages
index b7a87f1..995248a 100755
--- a/etc/rc.stop_packages
+++ b/etc/rc.stop_packages
@@ -1,5 +1,5 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 require_once("pkg-utils.inc");
 stop_packages();
-?>
\ No newline at end of file
+?>
diff --git a/etc/rc.update_alias_url_data b/etc/rc.update_alias_url_data
index bf4f48f..fd56b43 100755
--- a/etc/rc.update_alias_url_data
+++ b/etc/rc.update_alias_url_data
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /* $Id$ */
 /*
diff --git a/etc/rc.update_urltables b/etc/rc.update_urltables
index 1c2913a..c4dfeb1 100755
--- a/etc/rc.update_urltables
+++ b/etc/rc.update_urltables
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -q
+#!/usr/local/bin/php-cgi -q
 <?php
 require_once("config.inc");
 require_once("util.inc");
diff --git a/etc/sshd b/etc/sshd
index 9f68e2a..05ddb63 100755
--- a/etc/sshd
+++ b/etc/sshd
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	sshd - Modified to work on disk based system
diff --git a/usr/local/bin/3gstats.php b/usr/local/bin/3gstats.php
index daf0500..cc385fc 100755
--- a/usr/local/bin/3gstats.php
+++ b/usr/local/bin/3gstats.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 
 ini_set("max_execution_time", "0");
diff --git a/usr/local/bin/captiveportal_gather_stats.php b/usr/local/bin/captiveportal_gather_stats.php
index 11cb2b9..23d6b5d 100644
--- a/usr/local/bin/captiveportal_gather_stats.php
+++ b/usr/local/bin/captiveportal_gather_stats.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -q
+#!/usr/local/bin/php-cgi -q
 <?php
 /* $Id$ */
 /*
diff --git a/usr/local/bin/easyrule b/usr/local/bin/easyrule
index cf9e40a..8461a7a 100755
--- a/usr/local/bin/easyrule
+++ b/usr/local/bin/easyrule
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -q
+#!/usr/local/bin/php-cgi -q
 <?php
 /*
 	easyrule CLI Program
diff --git a/usr/local/bin/filterparser.php b/usr/local/bin/filterparser.php
index bec8016..fa60262 100755
--- a/usr/local/bin/filterparser.php
+++ b/usr/local/bin/filterparser.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -q
+#!/usr/local/bin/php-cgi -q
 <?php
 /* $Id$ */
 /*
diff --git a/usr/local/bin/mail.php b/usr/local/bin/mail.php
index 1e62b81..130d9e0 100755
--- a/usr/local/bin/mail.php
+++ b/usr/local/bin/mail.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -q
+#!/usr/local/bin/php-cgi -q
 <?php
 require_once("config.inc");
 require_once("globals.inc");
@@ -22,4 +22,4 @@ if (!empty($subject)) {
 } else {
 	send_smtp_message($message);
 }
-?>
\ No newline at end of file
+?>
diff --git a/usr/local/sbin/gmirror_status_check.php b/usr/local/sbin/gmirror_status_check.php
index 4f73baf..f19a5d1 100644
--- a/usr/local/sbin/gmirror_status_check.php
+++ b/usr/local/sbin/gmirror_status_check.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 /*
 	gmirror_status_check.php
diff --git a/usr/local/sbin/pfSsh.php b/usr/local/sbin/pfSsh.php
index 068198f..8bfc909 100755
--- a/usr/local/sbin/pfSsh.php
+++ b/usr/local/sbin/pfSsh.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 
 <?php
 
diff --git a/usr/local/sbin/show_filter_reload_status.php b/usr/local/sbin/show_filter_reload_status.php
index daa35ad..e66c890 100755
--- a/usr/local/sbin/show_filter_reload_status.php
+++ b/usr/local/sbin/show_filter_reload_status.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -q
+#!/usr/local/bin/php-cgi -q
 <?php
 
 $last_text = "";
diff --git a/usr/local/share/pfSense/post_upgrade_command.php b/usr/local/share/pfSense/post_upgrade_command.php
index c2b6901..4a0215a 100755
--- a/usr/local/share/pfSense/post_upgrade_command.php
+++ b/usr/local/share/pfSense/post_upgrade_command.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php -f
+#!/usr/local/bin/php-cgi -f
 <?php
 
 	/* upgrade embedded users serial console */
-- 
cgit v1.1