From 6a0d2d30cd68c37e1d1bb8554620a20f5349555f Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Fri, 22 Oct 2021 09:29:17 +0100 Subject: [PATCH 1/4] Add a 30 second timeout to the read of a site to prevent the code blocking forever on some sites. --- src/LinkPreview/Reader/GeneralReader.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/LinkPreview/Reader/GeneralReader.php b/src/LinkPreview/Reader/GeneralReader.php index cf60e4d..66c2dfc 100644 --- a/src/LinkPreview/Reader/GeneralReader.php +++ b/src/LinkPreview/Reader/GeneralReader.php @@ -27,7 +27,8 @@ class GeneralReader implements ReaderInterface public function getClient() { if (!$this->client) { - $this->client = new Client([RequestOptions::COOKIES => true]); + // Add a 30s timeout as a fallback - some sites block us indefinitely and never return. + $this->client = new Client([RequestOptions::COOKIES => true, timeout => 30]); } return $this->client; From 4b97597eb04876c3c161142e668bf13aad40156e Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Fri, 9 Dec 2022 13:17:31 +0000 Subject: [PATCH 2/4] Bump guzzle dependency. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 56e708a..77561aa 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "require": { "php": ">=5.6", - "guzzlehttp/guzzle": "^6.2" + "guzzlehttp/guzzle": "^6.2|^7.4.5" }, "require-dev": { "phpunit/phpunit": "^5.3" From 2d8c6d8a912a9e5ec828010da2851700e425266d Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Fri, 9 Dec 2022 13:18:28 +0000 Subject: [PATCH 3/4] Correct package name. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 77561aa..1932cf1 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "kasp3r/link-preview", + "name": "freegle/link-preview", "type": "library", "description": "Link preview library for PHP", "keywords": ["php","url","scraping"], From 3adc8d5dc606fd09c120e5f0c0a14c7b5a3fa445 Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Fri, 9 Dec 2022 13:19:06 +0000 Subject: [PATCH 4/4] Bump guzzle dependency. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1932cf1..147f4ff 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "require": { "php": ">=5.6", - "guzzlehttp/guzzle": "^6.2|^7.4.5" + "guzzlehttp/guzzle": "^7.4.5" }, "require-dev": { "phpunit/phpunit": "^5.3"