Merge branch 'master' of linz:/srv/git/git-kairo

diff --git a/include/classes/useragent.php-class b/include/classes/useragent.php-class
index d09585d71efd732f203516b6411615a4f2e2ed1f..e5e91c5720baf8e62a1c33473f261af60208292e 100755 (executable)
--- a/include/classes/useragent.php-class
+++ b/include/classes/useragent.php-class
@@ -349,7 +349,7 @@ class userAgent {
       $this->version = $regs[1];
       $this->bot = false;
     }
-    elseif (preg_match('|Konqueror/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+    elseif (preg_match('|Konqueror/([0-9a-zA-Z\.+]+)|i', $this->uastring, $regs)) {
       $this->brand = 'Konqueror';
       $this->version = $regs[1];
       $this->bot = false;

diff --git a/testbed/ua_list_raw.txt b/testbed/ua_list_raw.txt
index ad7479ef05d37199298337a8afd277f569b54cf8..37bc929efde1851d60835f69a8449e34ca7c8377 100755 (executable)
--- a/testbed/ua_list_raw.txt
+++ b/testbed/ua_list_raw.txt
@@ -178,6 +178,7 @@ Mozilla/5.0 (compatible; Konqueror/3.1; CYGWIN_NT-5.1)
 Mozilla/5.0 (compatible; Konqueror/3.2; OpenBSD) (KHTML, like Gecko)
 Mozilla/5.0 (compatible; Konqueror/3.4; Linux) KHTML/3.4.0 (like Gecko)
 Mozilla/5.0 (compatible; Konqueror/3.3; Linux; X11; i686; es, en_US) KHTML/3.3.2 (like Gecko)
+Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.34 (KHTML, like Gecko) konqueror/4.14.0 Safari/534.34
 Mozilla/5.0 (Windows; U; Windows NT 5.1; de) AppleWebKit/522.13.1 (KHTML, like Gecko) Version/3.0.2 Safari/522.13.1
 Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/51 (like Gecko) Safari/51
 Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27