GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

ftps protocol should be handled the same way as ftp

Browse Source 
Canon urls that have a protocol followed by a host (and no path) automatcally get a trailing slash by the canon function - make the unit test match that
This commit is contained in:
Craig Andrews 2009-08-24 20:44:06 -04:00
parent ab2f6fb860
commit 9fd3a41576
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/File_redirection.php
View File

@ -182,7 +182,7 @@ class File_redirection extends Memcached_DataObject
} }
} }
if (('ftp' == $p['scheme']) || ('http' == $p['scheme']) || ('https' == $p['scheme'])) { if (('ftp' == $p['scheme']) || ('ftps' == $p['scheme']) || ('http' == $p['scheme']) || ('https' == $p['scheme'])) {
if (empty($p['host'])) return false; if (empty($p['host'])) return false;
if (empty($p['path'])) { if (empty($p['path'])) {
$out_url .= '/'; $out_url .= '/';

24
tests/URLDetectionTest.php
View File

@ -28,27 +28,27 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
array('example', array('example',
'example'), 'example'),
array('http://example', array('http://example',
'http://example'), '<a href="http://example/" rel="external">http://example</a>'),
array('http://example/', array('http://example/',
'http://example/'), '<a href="http://example/" rel="external">http://example/</a>'),
array('http://example/path', array('http://example/path',
'http://example/path'), '<a href="http://example/path" rel="external">http://example/path</a>'),
array('http://example.com', array('http://example.com',
'<a href="http://example.com" rel="external">http://example.com</a>'), '<a href="http://example.com/" rel="external">http://example.com</a>'),
array('https://example.com', array('https://example.com',
'<a href="https://example.com" rel="external">https://example.com</a>'), '<a href="https://example.com/" rel="external">https://example.com</a>'),
array('ftp://example.com', array('ftp://example.com',
'<a href="ftp://example.com" rel="external">ftp://example.com</a>'), '<a href="ftp://example.com/" rel="external">ftp://example.com</a>'),
array('ftps://example.com', array('ftps://example.com',
'<a href="ftps://example.com" rel="external">ftps://example.com</a>'), '<a href="ftps://example.com/" rel="external">ftps://example.com</a>'),
array('http://user@example.com', array('http://user@example.com',
'<a href="http://user@example.com" rel="external">http://user@example.com</a>'), '<a href="http://user@example.com/" rel="external">http://user@example.com</a>'),
array('http://user:pass@example.com', array('http://user:pass@example.com',
'<a href="http://user:pass@example.com" rel="external">http://user:pass@example.com</a>'), '<a href="http://user:pass@example.com/" rel="external">http://user:pass@example.com</a>'),
array('http://example.com:8080', array('http://example.com:8080',
'<a href="http://example.com:8080" rel="external">http://example.com:8080</a>'), '<a href="http://example.com:8080/" rel="external">http://example.com:8080</a>'),
array('http://www.example.com', array('http://www.example.com',
'<a href="http://www.example.com" rel="external">http://www.example.com</a>'), '<a href="http://www.example.com/" rel="external">http://www.example.com</a>'),
array('http://example.com/', array('http://example.com/',
'<a href="http://example.com/" rel="external">http://example.com/</a>'), '<a href="http://example.com/" rel="external">http://example.com/</a>'),
array('http://example.com/path', array('http://example.com/path',
@ -58,7 +58,7 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
array('http://example.com/path.html#fragment', array('http://example.com/path.html#fragment',
'<a href="http://example.com/path.html#fragment" rel="external">http://example.com/path.html#fragment</a>'), '<a href="http://example.com/path.html#fragment" rel="external">http://example.com/path.html#fragment</a>'),
array('http://example.com/path.php?foo=bar&bar=foo', array('http://example.com/path.php?foo=bar&bar=foo',
'<a href="http://example.com/path.php?foo=bar&bar=foo" rel="external">http://example.com/path.php?foo=bar&bar=foo</a>'), '<a href="http://example.com/path.php?foo=bar&amp;bar=foo" rel="external">http://example.com/path.php?foo=bar&amp;bar=foo</a>'),
array('http://müllärör.de', array('http://müllärör.de',
'<a href="http://müllärör.de" rel="external">http://müllärör.de</a>'), '<a href="http://müllärör.de" rel="external">http://müllärör.de</a>'),
array('http://ﺱﺲﺷ.com', array('http://ﺱﺲﺷ.com',