From bbcc85a1b733a9cce24b4b7cf77b05514501524e Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Tue, 21 Sep 2021 02:17:52 +0900 Subject: [PATCH 1/2] Update woothee to 1.11.1 --- woothee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/woothee b/woothee index 1d21d7c..f8da19e 160000 --- a/woothee +++ b/woothee @@ -1 +1 @@ -Subproject commit 1d21d7cbfd57b568e964cdd2ef98f9e046512628 +Subproject commit f8da19ec0f0d602ccd98e23dce9c79bd78dc857d From b7e3c444ed22f7b5df096210a1e96b6e06d8220a Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Tue, 21 Sep 2021 02:55:48 +0900 Subject: [PATCH 2/2] Woothee 1.11.1 follows https://github.com/woothee/woothee/commit/540aef1e0470c1dc3e12eeca62e621028f1e39a8 --- src/AgentCategory/Browser/SafariChrome.php | 8 ++++++++ src/DataSet.php | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/AgentCategory/Browser/SafariChrome.php b/src/AgentCategory/Browser/SafariChrome.php index 461276e..8edea75 100644 --- a/src/AgentCategory/Browser/SafariChrome.php +++ b/src/AgentCategory/Browser/SafariChrome.php @@ -83,6 +83,14 @@ public static function challenge($ua, &$result) return true; } + if (preg_match('@GSA/([.0-9]+)@', $ua, $matches)) { + $version = $matches[1]; + static::updateMap($result, DataSet::get('GSA')); + static::updateVersion($result, $version); + + return true;; + } + if (preg_match('/Version\/([.0-9]+)/uD', $ua, $matches)) { $version = $matches[1]; } diff --git a/src/DataSet.php b/src/DataSet.php index e9816b1..326bc04 100644 --- a/src/DataSet.php +++ b/src/DataSet.php @@ -1,7 +1,7 @@ 'browser', 'vendor' => 'Fenrir Inc.', ), + 'GSA' => array( + 'label' => 'GSA', + 'name' => 'Google Search App', + 'type' => 'browser', + 'vendor' => 'Google', + ), 'Webview' => array( 'label' => 'Webview', 'name' => 'Webview', @@ -633,7 +639,7 @@ class DataSet 'name' => 'misc crawler', 'type' => 'full', 'category' => 'crawler', - ), + ) ); public static function get($label)