summaryrefslogtreecommitdiffstats
path: root/application/config/config.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-31 15:16:24 +0100
committerAndrey Andreev <narf@bofh.bg>2012-10-31 15:16:24 +0100
commitf2b19fee7876708c7a7bb5cba6b7df682a9d2a53 (patch)
tree55ff9ee5bca8ed79a039108347e6ede2ff5969a8 /application/config/config.php
parentd4516e3562b1c412d7c3edea874eaa6e6922ad0e (diff)
Multiple improvements to the URI class
(thanks to @sourcejedi, PR #1326 for most of the ideas) - Renamed _detect_uri() and _parse_cli_args() to _parse_request_uri() and _parse_argv() respectively. - Added _parse_query_string() which allows us to detect the URI path from QUERY_STRING much like it is done in _parse_request_uri(). (the above changes also allow for a simpler logic in the case where the *uri_protocol* setting is not set to 'AUTO') - Updated application/config/config.php with a better list of the *uri_protocol* options. - Added _reset_query_string() to aid in re-processing from the QUERY_STRING (utilized in _parse_request_uri() and _parse_query_string()).
Diffstat (limited to 'application/config/config.php')
-rw-r--r--application/config/config.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/application/config/config.php b/application/config/config.php
index ab1508e7b..6867cee88 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -62,11 +62,12 @@ $config['index_page'] = 'index.php';
| URI string. The default setting of 'AUTO' works for most servers.
| If your links do not seem to work, try one of the other delicious flavors:
|
-| 'AUTO' Default - auto detects
-| 'PATH_INFO' Uses the PATH_INFO
-| 'QUERY_STRING' Uses the QUERY_STRING
-| 'REQUEST_URI' Uses the REQUEST_URI
-| 'ORIG_PATH_INFO' Uses the ORIG_PATH_INFO
+| 'AUTO' Default - auto detects
+| 'CLI' or 'argv' Uses $_SERVER['argv'] (for php-cli only)
+| 'REQUEST_URI' Uses $_SERVER['REQUEST_URI']
+| 'PATH_INFO' Uses $_SERVER['PATH_INFO']
+| 'QUERY_STRING' Uses $_SERVER['QUERY_STRING']
+| 'ORIG_PATH_INFO' Uses $_SERVER['ORIG_PATH_INFO']
|
*/
$config['uri_protocol'] = 'AUTO';