Varnish - fix probe urls with spetial character '-'

	  use same conf file for i386 adn x64

4 files changed, 9 insertions, 10 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>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index afb2c680..8629bba4 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -455,7 +455,7 @@
 		<website>http://varnish-cache.org</website>
 		<pkginfolink>http://doc.pfsense.org/index.php/Varnish_package</pkginfolink>
 		<category>Services</category>
-		<version>2.1.5 pkg v.0.8.9</version>
+		<version>2.1.5 pkg v.0.8.9.1</version>
 		<status>RC1</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/varnish64/varnish_backends.xml</config_file>
@@ -463,7 +463,7 @@
 		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>varnish-2.1.5.tbz</depends_on_package>
 		<depends_on_package>gcc-4.2.5.20090325_5.tbz</depends_on_package>
-		<build_port_path>/usr/ports/www/varnish2</build_port_path>
+		<build_port_path>/usr/ports/www/varnish</build_port_path>
 		<build_port_path>/usr/ports/lang/gcc42</build_port_path>
 	</package>
 	<package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index f223422b..accedd10 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -57,7 +57,7 @@
 		<website>http://varnish-cache.org</website>
 		<pkginfolink>http://doc.pfsense.org/index.php/Varnish_package</pkginfolink>
 		<category>Services</category>
-		<version>2.1.5 pkg v.0.8.9</version>
+		<version>2.1.5 pkg v.0.8.9.1</version>
 		<status>RC1</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/varnish64/varnish_backends.xml</config_file>
@@ -65,7 +65,7 @@
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>varnish-2.1.5.tbz</depends_on_package>
 		<depends_on_package>gcc-4.2.5.20090325_5.tbz</depends_on_package>
-		<build_port_path>/usr/ports/www/varnish2</build_port_path>
+		<build_port_path>/usr/ports/www/varnish</build_port_path>
 		<build_port_path>/usr/ports/lang/gcc42</build_port_path>
 	</package>
 	<package>