Merge branch 'dev'

This commit is contained in:
zotlabs 2019-12-25 17:42:52 -08:00
commit 1f6e86c82b
3 changed files with 6 additions and 4 deletions

View file

@ -38,8 +38,10 @@ class Zotfinger {
$redirects = 0;
$x = z_post_url($resource,$data,$redirects, [ 'headers' => $h ] );
if($x['success']) {
$result['signature'] = HTTPSig::verify($x);
$result['data'] = json_decode($x['body'],true);

View file

@ -48,7 +48,7 @@ require_once('include/items.php');
define ( 'STD_VERSION', '19.12.25' );
define ( 'STD_VERSION', '19.12.26' );
define ( 'ZOT_REVISION', '6.0' );
define ( 'DB_UPDATE_VERSION', 1236 );

View file

@ -175,7 +175,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
// Pull out multiple headers, e.g. proxy and continuation headers
// allow for HTTP/2.x without fixing code
while(preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/',$base)) {
while(preg_match('/^HTTP\/[1-2][\.0-9]* [1-5][0-9][0-9]/',$base)) {
$chunk = substr($base,0,strpos($base,"\r\n\r\n")+4);
$header .= $chunk;
$base = substr($base,strlen($chunk));
@ -355,7 +355,7 @@ function z_post_url($url, $params, $redirects = 0, $opts = array()) {
// Pull out multiple headers, e.g. proxy and continuation headers
// allow for HTTP/2.x without fixing code
while(preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/',$base)) {
while(preg_match('/^HTTP\/[1-2][\.0-9]* [1-5][0-9][0-9]/',$base)) {
$chunk = substr($base,0,strpos($base,"\r\n\r\n")+4);
$header .= $chunk;
$base = substr($base,strlen($chunk));