summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2008-12-26 00:17:16 -0500
committerZach Copley <zach@controlyourself.ca>2008-12-26 00:17:16 -0500
commit174412018be90b23f1faf30467ac629b70b87d7a (patch)
tree9337d789e7ae60cbed5d5f804141ed436c022c20
parent29b6858f23482d909ed2cccbccf69844e3209380 (diff)
Twitter-bridge: fix for Twitter's new strict policy of rejecting HTTP POSTs with invalid "expect" headers (not the same patch as in trunk)0.6.4.2
darcs-hash:20081226051716-7b5ce-82040320785bab9438aa11cf5efa63fa4cba10ae.gz
-rw-r--r--lib/twitter.php5
-rw-r--r--lib/util.php5
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/twitter.php b/lib/twitter.php
index 5c9ef5d6f..7f75a1afd 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -29,7 +29,10 @@ function get_twitter_data($uri, $screen_name, $password) {
CURLOPT_FOLLOWLOCATION => true,
// 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 8eeda1115..7518fbf55 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1498,7 +1498,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);