diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch stof/subrequest_fix (PR #2208)

Browse Source 
Commits
-------

ab8e760 Fixed the creation of the subrequests

Discussion
----------

Fixed the creation of the subrequests

The subrequest must be created using an absolute path to keep the
informations about the host and the base path.
Closes #2168
This commit is contained in:
Fabien Potencier 2011-09-18 09:41:15 +02:00
commit 2d4cb2e99c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
View File

@ -124,7 +124,7 @@ class HttpKernel extends BaseHttpKernel
// controller or URI?
if (0 === strpos($controller, '/')) {
$subRequest = Request::create($controller, 'get', array(), $request->cookies->all(), array(), $request->server->all());
$subRequest = Request::create($request->getUriForPath($controller), 'get', array(), $request->cookies->all(), array(), $request->server->all());
$subRequest->setSession($request->getSession());
} else {
$options['attributes']['_controller'] = $controller;

3
src/Symfony/Component/Security/Http/HttpUtils.php
View File

@ -71,6 +71,9 @@ class HttpUtils
$this->resetLocale($request);
$path = $this->generateUrl($path, true);
}
if (0 !== strpos($path, 'http')) {
$path = $request->getUriForPath($path);
}
$newRequest = Request::create($path, 'get', array(), $request->cookies->all(), array(), $request->server->all());
if ($session = $request->getSession()) {