aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2011-09-14 00:38:27 -0300
committermarcelloc <marcellocoutinho@gmail.com>2011-09-14 00:38:27 -0300
commit8898b772f927d1a8555df4b450107a86f013c374 (patch)
treea8414485f5d0e36de66752c64a01e8ecff2c4d23 /config
parent8f36ff7a68f8fd82749aa75aeaab7e7fb94879fd (diff)
downloadpfsense-packages-8898b772f927d1a8555df4b450107a86f013c374.tar.gz
pfsense-packages-8898b772f927d1a8555df4b450107a86f013c374.tar.bz2
pfsense-packages-8898b772f927d1a8555df4b450107a86f013c374.zip
Varnish - fix probe urls with spetial character '-'
use same conf file for i386 adn x64
Diffstat (limited to 'config')
-rw-r--r--config/varnish64/varnish.inc9
-rw-r--r--config/varnish64/varnish_settings.xml2
2 files changed, 5 insertions, 6 deletions
diff --git a/config/varnish64/varnish.inc b/config/varnish64/varnish.inc
index 50d804fb..abf07018 100644
--- a/config/varnish64/varnish.inc
+++ b/config/varnish64/varnish.inc
@@ -141,7 +141,6 @@ function varnish_get_url_mappings_txt() {
else{
if(!$isfirst)
$urlmappings .= "\telse ";
- #req.http.host == "procesual.trf1.jus.br"
$urlmappings .= "if (req.$req $fieldtype ".'"'.$url['directorurl'].$url['directorurl2'].'") {'."\n";
#check failover
$urlbackend = "\t\t\tset req.backend = ".$url['directorname'].";";
@@ -283,7 +282,7 @@ function get_backend_config_txt() {
else
$first_byte_timeout = "300s";
if($backend['probe_url'])
- if (preg_match("@^(http)://([a-zA-Z0-9.]*)/(.*)$@",$backend['probe_url'],$matches)){
+ if (preg_match("@^(http)://([a-zA-Z0-9.-]*)/(.*)$@",$backend['probe_url'],$matches)){
$probe_url=".request =\n";
$probe_url.="\t\t\t".'"GET /'.$matches[3].' HTTP/1.1"'."\n";
$probe_url.="\t\t\t".'"Accept: text/*"'."\n";
@@ -395,7 +394,7 @@ function sync_package_varnish() {
}
$vcl_recv_set_basic='#BASIC VCL RULES SETTING'."\n";
$vcl_recv_action_basic='#BASIC VCL RULES ACTIONS'."\n";
- $plataform=posix_uname();
+ #$plataform=posix_uname();
foreach($config['installedpackages']['varnishsettings']['config'] as $vcl) {
if($vcl['fixgzip']){
$vcl_recv_set_basic.="\t#Fix gzip compression\n";
@@ -405,7 +404,7 @@ function sync_package_varnish() {
$vcl_recv_set_basic.="\t".'else if (req.http.Accept-Encoding ~ "deflate") {'."\n\t\tset req.http.Accept-Encoding = ".'"deflate"'.";\n\t\t}\n";
$vcl_recv_set_basic.="\telse\t{\n\t\tunset req.http.Accept-Encoding;\n\t\t}\n\t}\n";
}
- if($vcl['clientbalance'] && $plataform['machine'] == 'amd64'){
+ #if($vcl['clientbalance'] && $plataform['machine'] == 'amd64'){
$vcl_recv_set_basic.="\t#set client balance identity\n";
switch ($vcl['clientbalance']){
case 'url':
@@ -418,7 +417,7 @@ function sync_package_varnish() {
$vcl_recv_set_basic.="\t".'set client.identity = req.http.user-agent;'."\n\n";
break;
}
- }
+ #}
if($vcl['grace'] ){
$vcl_grace_time="set beresp.grace = ".$vcl['grace'].";\n\t\t";
}
diff --git a/config/varnish64/varnish_settings.xml b/config/varnish64/varnish_settings.xml
index fdbf91e2..0576caad 100644
--- a/config/varnish64/varnish_settings.xml
+++ b/config/varnish64/varnish_settings.xml
@@ -166,7 +166,7 @@
<field>
<fielddescr>Client identity method</fielddescr>
<fieldname>clientbalance</fieldname>
- <description><![CDATA[Select how varnish will balance clients when using client Load Balance method. (Choose IP address on i386 systems)]]></description>
+ <description><![CDATA[Select how varnish will balance clients when using client Load Balance method.]]></description>
<type>select</type>
<options>
<option><name>IP address (keep sessions working)</name><value>ip</value></option>