8000 [DependencyInjection] Allow frozen containers to be dumped to graphviz (2.1 merge) by igorw · Pull Request #7018 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DependencyInjection] Allow frozen containers to be dumped to graphviz (2.1 merge) #7018

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

Closed
wants to merge 7 commits into from
Closed

[DependencyInjection] Allow frozen containers to be dumped to graphviz (2.1 merge) #7018

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ddf4678
[HttpFoundation] fixed the creation of sub-requests under some circum…
fabpot Feb 4, 2013
4b30ae6
merged branch fabpot/request-uti-fix (PR #6966)
fabpot Feb 7, 2013
a12744e
Add dot character `.` to legal mime subtype regular expression
romainneutron Feb 7, 2013
7a35cb7
merged branch romainneutron/file-binary-guesser (PR #7006)
fabpot Feb 7, 2013
bd0ad92
[DependencyInjection] Allow frozen containers to be dumped to graphviz
igorw Feb 7, 2013
e0d9cd5
Merge remote-tracking branch 'upstream/2.1' into graphviz-frozen-cont…
igorw Feb 7, 2013
3b7e37f
[DependencyInjection] Add clone for resources which were introduced i…
igorw Feb 7, 2013
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: 8 additions & 0 deletions src/Symfony/Component/HttpFoundation/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,12 +1201,16 @@ protected function prepareRequestUri()
if ($this->headers->has('X_ORIGINAL_URL') && false !== stripos(PHP_OS, 'WIN')) {
// IIS with Microsoft Rewrite Module
$requestUri = $this->headers->get('X_ORIGINAL_URL');
$this->headers->remove('X_ORIGINAL_URL');
} elseif ($this->headers->has('X_REWRITE_URL') && false !== stripos(PHP_OS, 'WIN')) {
// IIS with ISAPI_Rewrite
$requestUri = $this->headers->get('X_REWRITE_URL');
$this->headers->remove('X_REWRITE_URL');
} elseif ($this->server->get('IIS_WasUrlRewritten') == '1' && $this->server->get('UNENCODED_URL') != '') {
// IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem)
$requestUri = $this->server->get('UNENCODED_URL');
$this->server->remove('UNENCODED_URL');
$this->server->remove('IIS_WasUrlRewritten');
} elseif ($this->server->has('REQUEST_URI')) {
$requestUri = $this->server->get('REQUEST_URI');
// HTTP proxy reqs setup request uri with scheme and host [and port] + the url path, only use url path
Expand All @@ -1220,8 +1224,12 @@ protected function prepareRequestUri()
if ($this->server->get('QUERY_STRING')) {
$requestUri .= '?'.$this->server->get('QUERY_STRING');
}
$this->server->remove('ORIG_PATH_INFO');
}

// normalize the request URI to ease creating sub-requests from this request
$this->server->set('REQUEST_URI', $requestUri);

return $requestUri;
}

Expand Down
0