Skip to content

Use Input to retrieve $_SERVER information #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbabker merged 1 commit into from
Jul 17, 2015
Merged

Use Input to retrieve $_SERVER information #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/AbstractWebApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,16 +705,18 @@ protected function loadSystemUris($requestUri = null)
// Start with the requested URI.
$uri = new Uri($this->get('uri.request'));

$requestUri = $this->input->server->getString('REQUEST_URI', '');

// If we are working from a CGI SAPI with the 'cgi.fix_pathinfo' directive disabled we use PHP_SELF.
if (strpos(php_sapi_name(), 'cgi') !== false && !ini_get('cgi.fix_pathinfo') && !empty($_SERVER['REQUEST_URI']))
if (strpos(php_sapi_name(), 'cgi') !== false && !ini_get('cgi.fix_pathinfo') && !empty($requestUri))
{
// We aren't expecting PATH_INFO within PHP_SELF so this should work.
$path = dirname($_SERVER['PHP_SELF']);
$path = dirname($this->input->server->getString('PHP_SELF', ''));
}
else
// Pretty much everything else should be handled with SCRIPT_NAME.
{
$path = dirname($_SERVER['SCRIPT_NAME']);
$path = dirname($this->input->server->getString('SCRIPT_NAME', ''));
}
}

Expand Down