From aeafd0579a7278dfbb09351d695db7ab1fe6d303 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 25 Dec 2008 10:22:07 -0500 Subject: Twitter-bridge: fix for Twitter's new strict policy of rejecting HTTP POSTs with invalid "expect" headers darcs-hash:20081225152207-7b5ce-fe890baabaa8f0bf60b05f7558c1ece3544d9906.gz --- _darcs/pristine/lib/twitter.php | 6 ++++-- _darcs/pristine/lib/util.php | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to '_darcs/pristine') diff --git a/_darcs/pristine/lib/twitter.php b/_darcs/pristine/lib/twitter.php index 07871fb20..5eb15005a 100644 --- a/_darcs/pristine/lib/twitter.php +++ b/_darcs/pristine/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/_darcs/pristine/lib/util.php b/_darcs/pristine/lib/util.php index 32201f2be..fbe04c6c4 100644 --- a/_darcs/pristine/lib/util.php +++ b/_darcs/pristine/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); -- cgit v1.2.3-54-g00ecf