Merge branch 'HTTPS_Everywhere' into dev

pull/1150/head
Alexandre Alapetite 9 years ago
commit 00fd6b5965
  1. 2
      lib/SimplePie/SimplePie.php
  2. 7
      lib/SimplePie/SimplePie/Sanitize.php

@ -1236,7 +1236,7 @@ class SimplePie
/** /**
* Set the list of domains for which force HTTPS. * Set the list of domains for which force HTTPS.
* @see SimplePie_Misc::https_url() * @see SimplePie_Sanitize::set_https_domains()
* FreshRSS * FreshRSS
*/ */
public function set_https_domains($domains = array()) public function set_https_domains($domains = array())

@ -75,11 +75,12 @@ class SimplePie_Sanitize
/** /**
* List of domains for which force HTTPS. * List of domains for which force HTTPS.
* @see SimplePie_Misc::https_url() * @see SimplePie_Sanitize::set_https_domains()
* Array is tree split at DNS levels. Example array('biz' => true, 'com' => array('example' => true), 'example' => array('test') => array('www' => true)); * Array is tree split at DNS levels. Example:
* array('biz' => true, 'com' => array('example' => true), 'net' => array('example') => array('www' => true))
* FreshRSS * FreshRSS
*/ */
var $https_domains = array('com' => array('youtube' => true)); var $https_domains = array('com' => array('dailymotion' => true, 'youtube' => true));
public function __construct() public function __construct()
{ {

Loading…
Cancel
Save