Skip to content
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

Jump to bottom

remove absolute URI from $_SERVER['REQUEST_URI'] (issue #91) #93

Merged
merged 3 commits into from Jun 17, 2016
Merged

remove absolute URI from $_SERVER['REQUEST_URI'] (issue #91) #93

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7585262
remove absolute URI from $_SERVER['REQUEST_URI'] (issue #91)
May 6, 2016
f980a19
remove absolute URI from $_SERVER['REQUEST_URI'] (issue #91)
May 6, 2016
1ff0068
remove absolute URI from $_SERVER['REQUEST_URI'] (issue #91)
May 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Http/RequestFactory.php
View file
Open in desktop
Expand Up @@ -81,7 +81,7 @@ public function createHttpRequest()
}

// path & query
$requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
$requestUrl = isset($_SERVER['REQUEST_URI']) ? Strings::replace($_SERVER['REQUEST_URI'], '#^\w+://[^/]+#i') : '/';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better to make it more readable by splitting it into lines.

$requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
$requestUrl = Strings::replace($requestUrl, '#^\w+://[^/]+#i');

The pattern could be optimized by removing pointless case-insensitive flag and avoiding any possible backtracking

$requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
$requestUrl = Strings::replace($requestUrl, '#^\w++://[^/]++#');

With removed backtracking, we may probably replace Strings::replace with faster preg_replace

$requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
$requestUrl = preg_replace('#^\w++://[^/]++#', '', $requestUrl);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, you're right. I have modified it. Thanks.

$requestUrl = Strings::replace($requestUrl, $this->urlFilters['url']);
$tmp = explode('?', $requestUrl, 2);
$path = Url::unescape($tmp[0], '%/?#');
Expand Down