diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:18:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-10 14:18:31 +0200 |
| commit | 488ad40ba334ca506f07bede97724726eac2b27f (patch) | |
| tree | 7a850907271a0dd8e5461370aafcddbd63e3eec8 | |
| parent | 28d97168bf82d50440a489efda32b707fbcd1dbd (diff) | |
| parent | 656fd7eef9624c3c07918b2d573d9ccb6f971c57 (diff) | |
Merge pull request #4758 from butane/uri_scheme_case
URI schemes are not case-sensitive
| -rw-r--r-- | system/libraries/Form_validation.php | 2 | ||||
| -rw-r--r-- | system/libraries/Trackback.php | 2 | ||||
| -rw-r--r-- | system/libraries/Xmlrpc.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 04445f5b7..d5f67d1da 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1200,7 +1200,7 @@ class CI_Form_validation { { return FALSE; } - elseif ( ! in_array($matches[1], array('http', 'https'), TRUE)) + elseif ( ! in_array(strtolower($matches[1]), array('http', 'https'), TRUE)) { return FALSE; } diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php index a9b256464..7222c00c2 100644 --- a/system/libraries/Trackback.php +++ b/system/libraries/Trackback.php @@ -370,7 +370,7 @@ class CI_Trackback { { $url = trim($url); - if (strpos($url, 'http') !== 0) + if (stripos($url, 'http') !== 0) { $url = 'http://'.$url; } diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index f965858e2..181a104d0 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -352,7 +352,7 @@ class CI_Xmlrpc { */ public function server($url, $port = 80, $proxy = FALSE, $proxy_port = 8080) { - if (strpos($url, 'http') !== 0) + if (stripos($url, 'http') !== 0) { $url = 'http://'.$url; } |