aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-09 08:14:01 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-09 08:14:01 -0300
commit0c431a1f88fa15a7134cbb9504c0ee758e9b334a (patch)
tree474cec47eb73c758a81f2bc01bb8ebae9ce0ec60
parent4f46cf871c6e90430a163daa48a77c22862d08d0 (diff)
parent0fc7c650fbe07e8c808728f256881f242c1ffe24 (diff)
downloadpfsense-packages-0c431a1f88fa15a7134cbb9504c0ee758e9b334a.tar.gz
pfsense-packages-0c431a1f88fa15a7134cbb9504c0ee758e9b334a.tar.bz2
pfsense-packages-0c431a1f88fa15a7134cbb9504c0ee758e9b334a.zip
Merge pull request #840 from ReinaldoFeitosa/master
-rw-r--r--config/lightsquid/sqstat.class.php4
-rw-r--r--pkg_config.10.xml2
2 files changed, 5 insertions, 1 deletions
diff --git a/config/lightsquid/sqstat.class.php b/config/lightsquid/sqstat.class.php
index 5707e051..88a5cfce 100644
--- a/config/lightsquid/sqstat.class.php
+++ b/config/lightsquid/sqstat.class.php
@@ -202,8 +202,12 @@ class squidstat{
}
if ($connection) {
# username field is avaible in Squid 2.6 stable
+ # peer changed to remote in Squid 3.2 or later
+ # me changed to local in Squid 3.2 or later
if(substr($v,0,9) == "username ") $parsed["con"][$connection]["username"] = substr($v, 9);
+ if(substr($v,0,7) == "remote:") $parsed["con"][$connection]["peer"] = substr($v, 8);
if(substr($v,0,5) == "peer:") $parsed["con"][$connection]["peer"] = substr($v, 6);
+ if(substr($v,0,6) == "local:") $parsed["con"][$connection]["me"] = substr($v, 7);
if(substr($v,0,3) == "me:") $parsed["con"][$connection]["me"] = substr($v, 4);
if(substr($v,0,4) == "uri ") $parsed["con"][$connection]["uri"] = substr($v, 4);
if(substr($v,0,10) == "delay_pool") $parsed["con"][$connection]["delay_pool"] = substr($v, 11);
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 48a45cf6..ac19a4f5 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -511,7 +511,7 @@
<descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr>
<website>http://lightsquid.sf.net/</website>
<category>Network Report</category>
- <version>1.8.2 pkg v.2.35</version>
+ <version>1.8.2 pkg v.2.36</version>
<maintainer>dv_serg@mail.ru</maintainer>
<depends_on_package_pbi>lightsquid-1.8_2-##ARCH##.pbi</depends_on_package_pbi>
<build_pbi>