[master] 3725eb9 Import latest version from github.com/varnish/varnish-devicedetect/
Lasse Karstensen
lkarsten at varnish-cache.org
Mon Aug 12 16:24:16 CEST 2013
commit 3725eb968fbe31b582590c19023b8bb113e802db
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date: Mon Aug 12 16:24:02 2013 +0200
Import latest version from github.com/varnish/varnish-devicedetect/
diff --git a/etc/devicedetect.vcl b/etc/devicedetect.vcl
index ed5b39d..e7aecbf 100644
--- a/etc/devicedetect.vcl
+++ b/etc/devicedetect.vcl
@@ -5,65 +5,68 @@
# Author: Lasse Karstensen <lasse at varnish-software.com>
sub devicedetect {
- unset req.http.X-UA-Device;
- set req.http.X-UA-Device = "pc";
+ unset req.http.X-UA-Device;
+ set req.http.X-UA-Device = "pc";
- if (req.http.User-Agent ~ "(?i)(ads|google|bing|msn|yandex|baidu|ro|career|)bot" ||
- req.http.User-Agent ~ "(?i)(baidu|symantec)spider" ||
- req.http.User-Agent ~ "(?i)scanner" ||
- req.http.User-Agent ~ "(?i)(web)crawler") {
- set req.http.X-UA-Device = "bot"; }
- elsif (req.http.User-Agent ~ "(?i)ip(hone|od)") { set req.http.X-UA-Device = "mobile-iphone"; }
- elsif (req.http.User-Agent ~ "(?i)ipad") { set req.http.X-UA-Device = "tablet-ipad"; }
- # how do we differ between an android phone and an android tablet?
- # http://stackoverflow.com/questions/5341637/how-do-detect-android-tablets-in-general-useragent
- elsif (req.http.User-Agent ~ "(?i)android.*(mobile|mini)") { set req.http.X-UA-Device = "mobile-android"; }
- # android 3/honeycomb was just about tablet-only, and any phones will probably handle a bigger page layout.
- elsif (req.http.User-Agent ~ "(?i)android 3") { set req.http.X-UA-Device = "tablet-android"; }
- # may very well give false positives towards android tablets. Suggestions welcome.
- elsif (req.http.User-Agent ~ "(?i)android") { set req.http.X-UA-Device = "tablet-android"; }
-
- elsif (req.http.User-Agent ~ "^HTC" ||
- req.http.User-Agent ~ "Fennec" ||
- req.http.User-Agent ~ "IEMobile" ||
- req.http.User-Agent ~ "BlackBerry" ||
- req.http.User-Agent ~ "SymbianOS.*AppleWebKit" ||
- req.http.User-Agent ~ "Opera Mobi") {
- set req.http.X-UA-Device = "mobile-smartphone";
- }
- elsif (req.http.User-Agent ~ "(?i)symbian" ||
- req.http.User-Agent ~ "(?i)^sonyericsson" ||
- req.http.User-Agent ~ "(?i)^nokia" ||
- req.http.User-Agent ~ "(?i)^samsung" ||
- req.http.User-Agent ~ "(?i)^lg" ||
- req.http.User-Agent ~ "(?i)bada" ||
- req.http.User-Agent ~ "(?i)blazer" ||
- req.http.User-Agent ~ "(?i)cellphone" ||
- req.http.User-Agent ~ "(?i)iemobile" ||
- req.http.User-Agent ~ "(?i)midp-2.0" ||
- req.http.User-Agent ~ "(?i)u990" ||
- req.http.User-Agent ~ "(?i)netfront" ||
- req.http.User-Agent ~ "(?i)opera mini" ||
- req.http.User-Agent ~ "(?i)palm" ||
- req.http.User-Agent ~ "(?i)nintendo wii" ||
- req.http.User-Agent ~ "(?i)playstation portable" ||
- req.http.User-Agent ~ "(?i)portalmmm" ||
- req.http.User-Agent ~ "(?i)proxinet" ||
- req.http.User-Agent ~ "(?i)sonyericsson" ||
- req.http.User-Agent ~ "(?i)symbian" ||
- req.http.User-Agent ~ "(?i)windows\ ?ce" ||
- req.http.User-Agent ~ "(?i)winwap" ||
- req.http.User-Agent ~ "(?i)eudoraweb" ||
- req.http.User-Agent ~ "(?i)htc" ||
- req.http.User-Agent ~ "(?i)240x320" ||
- req.http.User-Agent ~ "(?i)avantgo") {
- set req.http.X-UA-Device = "mobile-generic";
- }
- # handle overrides
- if (req.http.Cookie ~ "(i?)X-UA-Device-force") {
- # ;?? means zero or one ;, non-greedy to match the first.
- set req.http.X-UA-Device = regsub(req.http.Cookie, "(?i).*X-UA-Device-force=([^;]+);??.*", "\1");
- }
+ # Handle that a cookie may override the detection alltogether.
+ if (req.http.Cookie ~ "(?i)X-UA-Device-force") {
+ /* ;?? means zero or one ;, non-greedy to match the first. */
+ set req.http.X-UA-Device = regsub(req.http.Cookie, "(?i).*X-UA-Device-force=([^;]+);??.*", "\1");
+ /* Clean up our mess in the cookie header */
+ set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *X-UA-Device-force=[^;]+;? *", "\1");
+ /* If the cookie header is now empty, or just whitespace, unset it. */
+ if (req.http.Cookie ~ "^ *$") { unset req.http.Cookie; }
+ } else {
+ if (req.http.User-Agent ~ "(?i)(ads|google|bing|msn|yandex|baidu|ro|career|)bot" ||
+ req.http.User-Agent ~ "(?i)(baidu|jike|symantec)spider" ||
+ req.http.User-Agent ~ "(?i)scanner" ||
+ req.http.User-Agent ~ "(?i)(web)crawler") {
+ set req.http.X-UA-Device = "bot"; }
+ elsif (req.http.User-Agent ~ "(?i)ipad") { set req.http.X-UA-Device = "tablet-ipad"; }
+ elsif (req.http.User-Agent ~ "(?i)ip(hone|od)") { set req.http.X-UA-Device = "mobile-iphone"; }
+ /* how do we differ between an android phone and an android tablet?
+ http://stackoverflow.com/questions/5341637/how-do-detect-android-tablets-in-general-useragent */
+ elsif (req.http.User-Agent ~ "(?i)android.*(mobile|mini)") { set req.http.X-UA-Device = "mobile-android"; }
+ // android 3/honeycomb was just about tablet-only, and any phones will probably handle a bigger page layout.
+ elsif (req.http.User-Agent ~ "(?i)android 3") { set req.http.X-UA-Device = "tablet-android"; }
+ // May very well give false positives towards android tablets. Suggestions welcome.
+ elsif (req.http.User-Agent ~ "(?i)android") { set req.http.X-UA-Device = "tablet-android"; }
+ elsif (req.http.User-Agent ~ "Mobile.+Firefox") { set req.http.X-UA-Device = "mobile-firefoxos"; }
+ elsif (req.http.User-Agent ~ "^HTC" ||
+ req.http.User-Agent ~ "Fennec" ||
+ req.http.User-Agent ~ "IEMobile" ||
+ req.http.User-Agent ~ "BlackBerry" ||
+ req.http.User-Agent ~ "SymbianOS.*AppleWebKit" ||
+ req.http.User-Agent ~ "Opera Mobi") {
+ set req.http.X-UA-Device = "mobile-smartphone";
+ }
+ elsif (req.http.User-Agent ~ "(?i)symbian" ||
+ req.http.User-Agent ~ "(?i)^sonyericsson" ||
+ req.http.User-Agent ~ "(?i)^nokia" ||
+ req.http.User-Agent ~ "(?i)^samsung" ||
+ req.http.User-Agent ~ "(?i)^lg" ||
+ req.http.User-Agent ~ "(?i)bada" ||
+ req.http.User-Agent ~ "(?i)blazer" ||
+ req.http.User-Agent ~ "(?i)cellphone" ||
+ req.http.User-Agent ~ "(?i)iemobile" ||
+ req.http.User-Agent ~ "(?i)midp-2.0" ||
+ req.http.User-Agent ~ "(?i)u990" ||
+ req.http.User-Agent ~ "(?i)netfront" ||
+ req.http.User-Agent ~ "(?i)opera mini" ||
+ req.http.User-Agent ~ "(?i)palm" ||
+ req.http.User-Agent ~ "(?i)nintendo wii" ||
+ req.http.User-Agent ~ "(?i)playstation portable" ||
+ req.http.User-Agent ~ "(?i)portalmmm" ||
+ req.http.User-Agent ~ "(?i)proxinet" ||
+ req.http.User-Agent ~ "(?i)sonyericsson" ||
+ req.http.User-Agent ~ "(?i)symbian" ||
+ req.http.User-Agent ~ "(?i)windows\ ?ce" ||
+ req.http.User-Agent ~ "(?i)winwap" ||
+ req.http.User-Agent ~ "(?i)eudoraweb" ||
+ req.http.User-Agent ~ "(?i)htc" ||
+ req.http.User-Agent ~ "(?i)240x320" ||
+ req.http.User-Agent ~ "(?i)avantgo") {
+ set req.http.X-UA-Device = "mobile-generic";
+ }
+ }
}
-
-# vim: sw=4:tw=120 # meh
More information about the varnish-commit
mailing list