Revert "fixed link generation when doing sub-requests"
This reverts commit f8ba68332f
.
This commit is contained in:
parent
f8ba68332f
commit
e983029ddc
@ -2,8 +2,6 @@
|
|||||||
|
|
||||||
namespace Symfony\Components\RequestHandler;
|
namespace Symfony\Components\RequestHandler;
|
||||||
|
|
||||||
use Symfony\Components\RequestHandler\Cache\CacheControl;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This file is part of the Symfony package.
|
* This file is part of the Symfony package.
|
||||||
*
|
*
|
||||||
@ -45,7 +43,6 @@ class Request
|
|||||||
protected $basePath;
|
protected $basePath;
|
||||||
protected $method;
|
protected $method;
|
||||||
protected $format;
|
protected $format;
|
||||||
protected $cacheControl;
|
|
||||||
|
|
||||||
static protected $formats;
|
static protected $formats;
|
||||||
|
|
||||||
@ -83,10 +80,9 @@ class Request
|
|||||||
$this->path = new RequestBag(null !== $path ? $path : array());
|
$this->path = new RequestBag(null !== $path ? $path : array());
|
||||||
$this->cookies = new RequestBag(null !== $cookies ? $cookies : $_COOKIE);
|
$this->cookies = new RequestBag(null !== $cookies ? $cookies : $_COOKIE);
|
||||||
$this->files = new RequestBag($this->convertFileInformation(null !== $files ? $files : $_FILES));
|
$this->files = new RequestBag($this->convertFileInformation(null !== $files ? $files : $_FILES));
|
||||||
$this->server = new NormalizedRequestBag(null !== $server ? $server : $_SERVER);
|
$this->server = new RequestBag(null !== $server ? $server : $_SERVER);
|
||||||
$this->headers = new NormalizedRequestBag($this->initializeHeaders());
|
$this->headers = new RequestBag($this->initializeHeaders());
|
||||||
|
|
||||||
$this->cacheControl = null;
|
|
||||||
$this->languages = null;
|
$this->languages = null;
|
||||||
$this->charsets = null;
|
$this->charsets = null;
|
||||||
$this->acceptableContentTypes = null;
|
$this->acceptableContentTypes = null;
|
||||||
@ -140,14 +136,13 @@ class Request
|
|||||||
'HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.5',
|
'HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.5',
|
||||||
'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
|
'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
|
||||||
'REMOTE_ADDR' => '127.0.0.1',
|
'REMOTE_ADDR' => '127.0.0.1',
|
||||||
'SCRIPT_NAME' => '',
|
|
||||||
'SCRIPT_FILENAME' => '',
|
|
||||||
), $server, array(
|
|
||||||
'REQUEST_METHOD' => strtoupper($method),
|
'REQUEST_METHOD' => strtoupper($method),
|
||||||
'PATH_INFO' => '',
|
'PATH_INFO' => '',
|
||||||
'REQUEST_URI' => $uri,
|
'REQUEST_URI' => $uri,
|
||||||
|
'SCRIPT_NAME' => '',
|
||||||
|
'SCRIPT_FILENAME' => '',
|
||||||
'QUERY_STRING' => $queryString,
|
'QUERY_STRING' => $queryString,
|
||||||
));
|
), $server);
|
||||||
|
|
||||||
return new self($request, $query, array(), $cookies, $files, $server);
|
return new self($request, $query, array(), $cookies, $files, $server);
|
||||||
}
|
}
|
||||||
@ -430,43 +425,6 @@ class Request
|
|||||||
return $this->format;
|
return $this->format;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function isMethodSafe()
|
|
||||||
{
|
|
||||||
return in_array(strtolower($this->getMethod()), array('get', 'head'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getCacheControl()
|
|
||||||
{
|
|
||||||
if (null === $this->cacheControl)
|
|
||||||
{
|
|
||||||
$this->cacheControl = new CacheControl($this->headers->get('CACHE_CONTROL'));
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->cacheControl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function isNoCache()
|
|
||||||
{
|
|
||||||
return $this->getCacheControl()->isNoCache() || 'no-cache' == $this->headers->get('PRAGMA');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Determine if the #response validators (ETag, Last-Modified) matches
|
|
||||||
// a conditional value specified in #request.
|
|
||||||
public function doesResponseMatch(Response $response)
|
|
||||||
{
|
|
||||||
$lastModified = $this->headers->get('if_modified_since');
|
|
||||||
if ($etags = $this->headers->get('if_none_match'))
|
|
||||||
{
|
|
||||||
$etags = preg_split('/\s*,\s*/', $etags);
|
|
||||||
|
|
||||||
return (in_array($response->getEtag(), $etags) || in_array('*', $etags)) && (!$lastModified || $response->getLastModified() == $lastModified);
|
|
||||||
}
|
|
||||||
elseif ($lastModified)
|
|
||||||
{
|
|
||||||
return $lastModified == $response->getLastModified();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the preferred language.
|
* Returns the preferred language.
|
||||||
*
|
*
|
||||||
@ -823,9 +781,9 @@ class Request
|
|||||||
$headers = array();
|
$headers = array();
|
||||||
foreach ($this->server->all() as $key => $value)
|
foreach ($this->server->all() as $key => $value)
|
||||||
{
|
{
|
||||||
if ('http-' === strtolower(substr($key, 0, 5)))
|
if ('http_' === strtolower(substr($key, 0, 5)))
|
||||||
{
|
{
|
||||||
$headers[substr($key, 5)] = $value;
|
$headers[strtoupper(strtr(substr($key, 5), '-', '_'))] = $value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,22 +43,26 @@ class RequestParser
|
|||||||
|
|
||||||
public function resolve(Event $event)
|
public function resolve(Event $event)
|
||||||
{
|
{
|
||||||
|
if (!$event->getParameter('main_request'))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$request = $event->getParameter('request');
|
$request = $event->getParameter('request');
|
||||||
|
|
||||||
// set the context even if the parsing does not need to be done
|
$this->container->setParameter('request.base_path', $request->getBasePath());
|
||||||
// to have correct link generation
|
|
||||||
|
if ($request->path->get('_bundle'))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$this->router->setContext(array(
|
$this->router->setContext(array(
|
||||||
'base_url' => $request->getBaseUrl(),
|
'base_url' => $request->getBaseUrl(),
|
||||||
'method' => $request->getMethod(),
|
'method' => $request->getMethod(),
|
||||||
'host' => $request->getHost(),
|
'host' => $request->getHost(),
|
||||||
'is_secure' => $request->isSecure(),
|
'is_secure' => $request->isSecure(),
|
||||||
));
|
));
|
||||||
$this->container->setParameter('request.base_path', $request->getBasePath());
|
|
||||||
|
|
||||||
if (!$event->getParameter('main_request') || $request->path->has('_bundle'))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (false !== $parameters = $this->router->match($request->getPathInfo()))
|
if (false !== $parameters = $this->router->match($request->getPathInfo()))
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user