Browse Source

Renamed HeaderCollection::addDefault to setDefault.

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
0b8d239ad3
  1. 4
      framework/yii/web/HeaderCollection.php
  2. 38
      framework/yii/web/Response.php

4
framework/yii/web/HeaderCollection.php

@ -104,13 +104,13 @@ class HeaderCollection extends Object implements \IteratorAggregate, \ArrayAcces
} }
/** /**
* Adds a new header only if it does not exist yet. * Sets a new header only if it does not exist yet.
* If there is already a header with the same name, the new one will be ignored. * If there is already a header with the same name, the new one will be ignored.
* @param string $name the name of the header * @param string $name the name of the header
* @param string $value the value of the header * @param string $value the value of the header
* @return HeaderCollection the collection object itself * @return HeaderCollection the collection object itself
*/ */
public function addDefault($name, $value) public function setDefault($name, $value)
{ {
$name = strtolower($name); $name = strtolower($name);
if (empty($this->_headers[$name])) { if (empty($this->_headers[$name])) {

38
framework/yii/web/Response.php

@ -309,14 +309,14 @@ class Response extends \yii\base\Response
throw new HttpException(416, Yii::t('yii', 'Requested range not satisfiable')); throw new HttpException(416, Yii::t('yii', 'Requested range not satisfiable'));
} }
$headers->addDefault('Pragma', 'public') $headers->setDefault('Pragma', 'public')
->addDefault('Accept-Ranges', 'bytes') ->setDefault('Accept-Ranges', 'bytes')
->addDefault('Expires', '0') ->setDefault('Expires', '0')
->addDefault('Content-Type', $mimeType) ->setDefault('Content-Type', $mimeType)
->addDefault('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') ->setDefault('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->addDefault('Content-Transfer-Encoding', 'binary') ->setDefault('Content-Transfer-Encoding', 'binary')
->addDefault('Content-Length', StringHelper::strlen($content)) ->setDefault('Content-Length', StringHelper::strlen($content))
->addDefault('Content-Disposition', "attachment; filename=\"$attachmentName\""); ->setDefault('Content-Disposition', "attachment; filename=\"$attachmentName\"");
list($begin, $end) = $range; list($begin, $end) = $range;
if ($begin !=0 || $end != $contentLength - 1) { if ($begin !=0 || $end != $contentLength - 1) {
@ -360,14 +360,14 @@ class Response extends \yii\base\Response
$length = $end - $begin + 1; $length = $end - $begin + 1;
$headers->addDefault('Pragma', 'public') $headers->setDefault('Pragma', 'public')
->addDefault('Accept-Ranges', 'bytes') ->setDefault('Accept-Ranges', 'bytes')
->addDefault('Expires', '0') ->setDefault('Expires', '0')
->addDefault('Content-Type', $mimeType) ->setDefault('Content-Type', $mimeType)
->addDefault('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') ->setDefault('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->addDefault('Content-Transfer-Encoding', 'binary') ->setDefault('Content-Transfer-Encoding', 'binary')
->addDefault('Content-Length', $length) ->setDefault('Content-Length', $length)
->addDefault('Content-Disposition', "attachment; filename=\"$attachmentName\""); ->setDefault('Content-Disposition', "attachment; filename=\"$attachmentName\"");
$this->send(); $this->send();
@ -478,9 +478,9 @@ class Response extends \yii\base\Response
} }
$this->getHeaders() $this->getHeaders()
->addDefault($xHeader, $filePath) ->setDefault($xHeader, $filePath)
->addDefault('Content-Type', $mimeType) ->setDefault('Content-Type', $mimeType)
->addDefault('Content-Disposition', "attachment; filename=\"$attachmentName\""); ->setDefault('Content-Disposition', "attachment; filename=\"$attachmentName\"");
$this->send(); $this->send();
} }

Loading…
Cancel
Save