adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/2.0' into 2.1

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-11-04 12:09:31 -04:30
commit d74b64d475
3 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Model/Datasource/DboSource.php
View file

@ -951,8 +951,6 @@ class DboSource extends DataSource {
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
$valueInsert[] = $this->value($values[$i], $model->getColumnType($fields[$i])); $valueInsert[] = $this->value($values[$i], $model->getColumnType($fields[$i]));
}
for ($i = 0; $i < $count; $i++) {
$fieldInsert[] = $this->name($fields[$i]); $fieldInsert[] = $this->name($fields[$i]);
if ($fields[$i] == $model->primaryKey) { if ($fields[$i] == $model->primaryKey) {
$id = $values[$i]; $id = $values[$i];

27
lib/Cake/Network/CakeResponse.php
View file

@ -349,20 +349,31 @@ class CakeResponse {
$codeMessage = $this->_statusCodes[$this->_status]; $codeMessage = $this->_statusCodes[$this->_status];
$this->_sendHeader("{$this->_protocol} {$this->_status} {$codeMessage}"); $this->_sendHeader("{$this->_protocol} {$this->_status} {$codeMessage}");
$this->_sendHeader('Content-Type', "{$this->_contentType}; charset={$this->_charset}"); $this->_sendHeader('Content-Type', "{$this->_contentType}; charset={$this->_charset}");
$shouldSetLength = empty($this->_headers['Content-Length']) && !in_array($this->_status, range(301, 307)); $this->_setContentLength();
if ($shouldSetLength && !$this->outputCompressed()) {
if (ini_get('mbstring.func_overload') & 2 && function_exists('mb_strlen')) {
$this->_headers['Content-Length'] = mb_strlen($this->_body, '8bit');
} else {
$this->_headers['Content-Length'] = strlen($this->_body);
}
}
foreach ($this->_headers as $header => $value) { foreach ($this->_headers as $header => $value) {
$this->_sendHeader($header, $value); $this->_sendHeader($header, $value);
} }
$this->_sendContent($this->_body); $this->_sendContent($this->_body);
} }
/**
* Calculates the correct Content-Length and sets it as a header in the response
* Will not set the value if already set or if the output is compressed.
*
* @return void
*/
protected function _setContentLength() {
$shouldSetLength = empty($this->_headers['Content-Length']) && !in_array($this->_status, range(301, 307));
if ($shouldSetLength && !$this->outputCompressed()) {
$offset = ob_get_level() ? ob_get_length() : 0;
if (ini_get('mbstring.func_overload') & 2 && function_exists('mb_strlen')) {
$this->_headers['Content-Length'] = $offset + mb_strlen($this->_body, '8bit');
} else {
$this->_headers['Content-Length'] = $offset + strlen($this->_body);
}
}
}
/** /**
* Sends a header to the client. * Sends a header to the client.
* *

17
lib/Cake/Test/Case/Network/CakeResponseTest.php
View file

@ -424,5 +424,22 @@ class CakeResponseTest extends CakeTestCase {
$response->expects($this->once())->method('_sendContent')->with($body); $response->expects($this->once())->method('_sendContent')->with($body);
$response->expects($this->exactly(2))->method('_sendHeader'); $response->expects($this->exactly(2))->method('_sendHeader');
$response->send(); $response->send();
ob_start();
$response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent'));
$goofyOutput = 'I am goofily sending output in the controller';
echo $goofyOutput;
$response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent'));
$body = '長い長い長いSubjectの場合はfoldingするのが正しいんだけどいったいどうなるんだろう？';
$response->body($body);
$response->expects($this->once())->method('_sendContent')->with($body);
$response->expects($this->at(0))
->method('_sendHeader')->with('HTTP/1.1 200 OK');
$response->expects($this->at(1))
->method('_sendHeader')->with('Content-Type', 'text/html; charset=UTF-8');
$response->expects($this->at(2))
->method('_sendHeader')->with('Content-Length', strlen($goofyOutput) + 116);
$response->send();
ob_end_clean();
} }
} }