summaryrefslogtreecommitdiff
path: root/vendor/symfony/http-foundation/Response.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2017-10-16 14:56:14 +0100
committerGreg Roach <fisharebest@gmail.com>2017-10-16 14:56:14 +0100
commit542cb0023a05d14b3bf09a1c6c99f99b4256eaa2 (patch)
treef56893fcd67f4f1c8c7da08f9344702d3b471852 /vendor/symfony/http-foundation/Response.php
parent14b849be814811cd4d8ef5390813857fac9669da (diff)
downloadwebtrees-542cb0023a05d14b3bf09a1c6c99f99b4256eaa2.tar.gz
webtrees-542cb0023a05d14b3bf09a1c6c99f99b4256eaa2.tar.bz2
webtrees-542cb0023a05d14b3bf09a1c6c99f99b4256eaa2.zip
Update vendor code
Diffstat (limited to 'vendor/symfony/http-foundation/Response.php')
-rw-r--r--vendor/symfony/http-foundation/Response.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/vendor/symfony/http-foundation/Response.php b/vendor/symfony/http-foundation/Response.php
index 4af1e0bae2..ced0afa6ca 100644
--- a/vendor/symfony/http-foundation/Response.php
+++ b/vendor/symfony/http-foundation/Response.php
@@ -187,8 +187,6 @@ class Response
);
/**
- * Constructor.
- *
* @param mixed $content The response content, see setContent()
* @param int $status The response status code
* @param array $headers An array of response headers
@@ -455,12 +453,12 @@ class Response
/**
* Sets the response status code.
*
- * @param int $code HTTP status code
- * @param mixed $text HTTP status text
- *
* If the status text is null it will be automatically populated for the known
* status codes and left empty otherwise.
*
+ * @param int $code HTTP status code
+ * @param mixed $text HTTP status text
+ *
* @return $this
*
* @throws \InvalidArgumentException When the HTTP status code is not valid
@@ -1261,7 +1259,7 @@ class Response
// PHP_OUTPUT_HANDLER_* are not defined on HHVM 3.3
$flags = defined('PHP_OUTPUT_HANDLER_REMOVABLE') ? PHP_OUTPUT_HANDLER_REMOVABLE | ($flush ? PHP_OUTPUT_HANDLER_FLUSHABLE : PHP_OUTPUT_HANDLER_CLEANABLE) : -1;
- while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || $flags === ($s['flags'] & $flags) : $s['del'])) {
+ while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || ($s['flags'] & $flags) === $flags : $s['del'])) {
if ($flush) {
ob_end_flush();
} else {
@@ -1279,7 +1277,7 @@ class Response
*/
protected function ensureIEOverSSLCompatibility(Request $request)
{
- if (false !== stripos($this->headers->get('Content-Disposition'), 'attachment') && preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT'), $match) == 1 && true === $request->isSecure()) {
+ if (false !== stripos($this->headers->get('Content-Disposition'), 'attachment') && 1 == preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT'), $match) && true === $request->isSecure()) {
if ((int) preg_replace('/(MSIE )(.*?);/', '$2', $match[0]) < 9) {
$this->headers->remove('Cache-Control');
}