diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-14 13:15:25 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-14 13:15:25 +0200 |
| commit | 4e220ec391514fbdeaa7d64abfd1752a9b44bbaa (patch) | |
| tree | 1cb3cb621221e948be9e0e91916aac0dd6fccb0e /include/network.php | |
| parent | 572678fef95816deaa1ecafe5cbcfb8cc65963c9 (diff) | |
| parent | 0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e (diff) | |
| download | volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.tar.gz volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.tar.bz2 volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/network.php b/include/network.php index 23ef50b21..8c678a443 100644 --- a/include/network.php +++ b/include/network.php @@ -587,13 +587,14 @@ function fetch_xrd_links($url) { if(! function_exists('validate_url')) { function validate_url(&$url) { - // no naked subdomains - if(strpos($url,'.') === false) + + // no naked subdomains (allow localhost for tests) + if(strpos($url,'.') === false && strpos($url,'/localhost/') === false) return false; if(substr($url,0,4) != 'http') $url = 'http://' . $url; $h = @parse_url($url); - + if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR))) { return true; } |