From: Antonio Ospite <ao2@ao2.it>
Date: Sat, 7 Sep 2019 20:10:00 +0000 (+0200)
Subject: Merge tag 'v1.4.1' into debian/master
X-Git-Tag: debian/1.4.1-1~5
X-Git-Url: https://git.ao2.it/tweeper.git/commitdiff_plain/1c5715630c264a881f42844793c3dd046501deb1?hp=66eeb4a343dce4f77ef23c6d420ed76dc0569e47

Merge tag 'v1.4.1' into debian/master

Release v1.4.1
---

diff --git a/NEWS b/NEWS
index 29ec569..e98c9ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+News for v1.4.1:
+================
+
+   * Enable cookie handling in cURL to fix scraping twitter.com
+   * Update User-Agent version to fix scraping hashtag pages on twitter.com
+
 News for v1.4.0:
 ================
 
diff --git a/src/Tweeper.php b/src/Tweeper.php
index 09bd7cc..877e882 100644
--- a/src/Tweeper.php
+++ b/src/Tweeper.php
@@ -36,7 +36,7 @@ date_default_timezone_set('UTC');
  */
 class Tweeper {
 
-  private static $userAgent = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Firefox/60.0";
+  private static $userAgent = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:64.0) Gecko/20100101 Firefox/64.0";
   private static $maxConnectionTimeout = 5;
   private static $maxConnectionRetries = 5;
 
@@ -121,6 +121,7 @@ class Tweeper {
       CURLOPT_CONNECTTIMEOUT => Tweeper::$maxConnectionTimeout,
       // Follow http redirects to get the real URL.
       CURLOPT_FOLLOWLOCATION => TRUE,
+      CURLOPT_COOKIEFILE => "",
       CURLOPT_RETURNTRANSFER => TRUE,
       CURLOPT_SSL_VERIFYHOST => FALSE,
       CURLOPT_SSL_VERIFYPEER => FALSE,