Phil Sturgeon avatar Phil Sturgeon committed bdbf5de

Some servers would trick URI into thinking it was being run in CLI mode, which broke routing.

Comments (0)

Files changed (1)

system/core/URI.php

 	{
 		if (strtoupper($this->config->item('uri_protocol')) == 'AUTO')
 		{
-			// Arguments exist, it must be a command line request
-			if ( ! empty($_SERVER['argv']))
+			// Is the request coming from the command line?
+			if (defined('STDIN'))
 			{
 				$this->uri_string = $this->_parse_cli_args();
 				return;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.