From 1557cefbd76257ceb830f65806831b490faf0acc Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Mon, 4 Jan 2016 10:45:54 +0100
Subject: Fixes #410 - Retrieve title fails in multiple cases
* `get_http_url()` renamed to `get_http_response()`.
* Use the same HTTP context to retrieve response headers and content.
* Follow HTTP 301 and 302 redirections to retrieve the title (default max 3 redirections).
* Add `LinkUtils` to extract titles and charset.
* Try to retrieve charset from HTTP headers first (new), then HTML content.
* Use mb_string to re-encode title if necessary.
---
tests/HttpUtils/GetHttpUrlTest.php | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
(limited to 'tests/HttpUtils/GetHttpUrlTest.php')
diff --git a/tests/HttpUtils/GetHttpUrlTest.php b/tests/HttpUtils/GetHttpUrlTest.php
index 76092b80..fd293505 100644
--- a/tests/HttpUtils/GetHttpUrlTest.php
+++ b/tests/HttpUtils/GetHttpUrlTest.php
@@ -6,7 +6,7 @@
require_once 'application/HttpUtils.php';
/**
- * Unitary tests for get_http_url()
+ * Unitary tests for get_http_response()
*/
class GetHttpUrlTest extends PHPUnit_Framework_TestCase
{
@@ -15,12 +15,15 @@ class GetHttpUrlTest extends PHPUnit_Framework_TestCase
*/
public function testGetInvalidLocalUrl()
{
- list($headers, $content) = get_http_url('/non/existent', 1);
- $this->assertEquals('HTTP Error', $headers[0]);
- $this->assertRegexp(
- '/failed to open stream: No such file or directory/',
- $content
- );
+ // Local
+ list($headers, $content) = get_http_response('/non/existent', 1);
+ $this->assertEquals('Invalid HTTP Url', $headers[0]);
+ $this->assertFalse($content);
+
+ // Non HTTP
+ list($headers, $content) = get_http_response('ftp://save.tld/mysave', 1);
+ $this->assertEquals('Invalid HTTP Url', $headers[0]);
+ $this->assertFalse($content);
}
/**
@@ -28,11 +31,8 @@ class GetHttpUrlTest extends PHPUnit_Framework_TestCase
*/
public function testGetInvalidRemoteUrl()
{
- list($headers, $content) = get_http_url('http://non.existent', 1);
- $this->assertEquals('HTTP Error', $headers[0]);
- $this->assertRegexp(
- '/Name or service not known/',
- $content
- );
+ list($headers, $content) = @get_http_response('http://non.existent', 1);
+ $this->assertFalse($headers);
+ $this->assertFalse($content);
}
}
--
cgit v1.2.3