diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-19 09:58:07 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-19 09:58:07 +0100 |
| commit | 8fbde780b37e3d5eeb2ee672a3474b3701eb9645 (patch) | |
| tree | f0519a2e726dbf4f659260e3c2e717874441981b /boot.php | |
| parent | 878bdeccfd66b7b8229fd761c23ba13bc51c7454 (diff) | |
| parent | 7e33c1072a4a948941e2522afe0123899b0abddd (diff) | |
| download | volse-hubzilla-8fbde780b37e3d5eeb2ee672a3474b3701eb9645.tar.gz volse-hubzilla-8fbde780b37e3d5eeb2ee672a3474b3701eb9645.tar.bz2 volse-hubzilla-8fbde780b37e3d5eeb2ee672a3474b3701eb9645.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.921' ); +define ( 'FRIENDIKA_VERSION', '2.1.922' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1043 ); @@ -1603,9 +1603,15 @@ function lrdd($uri) { if(! function_exists('fetch_lrdd_template')) { function fetch_lrdd_template($host) { $tpl = ''; - $url = 'http://' . $host . '/.well-known/host-meta' ; - $links = fetch_xrd_links($url); -logger('template: ' . print_r($links,true)); + + $url1 = 'https://' . $host . '/.well-known/host-meta' ; + $url2 = 'http://' . $host . '/.well-known/host-meta' ; + $links = fetch_xrd_links($url1); + logger('template (https): ' . print_r($links,true)); + if(! count($links)) { + $links = fetch_xrd_links($url2); + logger('template (http): ' . print_r($links,true)); + } if(count($links)) { foreach($links as $link) if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd') |