Permalink
Browse files

CI_URI::_detect_uri() to accept absolute URIs

(thanks to @sourcejedi, PR #1326)

For HTTP/1.1 compliance, RFC2616 specifies that both relative
and absolute URI formats must be accepted:

- http://localhost/path/ (absolute)
- /path/ (relative)
  • Loading branch information...
1 parent 936a8fe commit d4516e3562b1c412d7c3edea874eaa6e6922ad0e @narfbg narfbg committed Oct 31, 2012
Showing with 23 additions and 21 deletions.
  1. +20 −20 system/core/URI.php
  2. +3 −1 user_guide_src/source/changelog.rst
View
@@ -185,46 +185,46 @@ protected function _detect_uri()
return '';
}
- if (strpos($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']) === 0)
- {
- $uri = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
- }
- elseif (strpos($_SERVER['REQUEST_URI'], dirname($_SERVER['SCRIPT_NAME'])) === 0)
+ $uri = parse_url($_SERVER['REQUEST_URI']);
+ $query = isset($uri['query']) ? $uri['query'] : '';
+ $uri = isset($uri['path']) ? $uri['path'] : '';
+
+ if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0)
{
- $uri = substr($_SERVER['REQUEST_URI'], strlen(dirname($_SERVER['SCRIPT_NAME'])));
+ $uri = (string) substr($uri, strlen($_SERVER['SCRIPT_NAME']));
}
- else
+ elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
{
- $uri = $_SERVER['REQUEST_URI'];
+ $uri = (string) substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME'])));
}
-
// This section ensures that even on servers that require the URI to be in the query string (Nginx) a correct
// URI is found, and also fixes the QUERY_STRING server var and $_GET array.
- if (strpos($uri, '?/') === 0)
+
+ if ($uri === '' && strncmp($query, '/', 1) === 0)
+ {
+ $query = explode('?', $query, 2);
+ $uri = $query[0];
+ $_SERVER['QUERY_STRING'] = isset($query[1]) ? $query[1] : '';
+ }
+ else
{
- $uri = substr($uri, 2);
+ $_SERVER['QUERY_STRING'] = $query;
}
- $parts = explode('?', $uri, 2);
- $uri = $parts[0];
- if (isset($parts[1]))
+ if ($_SERVER['QUERY_STRING'] === '')
{
- $_SERVER['QUERY_STRING'] = $parts[1];
- parse_str($_SERVER['QUERY_STRING'], $_GET);
+ $_GET = array();
}
else
{
- $_SERVER['QUERY_STRING'] = '';
- $_GET = array();
+ parse_str($_SERVER['QUERY_STRING'], $_GET);
}
if ($uri === '/' OR $uri === '')
{
return '/';
}
- $uri = parse_url('pseudo://hostname/'.$uri, PHP_URL_PATH);
-
// Do some final cleaning of the URI and return it
return str_replace(array('//', '../'), '/', trim($uri, '/'));
}
@@ -230,7 +230,9 @@ Release Date: Not Released
- Core
- - Changed private methods in the :doc:`URI Library <libraries/uri>` to protected so MY_URI can override them.
+ - :doc:`URI Library <libraries/uri>` changes include:
+ - Changed private methods to protected so that MY_URI can override them.
+ - Changed ``_detect_uri()`` to accept absolute URIs for compatibility with HTTP/1.1 as per `RFC2616 <http://www.ietf.org/rfc/rfc2616.txt>`.
- Removed ``CI_CORE`` boolean constant from *CodeIgniter.php* (no longer Reactor and Core versions).
- :doc:`Loader Library <libraries/loader>` changes include:
- Added method ``get_vars()`` to the Loader to retrieve all variables loaded with ``$this->load->vars()``.

0 comments on commit d4516e3

Please sign in to comment.