diff --git a/browsecap/browscap.ini b/browsecap/browscap.ini index 1801553..40418ed 100644 --- a/browsecap/browscap.ini +++ b/browsecap/browscap.ini @@ -6702,7 +6702,7 @@ Cookies=true BackgroundSounds=true JavaApplets=true JavaScript=true -isMobileDevice=true +isMobileDevice=false CssVersion=3 supportsCSS=true @@ -6731,6 +6731,84 @@ Version=4.2 MajorVer=4 MinorVer=2 +[Mozilla/5.0 (iPad; U; CPU OS 5_0* like Mac OS X; *)*] +Parent=iPad +Browser=iPad +Version=5.0 +MajorVer=5 +MinorVer=0 + +[Mozilla/5.0 (iPad; U; CPU OS 5_1* like Mac OS X; *)*] +Parent=iPad +Version=5.1 +MajorVer=5 +MinorVer=1 + +[Mozilla/5.0 (iPad; U; CPU OS 5_2* like Mac OS X; *)*] +Parent=iPad +Version=5.2 +MajorVer=5 +MinorVer=2 + +[Mozilla/5.0 (iPad; U; CPU OS 6_0* like Mac OS X; *)*] +Parent=iPad +Browser=iPad +Version=6.0 +MajorVer=6 +MinorVer=0 + +[Mozilla/5.0 (iPad; U; CPU OS 6_1* like Mac OS X; *)*] +Parent=iPad +Version=6.1 +MajorVer=6 +MinorVer=1 + +[Mozilla/5.0 (iPad; U; CPU OS 6_2* like Mac OS X; *)*] +Parent=iPad +Version=6.2 +MajorVer=6 +MinorVer=2 + +[Mozilla/5.0 (iPad; U; CPU OS 7_0* like Mac OS X; *)*] +Parent=iPad +Browser=iPad +Version=7.0 +MajorVer=7 +MinorVer=0 + +[Mozilla/5.0 (iPad; U; CPU OS 7_1* like Mac OS X; *)*] +Parent=iPad +Version=7.1 +MajorVer=7 +MinorVer=1 + +[Mozilla/5.0 (iPad; U; CPU OS 7_2* like Mac OS X; *)*] +Parent=iPad +Version=7.2 +MajorVer=7 +MinorVer=2 + +[Mozilla/5.0 (iPad; U; CPU OS 7_0* like Mac OS X; *)*] +Parent=iPad +Browser=iPad +Version=7.0 +MajorVer=6 +MinorVer=0 + +[Mozilla/5.0 (iPad; U; CPU OS 7_1* like Mac OS X; *)*] +Parent=iPad +Version=7.1 +MajorVer=7 +MinorVer=1 + +[Mozilla/5.0 (iPad; U; CPU OS 7_2* like Mac OS X; *)*] +Parent=iPad +Version=7.2 +MajorVer=7 +MinorVer=2 + + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; iPhone [iPhone] @@ -6788,6 +6866,60 @@ Version=4.2 MajorVer=4 MinorVer=2 +[Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 5_0* like Mac OS X; *)*] +Parent=iPhone +Version=5.0 +MajorVer=5 +MinorVer=0 + +[Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 5_1* like Mac OS X; *)*] +Parent=iPhone +Version=5.1 +MajorVer=5 +MinorVer=1 + +[Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 5_2* like Mac OS X; *)*] +Parent=iPhone +Version=5.2 +MajorVer=5 +MinorVer=2 + +[Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 6_0* like Mac OS X; *)*] +Parent=iPhone +Version=6.0 +MajorVer=6 +MinorVer=0 + +[Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 6_1* like Mac OS X; *)*] +Parent=iPhone +Version=6.1 +MajorVer=6 +MinorVer=1 + +[Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 6_2* like Mac OS X; *)*] +Parent=iPhone +Version=6.2 +MajorVer=6 +MinorVer=2 + +[Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 7_0* like Mac OS X; *)*] +Parent=iPhone +Version=7.0 +MajorVer=7 +MinorVer=0 + +[Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 7_1* like Mac OS X; *)*] +Parent=iPhone +Version=7.1 +MajorVer=7 +MinorVer=1 + +[Mozilla/5.0 (iPhone Simulator; U; CPU iPhone OS 7_2* like Mac OS X; *)*] +Parent=iPhone +Version=7.2 +MajorVer=7 +MinorVer=2 + [Mozilla/5.0 (iPhone; U; CPU iPhone OS 2_* like Mac OS X; *)*] Parent=iPhone Version=2.0 @@ -6830,6 +6962,60 @@ Version=4.2 MajorVer=4 MinorVer=2 +[Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_0* like Mac OS X; *)*] +Parent=iPhone +Version=5.0 +MajorVer=5 +MinorVer=0 + +[Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1* like Mac OS X; *)*] +Parent=iPhone +Version=5.1 +MajorVer=5 +MinorVer=1 + +[Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_2* like Mac OS X; *)*] +Parent=iPhone +Version=5.2 +MajorVer=5 +MinorVer=2 + +[Mozilla/5.0 (iPhone; U; CPU iPhone OS 6_0* like Mac OS X; *)*] +Parent=iPhone +Version=6.0 +MajorVer=6 +MinorVer=0 + +[Mozilla/5.0 (iPhone; U; CPU iPhone OS 6_1* like Mac OS X; *)*] +Parent=iPhone +Version=6.1 +MajorVer=6 +MinorVer=1 + +[Mozilla/5.0 (iPhone; U; CPU iPhone OS 6_2* like Mac OS X; *)*] +Parent=iPhone +Version=6.2 +MajorVer=6 +MinorVer=2 + +[Mozilla/5.0 (iPhone; U; CPU iPhone OS 7_0* like Mac OS X; *)*] +Parent=iPhone +Version=7.0 +MajorVer=7 +MinorVer=0 + +[Mozilla/5.0 (iPhone; U; CPU iPhone OS 7_1* like Mac OS X; *)*] +Parent=iPhone +Version=7.1 +MajorVer=7 +MinorVer=1 + +[Mozilla/5.0 (iPhone; U; CPU iPhone OS 7_2* like Mac OS X; *)*] +Parent=iPhone +Version=7.2 +MajorVer=7 +MinorVer=2 + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; iPod Touch [iPod Touch] diff --git a/browsecap/bupdate.ini b/browsecap/bupdate.ini new file mode 100644 index 0000000..f97ca6a --- /dev/null +++ b/browsecap/bupdate.ini @@ -0,0 +1,16 @@ +[Mozilla/5.0 (iPhone;* CPU iPhone OS * like Mac OS X*)*] +Parent=iPhone + +[Mozilla/5.0 (iPhone Simulator;* CPU iPhone OS * like Mac OS X*)*] +Parent=iPhone + +[Mozilla/5.0 (iPod;* CPU iPhone OS * like Mac OS X*)*] +Parent=iPod Touch + +[Mozilla/5.0 (iPad;* CPU OS * like Mac OS X*)*] +Parent=iPad + + +[Mozilla/5.0 (Linux;* Android *; *; * Build/*) AppleWebKit/*(KHTML, like Gecko) Version/* Mobile Safari/*] +Parent=Android + diff --git a/browsecap/middleware.py b/browsecap/middleware.py index 94237b8..22aba57 100644 --- a/browsecap/middleware.py +++ b/browsecap/middleware.py @@ -11,7 +11,7 @@ class MobileRedirectMiddleware(object): def process_request(self, request): - if not getattr(settings, 'MOBILE_DOMAIN', False): + if not getattr(settings, 'MOBILE_DOMAIN', False) or request.GET.get('_isbrowser', False): return # test for mobile browser