- Patch #499774 by jbrauer: support use of feed:// URLs as synonyms for http:// in core.
parent
757a3ca173
commit
f88676a590
|
@ -792,6 +792,7 @@ function drupal_http_request($url, array $options = array()) {
|
|||
|
||||
switch ($uri['scheme']) {
|
||||
case 'http':
|
||||
case 'feed':
|
||||
$port = isset($uri['port']) ? $uri['port'] : 80;
|
||||
$host = $uri['host'] . ($port != 80 ? ':' . $port : '');
|
||||
$fp = @fsockopen($uri['host'], $port, $errno, $errstr, $options['timeout']);
|
||||
|
@ -1071,7 +1072,7 @@ function valid_url($url, $absolute = FALSE) {
|
|||
if ($absolute) {
|
||||
return (bool)preg_match("
|
||||
/^ # Start at the beginning of the text
|
||||
(?:ftp|https?):\/\/ # Look for ftp, http, or https schemes
|
||||
(?:ftp|https?|feed):\/\/ # Look for ftp, http, https or feed schemes
|
||||
(?: # Userinfo (optional) which is typically
|
||||
(?:(?:[\w\.\-\+!$&'\(\)*\+,;=]|%[0-9a-f]{2})+:)* # a username or a username and password
|
||||
(?:[\w\.\-\+%!$&'\(\)*\+,;=]|%[0-9a-f]{2})+@ # combination
|
||||
|
|
Loading…
Reference in New Issue