Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

haproxy, small fixes (from haproxy-devel) #92

Merged
merged 1 commit into from
Apr 4, 2016
Merged

haproxy, small fixes (from haproxy-devel) #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions net/pfSense-pkg-haproxy/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-haproxy
PORTVERSION= 0.43.2
PORTREVISION= 1
PORTVERSION= 0.44
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
4 changes: 2 additions & 2 deletions net/pfSense-pkg-haproxy/files/usr/local/pkg/haproxy/haproxy.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,8 +618,8 @@ EOD;

require_once("globals.inc");
require_once("functions.inc");
require_once("haproxy.inc");
require_once("haproxy_socketinfo.inc");
require_once("haproxy/haproxy.inc");
require_once("haproxy/haproxy_socketinfo.inc");
haproxy_updateocsp();

?>
Expand Down
5 changes: 3 additions & 2 deletions net/pfSense-pkg-haproxy/files/usr/local/www/haproxy/haproxy_listeners.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,9 @@ function array_moveitemsbefore(&$items, $before, $selected) {
// TODO: this. is. nasty.
unset($delbtn, $delbtnp2, $movebtn, $movebtnp2, $togglebtn, $togglebtnp2);
foreach ($_POST as $pn => $pd) {
// if name contains a dot its replaced in $POST key value by a underscore while $pd can be an array for some values..
if (preg_match("/move_(.+)/", $pn, $matches)) {
$movebtn = $matches[1];
$movebtn = substr($pd, 5);
}
}
//
Expand Down Expand Up @@ -457,7 +458,7 @@ function sort_sharedfrontends(&$a, &$b) {
//<![CDATA[
events.push(function() {
$('[id^=Xmove_]').click(function (event) {
$('#' + event.target.id.slice(1)).click();
$('[id="'+event.target.id.slice(1)+'"]').click();
return false;
});
$('[id^=Xmove_]').css('cursor', 'pointer');
Expand Down
6 changes: 2 additions & 4 deletions net/pfSense-pkg-haproxy/files/usr/local/www/haproxy/haproxy_listeners_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,8 +668,7 @@ function type_change(type) {

$section->addInput(new Form_StaticText(
'Access Control lists',
"Use these to replace the error pages that haproxy can generate by custom pages created on the files tab.
For example haproxy will generate a 503 error page when no backend is available, you can replace that page here.<br/>".
"Use these to define criteria that will be used with actions defined below to perform them only when certain conditions are met.<br/>".
$htmllist_acls->Draw($pconfig['a_acl'])
))->setHelp(<<<EOT
Example:
Expand Down Expand Up @@ -704,8 +703,7 @@ function type_change(type) {

$section->addInput(new Form_StaticText(
'Actions',
"Use these to replace the error pages that haproxy can generate by custom pages created on the files tab.
For example haproxy will generate a 503 error page when no backend is available, you can replace that page here.<br/>".
"Use these to select the backend to use or perform other actions like calling a lua script, blocking certain requests or others available.<br/>".
$htmllist_actions->Draw($pconfig['a_actionitems'])
))->setHelp(<<<EOT
Example:
Expand Down