summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/etc/pfSense.obsoletedfiles66
-rwxr-xr-xsrc/usr/local/www/firewall_aliases_edit.php2
-rw-r--r--src/usr/local/www/firewall_schedule_edit.php4
-rw-r--r--src/usr/local/www/guiconfig.inc16
-rw-r--r--tools/conf/pfPorts/make.conf2
5 files changed, 74 insertions, 16 deletions
diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles
index 4f6f453..f389efc 100644
--- a/src/etc/pfSense.obsoletedfiles
+++ b/src/etc/pfSense.obsoletedfiles
@@ -445,7 +445,6 @@
/usr/local/bin/spawn-fcgi
/usr/local/bin/tickadj
/usr/local/bin/verifysig
-/usr/local/etc/lighttpd
/usr/local/etc/pkg.conf
/usr/local/info
/usr/local/lib/engines
@@ -518,7 +517,66 @@
/usr/local/lib/libsyslog-ng-3.4.7.so
/usr/local/lib/libsyslog-ng-3.5.4.1.so
/usr/local/lib/libxml2.so.5
-/usr/local/lib/lighttpd
+/usr/local/lib/lighttpd/mod_access.a
+/usr/local/lib/lighttpd/mod_access.la
+/usr/local/lib/lighttpd/mod_accesslog.a
+/usr/local/lib/lighttpd/mod_accesslog.la
+/usr/local/lib/lighttpd/mod_alias.a
+/usr/local/lib/lighttpd/mod_alias.la
+/usr/local/lib/lighttpd/mod_auth.a
+/usr/local/lib/lighttpd/mod_auth.la
+/usr/local/lib/lighttpd/mod_cgi.a
+/usr/local/lib/lighttpd/mod_cgi.la
+/usr/local/lib/lighttpd/mod_cml.a
+/usr/local/lib/lighttpd/mod_cml.la
+/usr/local/lib/lighttpd/mod_compress.a
+/usr/local/lib/lighttpd/mod_compress.la
+/usr/local/lib/lighttpd/mod_dirlisting.a
+/usr/local/lib/lighttpd/mod_dirlisting.la
+/usr/local/lib/lighttpd/mod_evasive.a
+/usr/local/lib/lighttpd/mod_evasive.la
+/usr/local/lib/lighttpd/mod_evhost.a
+/usr/local/lib/lighttpd/mod_evhost.la
+/usr/local/lib/lighttpd/mod_expire.a
+/usr/local/lib/lighttpd/mod_expire.la
+/usr/local/lib/lighttpd/mod_fastcgi.a
+/usr/local/lib/lighttpd/mod_fastcgi.la
+/usr/local/lib/lighttpd/mod_flv_streaming.a
+/usr/local/lib/lighttpd/mod_flv_streaming.la
+/usr/local/lib/lighttpd/mod_indexfile.a
+/usr/local/lib/lighttpd/mod_indexfile.la
+/usr/local/lib/lighttpd/mod_mysql_vhost.a
+/usr/local/lib/lighttpd/mod_mysql_vhost.la
+/usr/local/lib/lighttpd/mod_proxy.a
+/usr/local/lib/lighttpd/mod_proxy.la
+/usr/local/lib/lighttpd/mod_redirect.a
+/usr/local/lib/lighttpd/mod_redirect.la
+/usr/local/lib/lighttpd/mod_rewrite.a
+/usr/local/lib/lighttpd/mod_rewrite.la
+/usr/local/lib/lighttpd/mod_rrdtool.a
+/usr/local/lib/lighttpd/mod_rrdtool.la
+/usr/local/lib/lighttpd/mod_scgi.a
+/usr/local/lib/lighttpd/mod_scgi.la
+/usr/local/lib/lighttpd/mod_secdownload.a
+/usr/local/lib/lighttpd/mod_secdownload.la
+/usr/local/lib/lighttpd/mod_setenv.a
+/usr/local/lib/lighttpd/mod_setenv.la
+/usr/local/lib/lighttpd/mod_simple_vhost.a
+/usr/local/lib/lighttpd/mod_simple_vhost.la
+/usr/local/lib/lighttpd/mod_ssi.a
+/usr/local/lib/lighttpd/mod_ssi.la
+/usr/local/lib/lighttpd/mod_staticfile.a
+/usr/local/lib/lighttpd/mod_staticfile.la
+/usr/local/lib/lighttpd/mod_status.a
+/usr/local/lib/lighttpd/mod_status.la
+/usr/local/lib/lighttpd/mod_trigger_b4_dl.a
+/usr/local/lib/lighttpd/mod_trigger_b4_dl.la
+/usr/local/lib/lighttpd/mod_userdir.a
+/usr/local/lib/lighttpd/mod_userdir.la
+/usr/local/lib/lighttpd/mod_usertrack.a
+/usr/local/lib/lighttpd/mod_usertrack.la
+/usr/local/lib/lighttpd/mod_webdav.a
+/usr/local/lib/lighttpd/mod_webdav.la
/usr/local/lib/mysql/libmysqlclient.so.15
/usr/local/lib/olsrd_dot_draw.so.0.3
/usr/local/lib/olsrd_dyn_gw.so.0.4
@@ -578,8 +636,6 @@
/usr/local/sbin/ipfw_context
/usr/local/sbin/ipfw-classifyd
/usr/local/sbin/kbdcheck
-/usr/local/sbin/lighttpd
-/usr/local/sbin/lighttpd-angel
/usr/local/sbin/mdnsd
/usr/local/sbin/mini_httpd
/usr/local/sbin/mpd
@@ -968,7 +1024,5 @@
/var/db/rrd/index.html
/var/dhcpd/lib/libc.so.6
/var/etc/pppoe-vpn
-/var/log/lighttpd
-/var/log/lighttpd.log
/var/mail/_relayd
/var/mail/unbound
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php
index 89ee9dc..8f2ca24 100755
--- a/src/usr/local/www/firewall_aliases_edit.php
+++ b/src/usr/local/www/firewall_aliases_edit.php
@@ -172,7 +172,7 @@ if ($_POST) {
$input_errors[] = gettext("Reserved word used for alias name.");
} else {
if (is_validaliasname($_POST['name']) == false) {
- $input_errors[] = gettext("The alias name must be less than 32 characters long, may not consist of only numbers, and may only contain the following characters") . " a-z, A-Z, 0-9, _.";
+ $input_errors[] = gettext("The alias name must be less than 32 characters long, may not consist of only numbers, may not consist of only underscores, and may only contain the following characters:") . ' a-z, A-Z, 0-9, _';
}
}
/* check for name conflicts */
diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php
index 5134b57..5a867b2 100644
--- a/src/usr/local/www/firewall_schedule_edit.php
+++ b/src/usr/local/www/firewall_schedule_edit.php
@@ -130,7 +130,7 @@ if ($_POST) {
$input_errors[] = gettext("Reserved word used for schedule name.");
} else {
if (is_validaliasname($_POST['name']) == false) {
- $input_errors[] = gettext("The schedule name may only consist of the characters a-z, A-Z, 0-9");
+ $input_errors[] = gettext("The schedule name must be less than 32 characters long, may not consist of only numbers, may not consist of only underscores, and may only contain the following characters:") . ' a-z, A-Z, 0-9, _';
}
}
@@ -395,7 +395,7 @@ $input = new Form_Input(
$pconfig['name']
);
-$input->setHelp((is_schedule_inuse($pconfig['name']) != true) ? 'The name of the alias may only consist of the characters a-z, A-Z and 0-9':
+$input->setHelp((is_schedule_inuse($pconfig['name']) != true) ? 'The name of the schedule may only consist of the characters "a-z, A-Z, 0-9 and _".':
'This schedule is in use so the name may not be modified!');
if (is_schedule_inuse($pconfig['name']) == true) {
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc
index d09213b..b97ae0f 100644
--- a/src/usr/local/www/guiconfig.inc
+++ b/src/usr/local/www/guiconfig.inc
@@ -560,20 +560,21 @@ function dump_clog_no_table($logfile, $tail, $withorig = true, $grepfor = "", $g
$specific_log = basename($logfile, '.log') . '_settings';
if ($config['syslog'][$specific_log]['cronorder'] == 'forward') $sor = "";
if ($config['syslog'][$specific_log]['cronorder'] == 'reverse') $sor = "-r";
- $logarr = "";
+ $logarr = array();
$grepline = " ";
if (is_array($grepfor)) {
+ $invert = '';
if ((strpos($grepfor[0], '!') === 0)) {
$grepfor[0] = substr($grepfor[0], 1);
$invert = '-v';
}
- $grepline .= " | /usr/bin/egrep $invert " . escapeshellarg(implode("|", $grepfor));
+ $grepline .= " | /usr/bin/egrep {$invert} " . escapeshellarg(implode("|", $grepfor));
}
if (is_array($grepinvert)) {
$grepline .= " | /usr/bin/egrep -v " . escapeshellarg(implode("|", $grepinvert));
}
if (is_dir($logfile)) {
- $logarr = array("File $logfile is a directory.");
+ $logarr = array("File {$logfile} is a directory.");
} elseif (file_exists($logfile) && filesize($logfile) == 0) {
$logarr = array("Log file started.");
} else {
@@ -610,20 +611,21 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
$specific_log = basename($logfile, '.log') . '_settings';
if ($config['syslog'][$specific_log]['cronorder'] == 'forward') $sor = "";
if ($config['syslog'][$specific_log]['cronorder'] == 'reverse') $sor = "-r";
- $logarr = "";
+ $logarr = array();
$grepline = " ";
if (is_array($grepfor)) {
+ $invert = '';
if ((strpos($grepfor[0], '!') === 0)) {
$grepfor[0] = substr($grepfor[0], 1);
$invert = '-v';
}
- $grepline .= " | /usr/bin/egrep $invert " . escapeshellarg(implode("|", $grepfor));
+ $grepline .= " | /usr/bin/egrep {$invert} " . escapeshellarg(implode("|", $grepfor));
}
if (is_array($grepinvert)) {
$grepline .= " | /usr/bin/egrep -v " . escapeshellarg(implode("|", $grepinvert));
}
if (is_dir($logfile)) {
- $logarr = array("File $logfile is a directory.");
+ $logarr = array("File {$logfile} is a directory.");
} elseif (file_exists($logfile) && filesize($logfile) == 0) {
$logarr = array("Log file started.");
} else {
@@ -659,7 +661,7 @@ function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinve
$specific_log = basename($logfile, '.log') . '_settings';
if (($config['syslog'][$specific_log]['cronorder'] == 'forward') && !$grepreverse) $sor = "";
if (($config['syslog'][$specific_log]['cronorder'] == 'reverse') || $grepreverse) $sor = "-r";
- $logarr = "";
+ $logarr = array();
$grepline = " ";
if (is_array($grepfor)) {
$grepline .= " | /usr/bin/egrep " . escapeshellarg(implode("|", $grepfor));
diff --git a/tools/conf/pfPorts/make.conf b/tools/conf/pfPorts/make.conf
index 4eaf6b9..bba1185 100644
--- a/tools/conf/pfPorts/make.conf
+++ b/tools/conf/pfPorts/make.conf
@@ -4,6 +4,8 @@ OPTIONS_UNSET_FORCE= X11 DOCS EXAMPLES MAN INFO MANPAGES
# Individual ports options
www_elinks_UNSET_FORCE= FASTMEM
+www_lighttpd_SET_FORCE= NODELAY
+
www_nginx_SET_FORCE= LUA
net_miniupnpd_SET_FORCE= PF_ENABLE_FILTER_RULES IPV6 UPNP_IGDV2 CHECK_PORTINUSE
OpenPOWER on IntegriCloud