diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/twitter.php | 6 | ||||
| -rw-r--r-- | lib/util.php | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/twitter.php b/lib/twitter.php index 07871fb20..5eb15005a 100644 --- a/lib/twitter.php +++ b/lib/twitter.php @@ -28,9 +28,11 @@ function get_twitter_data($uri, $screen_name, $password) CURLOPT_FAILONERROR => true, CURLOPT_HEADER => false, CURLOPT_FOLLOWLOCATION => true, - // CURLOPT_USERAGENT => "identi.ca", + # CURLOPT_USERAGENT => "identi.ca", CURLOPT_CONNECTTIMEOUT => 120, - CURLOPT_TIMEOUT => 120 + CURLOPT_TIMEOUT => 120, + # Twitter is strict about accepting invalid "Expect" headers + CURLOPT_HTTPHEADER => array('Expect:') ); diff --git a/lib/util.php b/lib/util.php index 32201f2be..fbe04c6c4 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1571,7 +1571,10 @@ function common_twitter_broadcast($notice, $flink) CURLOPT_FOLLOWLOCATION => true, CURLOPT_USERAGENT => "Laconica", CURLOPT_CONNECTTIMEOUT => 120, // XXX: Scary!!!! How long should this be? - CURLOPT_TIMEOUT => 120 + CURLOPT_TIMEOUT => 120, + + # Twitter is strict about accepting invalid "Expect" headers + CURLOPT_HTTPHEADER => array('Expect:') ); $ch = curl_init($uri); |