diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-09-25 15:56:44 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-09-25 15:56:44 +0200 |
| commit | 3870e430b1001b6a2adfa6dd228420392485488a (patch) | |
| tree | ebbcddb38d2f60f64c138dcdee6ebe8ea6a25067 | |
| parent | 74f9aa310d301cbec18040975bdb1b7e03a99b24 (diff) | |
| parent | a37484fd2fee58d48d8e58535b34d8c63352c51e (diff) | |
Merge pull request #1265 from Alkarex/SimplePie-autodiscovery-xml
Fix SimplePie autodiscovery for text/xml HTML pages
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | lib/SimplePie/SimplePie/Content/Type/Sniffer.php | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a1fe033bc..f13922837 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ * Support custom ports `localhost:3306` for database servers [#1241](https://github.com/FreshRSS/FreshRSS/issues/1241) * Bug fixing * Correction of bugs related CSRF tokens introduced in version 1.5.0 [#1253](https://github.com/FreshRSS/FreshRSS/issues/1253), [44f22ab](https://github.com/FreshRSS/FreshRSS/pull/1261/commits/d9bf9b2c6f0b2cc9dec3b638841b7e3040dcf46f) +* SimplePie + * Fix auto-discovery of RSS feeds in Web pages served as `text/xml` [#1264](https://github.com/FreshRSS/FreshRSS/issues/1264) * Security * Prevent `<a target="_blank">` attacks with `window.opener` [#1245](https://github.com/FreshRSS/FreshRSS/issues/1245) * UI diff --git a/lib/SimplePie/SimplePie/Content/Type/Sniffer.php b/lib/SimplePie/SimplePie/Content/Type/Sniffer.php index a32f47f59..daec3607d 100644 --- a/lib/SimplePie/SimplePie/Content/Type/Sniffer.php +++ b/lib/SimplePie/SimplePie/Content/Type/Sniffer.php @@ -109,9 +109,7 @@ class SimplePie_Content_Type_Sniffer { return $this->unknown(); } - elseif (substr($official, -4) === '+xml' - || $official === 'text/xml' - || $official === 'application/xml') + elseif (substr($official, -4) === '+xml') { return $official; } @@ -126,7 +124,9 @@ class SimplePie_Content_Type_Sniffer return $official; } } - elseif ($official === 'text/html') + elseif ($official === 'text/html' + || $official === 'text/xml' + || $official === 'application/xml') { return $this->feed_or_html(); } |