harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade incutio xmlrpc library to use hubzilla curl wrapper

Browse Source
This commit is contained in:
zotlabs 2018-04-13 17:58:11 -07:00
parent 32cd0cc984
commit f16dc7afc8
1 changed files with 20 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
library/IXR_Library.php
View File

@ -606,7 +606,7 @@ class IXR_Client
if (!$path) { if (!$path) {
// Assume we have been given a URL instead // Assume we have been given a URL instead
$bits = parse_url($server); $bits = parse_url($server);
$this->server = $bits['host']; $this->server = $server;
$this->port = isset($bits['port']) ? $bits['port'] : 80; $this->port = isset($bits['port']) ? $bits['port'] : 80;
$this->path = isset($bits['path']) ? $bits['path'] : '/'; $this->path = isset($bits['path']) ? $bits['path'] : '/';
@ -634,64 +634,39 @@ class IXR_Client
$request = "POST {$this->path} HTTP/1.0$r"; $request = "POST {$this->path} HTTP/1.0$r";
// Merged from WP #8145 - allow custom headers // Merged from WP #8145 - allow custom headers
$this->headers['Host'] = $this->server;
$this->headers['Content-Type'] = 'text/xml'; $this->headers['Content-Type'] = 'text/xml';
$this->headers['User-Agent'] = $this->useragent; $this->headers['User-Agent'] = $this->useragent;
$this->headers['Content-Length']= $length; $this->headers['Content-Length']= $length;
$headers = [];
foreach( $this->headers as $header => $value ) { foreach( $this->headers as $header => $value ) {
$request .= "{$header}: {$value}{$r}"; $headers[] .= "{$header}: {$value}";
}
$request .= $r;
$request .= $xml;
// Now send the request
if ($this->debug) {
echo '<pre class="ixr_request">'.htmlspecialchars($request)."\n</pre>\n\n";
} }
if ($this->timeout) {
$fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout); //logger('server: ' . $this->server);
} else { //logger('xml: ' . $xml);
$fp = @fsockopen($this->server, $this->port, $errno, $errstr); //logger('headers: ' . print_r($headers,true));
}
if (!$fp) {
$retries = 0;
$result = z_post_url($this->server,$xml,$retries, [ 'headers' => $headers] );
// logger('result: ' . print_r($result,true));
if (! $result['success']) {
$this->error = new IXR_Error(-32300, 'transport error - could not open socket'); $this->error = new IXR_Error(-32300, 'transport error - could not open socket');
return false; return false;
} }
fputs($fp, $request);
$contents = '';
$debugContents = '';
$gotFirstLine = false;
$gettingHeaders = true;
while (!feof($fp)) {
$line = fgets($fp, 4096);
if (!$gotFirstLine) {
// Check line for '200'
if (strstr($line, '200') === false) {
$this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
return false;
}
$gotFirstLine = true;
}
if (trim($line) == '') {
$gettingHeaders = false;
}
if (!$gettingHeaders) {
// merged from WP #12559 - remove trim
$contents .= $line;
}
if ($this->debug) { if ($this->debug) {
$debugContents .= $line; echo '<pre class="ixr_response">'.htmlspecialchars($result['header'] . "\n\n" . $result['body'])."\n</pre>\n\n";
}
}
if ($this->debug) {
echo '<pre class="ixr_response">'.htmlspecialchars($debugContents)."\n</pre>\n\n";
} }
// Now parse what we've got back // Now parse what we've got back
$this->message = new IXR_Message($contents); $this->message = new IXR_Message($result['body']);
if (!$this->message->parse()) { if (!$this->message->parse()) {
// XML error // XML error
$this->error = new IXR_Error(-32700, 'parse error. not well formed'); $this->error = new IXR_Error(-32700, 'parse error. not well formed');