tobias/friendica
1
0
Fork 0
Code Pull requests Activity

fixed it. Twas the infernal 100 continue headers

Browse source
This commit is contained in:
Mike Macgirvin 2010-10-21 16:45:26 -07:00
parent a266217a6d
commit d193763aa8
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
boot.php
View file

@ -354,7 +354,7 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
if(($redirects > 8) || (! $ch)) if(($redirects > 8) || (! $ch))
return false; return false;
curl_setopt($ch, CURLOPT_HEADER, false); curl_setopt($ch, CURLOPT_HEADER, true);
curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
// by default we will allow self-signed certs // by default we will allow self-signed certs
@ -378,6 +378,11 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$header = substr($s,0,strpos($s,"\r\n\r\n")); $header = substr($s,0,strpos($s,"\r\n\r\n"));
if(stristr($header,'100') && (strlen($header) < 30)) {
// 100 Continue has two headers, get the real one
$s = substr($s,strlen($header)+4);
$header = substr($s,0,strpos($s,"\r\n\r\n"));
}
if($http_code == 301 || $http_code == 302 || $http_code == 303) { if($http_code == 301 || $http_code == 302 || $http_code == 303) {
$matches = array(); $matches = array();
preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches); preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
@ -394,7 +399,7 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
$a->set_curl_headers($header); $a->set_curl_headers($header);
curl_close($ch); curl_close($ch);
return($s); return($body);
}} }}
// post request to $url. $params is an array of post variables. // post request to $url. $params is an array of post variables.
@ -405,7 +410,7 @@ function post_url($url,$params, &$redirects = 0) {
if(($redirects > 8) || (! $ch)) if(($redirects > 8) || (! $ch))
return false; return false;
curl_setopt($ch, CURLOPT_HEADER, false); curl_setopt($ch, CURLOPT_HEADER, true);
curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
curl_setopt($ch, CURLOPT_POST,1); curl_setopt($ch, CURLOPT_POST,1);
curl_setopt($ch, CURLOPT_POSTFIELDS,$params); curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
@ -425,6 +430,11 @@ function post_url($url,$params, &$redirects = 0) {
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$header = substr($s,0,strpos($s,"\r\n\r\n")); $header = substr($s,0,strpos($s,"\r\n\r\n"));
if(stristr($header,'100') && (strlen($header) < 30)) {
// 100 Continue has two headers, get the real one
$s = substr($s,strlen($header)+4);
$header = substr($s,0,strpos($s,"\r\n\r\n"));
}
if($http_code == 301 || $http_code == 302 || $http_code == 303) { if($http_code == 301 || $http_code == 302 || $http_code == 303) {
$matches = array(); $matches = array();
preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches); preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
@ -441,7 +451,7 @@ function post_url($url,$params, &$redirects = 0) {
$a->set_curl_headers($header); $a->set_curl_headers($header);
curl_close($ch); curl_close($ch);
return($s); return($body);
}} }}
// random hash, 64 chars // random hash, 64 chars