aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-12-28 16:42:24 -0500
committerScott Ullrich <sullrich@pfsense.org>2009-12-28 16:42:39 -0500
commit9e2aed3a673ec1df02f072c3051ae7337f96527b (patch)
tree169eaa6b78e955c451a1ccb931f543644d522215
parent06cb6505de82a67216293b9efee78bd772a0d41a (diff)
downloadpfsense-packages-9e2aed3a673ec1df02f072c3051ae7337f96527b.tar.gz
pfsense-packages-9e2aed3a673ec1df02f072c3051ae7337f96527b.tar.bz2
pfsense-packages-9e2aed3a673ec1df02f072c3051ae7337f96527b.zip
Retries is not a required field
-rwxr-xr-xconfig/haproxy/haproxy_frontends_edit.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/config/haproxy/haproxy_frontends_edit.php b/config/haproxy/haproxy_frontends_edit.php
index 4b23fb37..1986b176 100755
--- a/config/haproxy/haproxy_frontends_edit.php
+++ b/config/haproxy/haproxy_frontends_edit.php
@@ -84,11 +84,11 @@ if ($_POST) {
$pconfig = $_POST;
if ($_POST['stats_enabled']) {
- $reqdfields = explode(" ", "name connection_timeout server_timeout retries stats_username stats_password stats_uri stats_realm");
- $reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout,Retries,Stats Username,Stats Password,Stats Uri,Stats Realm");
+ $reqdfields = explode(" ", "name connection_timeout server_timeout stats_username stats_password stats_uri stats_realm");
+ $reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout,Stats Username,Stats Password,Stats Uri,Stats Realm");
} else {
- $reqdfields = explode(" ", "name connection_timeout server_timeout retries monitor_uri");
- $reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout,Retries,Monitor Uri");
+ $reqdfields = explode(" ", "name connection_timeout server_timeout monitor_uri");
+ $reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout,Monitor Uri");
}
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
@@ -107,7 +107,7 @@ if ($_POST) {
if (!is_numeric($_POST['server_timeout']))
$input_errors[] = "The field 'Server timeout' value is not a number.";
- if (!is_numeric($_POST['retries']))
+ if (!$_POST['retries'] && is_numeric($_POST['retries']))
$input_errors[] = "The field 'Retries' value is not a number.";
if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['stats_username']))
@@ -402,7 +402,7 @@ include("head.inc");
</td>
</tr>
<tr align="left">
- <td width="22%" valign="top" class="vncellreq">Retries</td>
+ <td width="22%" valign="top" class="vncell">Retries</td>
<td width="78%" class="vtable" colspan="2">
<input name="retries" type="text" <?if(isset($pconfig['retries'])) echo "value=\"{$pconfig['retries']}\"";?> size="64">
<div>After a connection failure to a server, it is possible to retry, potentially