mirror/php-cimage
1
0
Fork 0
mirror of https://github.com/mosbth/cimage.git synced 2025-08-07 08:36:32 +02:00
Code Issues Releases Wiki Activity

Support redirections for remote images, fix #87, fix #90.

Browse Source
This commit is contained in:
Mikael Roos
2015-03-18 15:56:14 +01:00
parent a8e1718208
commit 2651c9ea02
5 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CHttpGet.php
View File

@@ -62,7 +62,14 @@ class CHttpGet
*/ */
public function parseHeader() public function parseHeader()
{ {
$header = explode("\r\n", rtrim($this->response['headerRaw'], "\r\n")); //$header = explode("\r\n", rtrim($this->response['headerRaw'], "\r\n"));
$rawHeaders = rtrim($this->response['headerRaw'], "\r\n");
# Handle multiple responses e.g. with redirections (proxies too)
$headerGroups = explode("\r\n\r\n", $rawHeaders);
# We're only interested in the last one
$header = explode("\r\n", end($headerGroups));
$output = array(); $output = array();
if ('HTTP' === substr($header[0], 0, 4)) { if ('HTTP' === substr($header[0], 0, 4)) {
@@ -99,6 +106,8 @@ class CHttpGet
CURLINFO_HEADER_OUT => $debug, CURLINFO_HEADER_OUT => $debug,
CURLOPT_CONNECTTIMEOUT => 5, CURLOPT_CONNECTTIMEOUT => 5,
CURLOPT_TIMEOUT => 5, CURLOPT_TIMEOUT => 5,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_MAXREDIRS => 2,
); );
$ch = curl_init(); $ch = curl_init();

1
REVISION.md
View File

@@ -8,6 +8,7 @@ Revision history
v0.7.0.x (latest) v0.7.0.x (latest)
------------------------------------- -------------------------------------
* Support redirections for remote images, fix #87, fix #90.
* Improving usage of Travis and Scrutinizer. * Improving usage of Travis and Scrutinizer.
* Naming cache-file using md5 for remote images, fix #86. * Naming cache-file using md5 for remote images, fix #86.
* Loading images without depending on filename extension, fix #85. * Loading images without depending on filename extension, fix #85.

11
webroot/imgd.php
View File

@@ -99,7 +99,14 @@ class CHttpGet
*/ */
public function parseHeader() public function parseHeader()
{ {
$header = explode("\r\n", rtrim($this->response['headerRaw'], "\r\n")); //$header = explode("\r\n", rtrim($this->response['headerRaw'], "\r\n"));
$rawHeaders = rtrim($this->response['headerRaw'], "\r\n");
# Handle multiple responses e.g. with redirections (proxies too)
$headerGroups = explode("\r\n\r\n", $rawHeaders);
# We're only interested in the last one
$header = explode("\r\n", end($headerGroups));
$output = array(); $output = array();
if ('HTTP' === substr($header[0], 0, 4)) { if ('HTTP' === substr($header[0], 0, 4)) {
@@ -136,6 +143,8 @@ class CHttpGet
CURLINFO_HEADER_OUT => $debug, CURLINFO_HEADER_OUT => $debug,
CURLOPT_CONNECTTIMEOUT => 5, CURLOPT_CONNECTTIMEOUT => 5,
CURLOPT_TIMEOUT => 5, CURLOPT_TIMEOUT => 5,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_MAXREDIRS => 2,
); );
$ch = curl_init(); $ch = curl_init();

11
webroot/imgp.php
View File

@@ -99,7 +99,14 @@ class CHttpGet
*/ */
public function parseHeader() public function parseHeader()
{ {
$header = explode("\r\n", rtrim($this->response['headerRaw'], "\r\n")); //$header = explode("\r\n", rtrim($this->response['headerRaw'], "\r\n"));
$rawHeaders = rtrim($this->response['headerRaw'], "\r\n");
# Handle multiple responses e.g. with redirections (proxies too)
$headerGroups = explode("\r\n\r\n", $rawHeaders);
# We're only interested in the last one
$header = explode("\r\n", end($headerGroups));
$output = array(); $output = array();
if ('HTTP' === substr($header[0], 0, 4)) { if ('HTTP' === substr($header[0], 0, 4)) {
@@ -136,6 +143,8 @@ class CHttpGet
CURLINFO_HEADER_OUT => $debug, CURLINFO_HEADER_OUT => $debug,
CURLOPT_CONNECTTIMEOUT => 5, CURLOPT_CONNECTTIMEOUT => 5,
CURLOPT_TIMEOUT => 5, CURLOPT_TIMEOUT => 5,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_MAXREDIRS => 2,
); );
$ch = curl_init(); $ch = curl_init();

11
webroot/imgs.php
View File

@@ -99,7 +99,14 @@ class CHttpGet
*/ */
public function parseHeader() public function parseHeader()
{ {
$header = explode("\r\n", rtrim($this->response['headerRaw'], "\r\n")); //$header = explode("\r\n", rtrim($this->response['headerRaw'], "\r\n"));
$rawHeaders = rtrim($this->response['headerRaw'], "\r\n");
# Handle multiple responses e.g. with redirections (proxies too)
$headerGroups = explode("\r\n\r\n", $rawHeaders);
# We're only interested in the last one
$header = explode("\r\n", end($headerGroups));
$output = array(); $output = array();
if ('HTTP' === substr($header[0], 0, 4)) { if ('HTTP' === substr($header[0], 0, 4)) {
@@ -136,6 +143,8 @@ class CHttpGet
CURLINFO_HEADER_OUT => $debug, CURLINFO_HEADER_OUT => $debug,
CURLOPT_CONNECTTIMEOUT => 5, CURLOPT_CONNECTTIMEOUT => 5,
CURLOPT_TIMEOUT => 5, CURLOPT_TIMEOUT => 5,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_MAXREDIRS => 2,
); );
$ch = curl_init(); $ch = curl_init();