geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-10-08 04:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #347: Add basic support for requests using relative paths

Browse Source
This commit is contained in:
Zach Borboa
2017-10-09 19:30:36 -07:00
parent dd8493d6b6
commit ce9ff3c7ec
7 changed files with 447 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl/Curl.php
+22 -13
View File
@@ -25,7 +25,6 @@ class Curl
public $httpStatusCode = 0;
public $httpErrorMessage = null;
public $baseUrl = null;
public $url = null;
public $requestHeaders = null;
public $responseHeaders = null;
@@ -59,7 +58,7 @@ class Curl
private $defaultDecoder = null;
public static $RFC2616 = array(
// RFC2616: "any CHAR except CTLs or separators".
// RFC 2616: "any CHAR except CTLs or separators".
// CHAR = <any US-ASCII character (octets 0 - 127)>
// CTL = <any US-ASCII control character
// (octets 0 - 31) and DEL (127)>
@@ -76,7 +75,7 @@ class Curl
'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '|', '~',
);
public static $RFC6265 = array(
// RFC6265: "US-ASCII characters excluding CTLs, whitespace DQUOTE, comma, semicolon, and backslash".
// RFC 6265: "US-ASCII characters excluding CTLs, whitespace DQUOTE, comma, semicolon, and backslash".
// %x21
'!',
// %x23-2B
@@ -261,7 +260,7 @@ class Curl
if (is_array($url)) {
$data = $query_parameters;
$query_parameters = $url;
$url = $this->baseUrl;
$url = (string)$this->url;
}
$this->setUrl($url, $query_parameters);
@@ -390,6 +389,10 @@ class Curl
}
$this->errorMessage = $this->curlError ? $this->curlErrorMessage : $this->httpErrorMessage;
// Reset select deferred properties so that they may be recalculated.
unset($this->effectiveUrl);
unset($this->totalTime);
// Allow multicurl to attempt retry as needed.
if ($this->isChildOfMultiCurl) {
return;
@@ -433,7 +436,7 @@ class Curl
{
if (is_array($url)) {
$data = $url;
$url = $this->baseUrl;
$url = (string)$this->url;
}
$this->setUrl($url, $data);
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'GET');
@@ -487,7 +490,7 @@ class Curl
{
if (is_array($url)) {
$data = $url;
$url = $this->baseUrl;
$url = (string)$this->url;
}
$this->setUrl($url, $data);
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'HEAD');
@@ -508,7 +511,7 @@ class Curl
{
if (is_array($url)) {
$data = $url;
$url = $this->baseUrl;
$url = (string)$this->url;
}
$this->setUrl($url, $data);
$this->removeHeader('Content-Length');
@@ -529,7 +532,7 @@ class Curl
{
if (is_array($url)) {
$data = $url;
$url = $this->baseUrl;
$url = (string)$this->url;
}
if (is_array($data) && empty($data)) {
@@ -572,7 +575,7 @@ class Curl
if (is_array($url)) {
$follow_303_with_post = (bool)$data;
$data = $url;
$url = $this->baseUrl;
$url = (string)$this->url;
}
$this->setUrl($url);
@@ -613,7 +616,7 @@ class Curl
{
if (is_array($url)) {
$data = $url;
$url = $this->baseUrl;
$url = (string)$this->url;
}
$this->setUrl($url);
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'PUT');
@@ -642,7 +645,7 @@ class Curl
{
if (is_array($url)) {
$data = $url;
$url = $this->baseUrl;
$url = (string)$this->url;
}
$this->setUrl($url);
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'SEARCH');
@@ -1071,8 +1074,14 @@ class Curl
*/
public function setUrl($url, $mixed_data = '')
{
$this->baseUrl = $url;
$this->url = $this->buildUrl($url, $mixed_data);
$built_url = $this->buildUrl($url, $mixed_data);
if ($this->url === null) {
$this->url = (string)new Url($built_url);
} else {
$this->url = (string)new Url($this->url, $built_url);
}
$this->setOpt(CURLOPT_URL, $this->url);
}
src/Curl/StrUtil.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace Curl;
class StrUtil
{
/**
* Return true when $haystack starts with $needle.
*
* @access public
* @param $haystack
* @param $needle
*
* @return bool
*/
public static function startsWith($haystack, $needle)
{
return mb_substr($haystack, 0, mb_strlen($needle)) === $needle;
}
}
src/Curl/Url.php
+175
View File
@@ -0,0 +1,175 @@
<?php
namespace Curl;
use Curl\StrUtil;
class Url
{
private $baseUrl = null;
private $relativeUrl = null;
public function __construct($base_url, $relative_url = null)
{
$this->baseUrl = $base_url;
$this->relativeUrl = $relative_url;
}
public function __toString()
{
return $this->absolutizeUrl();
}
/**
* Remove dot segments.
*
* Interpret and remove the special "." and ".." path segments from a referenced path.
*/
public static function removeDotSegments($input)
{
// 1. The input buffer is initialized with the now-appended path
// components and the output buffer is initialized to the empty
// string.
$output = '';
// 2. While the input buffer is not empty, loop as follows:
while (!empty($input)) {
// A. If the input buffer begins with a prefix of "../" or "./",
// then remove that prefix from the input buffer; otherwise,
if (StrUtil::startsWith($input, '../')) {
$input = substr($input, 3);
} elseif (StrUtil::startsWith($input, './')) {
$input = substr($input, 2);
// B. if the input buffer begins with a prefix of "/./" or "/.",
// where "." is a complete path segment, then replace that
// prefix with "/" in the input buffer; otherwise,
} elseif (StrUtil::startsWith($input, '/./')) {
$input = substr($input, 2);
} elseif ($input === '/.') {
$input = '/';
// C. if the input buffer begins with a prefix of "/../" or "/..",
// where ".." is a complete path segment, then replace that
// prefix with "/" in the input buffer and remove the last
// segment and its preceding "/" (if any) from the output
// buffer; otherwise,
} elseif (StrUtil::startsWith($input, '/../')) {
$input = substr($input, 3);
$output = substr_replace($output, '', mb_strrpos($output, '/'));
} elseif ($input === '/..') {
$input = '/';
$output = substr_replace($output, '', mb_strrpos($output, '/'));
// D. if the input buffer consists only of "." or "..", then remove
// that from the input buffer; otherwise,
} elseif ($input === '.' || $input === '..') {
$input = '';
// E. move the first path segment in the input buffer to the end of
// the output buffer, including the initial "/" character (if
// any) and any subsequent characters up to, but not including,
// the next "/" character or the end of the input buffer.
} elseif (!(($pos = mb_strpos($input, '/', 1)) === false)) {
$output .= substr($input, 0, $pos);
$input = substr_replace($input, '', 0, $pos);
} else {
$output .= $input;
$input = '';
}
}
// 3. Finally, the output buffer is returned as the result of
// remove_dot_segments.
return $output . $input;
}
/**
* Absolutize url.
*
* Combine the base and relative url into an absolute url.
*/
private function absolutizeUrl()
{
$b = $this->parseUrl($this->baseUrl);
if (!($this->relativeUrl === null)) {
$r = $this->parseUrl($this->relativeUrl);
// Copy relative parts to base url.
if (isset($r['scheme'])) {
$b['scheme'] = $r['scheme'];
}
if (isset($r['host'])) {
$b['host'] = $r['host'];
}
if (isset($r['port'])) {
$b['port'] = $r['port'];
}
if (isset($r['user'])) {
$b['user'] = $r['user'];
}
if (isset($r['pass'])) {
$b['pass'] = $r['pass'];
}
if (!isset($r['path']) || $r['path'] === '') {
$r['path'] = '/';
}
// Merge relative url with base when relative url's path doesn't start with a slash.
if (!(StrUtil::startsWith($r['path'], '/'))) {
$base = mb_strrchr($b['path'], '/', true);
if ($base === false) {
$base = '';
}
$r['path'] = $base . '/' . $r['path'];
}
$b['path'] = $r['path'];
$b['path'] = $this->removeDotSegments($b['path']);
if (isset($r['query'])) {
$b['query'] = $r['query'];
}
if (isset($r['fragment'])) {
$b['fragment'] = $r['fragment'];
}
}
if (!isset($b['path'])) {
$b['path'] = '/';
}
$absolutized_url = $this->unparseUrl($b);
return $absolutized_url;
}
/**
* Parse url.
*
* Parse url into components of a URI as specified by RFC 3986.
*/
private function parseUrl($url)
{
return parse_url($url);
}
/**
* Unparse url.
*
* Combine url components into a url.
*/
private function unparseUrl($parsed_url) {
$scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
$host = isset($parsed_url['host']) ? $parsed_url['host'] : '';
$port = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
$user = isset($parsed_url['user']) ? $parsed_url['user'] : '';
$pass = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : '';
$pass = ($user || $pass) ? $pass . '@' : '';
$path = isset($parsed_url['path']) ? $parsed_url['path'] : '';
$query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
$fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
$unparsed_url = $scheme . $user . $pass . $host . $port . $path . $query . $fragment;
return $unparsed_url;
}
}