diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-02-03 07:24:58 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-02-03 07:24:58 +0100 |
| commit | 97bb80c00f4106d63d730f6bcaebf9e4aa247c01 (patch) | |
| tree | 43bfb9aa3f85c3b7c2ec19ad72fece95f745ce4d /boot.php | |
| parent | a3fd84661f74b0759f9edad1f068b32820b03c5d (diff) | |
| parent | 0a32370e32b068073010d1d6b33241867c3be4d7 (diff) | |
| download | volse-hubzilla-97bb80c00f4106d63d730f6bcaebf9e4aa247c01.tar.gz volse-hubzilla-97bb80c00f4106d63d730f6bcaebf9e4aa247c01.tar.bz2 volse-hubzilla-97bb80c00f4106d63d730f6bcaebf9e4aa247c01.zip | |
Merge branch 'friendika-master'
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -3,8 +3,8 @@ set_time_limit(0); define ( 'BUILD_ID', 1034 ); -define ( 'FRIENDIKA_VERSION', '2.10.0902' ); -define ( 'DFRN_PROTOCOL_VERSION', '2.0' ); +define ( 'FRIENDIKA_VERSION', '2.10.0903' ); +define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -1366,6 +1366,7 @@ function lrdd($uri) { else { $html = fetch_url($uri); $headers = $a->get_curl_headers(); + logger('lrdd: headers=' . $headers, LOGGER_DEBUG); $lines = explode("\n",$headers); if(count($lines)) { foreach($lines as $line) { @@ -1377,6 +1378,8 @@ function lrdd($uri) { // don't try and run feeds through the html5 parser if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml')))) return array(); + if(stristr($html,'<rss') || stristr($html,'<feed')) + return array(); } } if(! isset($link)) { |