adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating EmailComponent smtp HELO handling to account for non-existence of HTTP_HOST environment variable when PHP SAPI is CLI. Fixes #41.

Browse source
This commit is contained in:
jperras 2009-09-06 19:49:50 -04:00
parent 2484179e36
commit 4dc656fd91
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/controller/components/email.php
View file

@ -680,10 +680,14 @@ class EmailComponent extends Object{
return false;
}
$httpHost = env('HTTP_HOST');
if (isset($this->smtpOptions['client'])) {
$host = $this->smtpOptions['client'];
} elseif (!empty($httpHost)) {
$host = $httpHost;
} else {
$host = env('HTTP_HOST');
$host = 'localhost';
}
if (!$this->__smtpSend("HELO {$host}", '250')) {

3
cake/tests/cases/libs/controller/components/email.test.php
View file

@ -478,10 +478,9 @@ TEXTBLOC;
$response = $this->Controller->EmailTest->smtpSend('HELO', '250');
$this->assertPattern('/501 Syntax: HELO hostname/', $this->Controller->EmailTest->smtpError);
$this->Controller->EmailTest->smtpError = null;
$this->Controller->EmailTest->reset();
$response = $this->Controller->EmailTest->smtpSend('HELO somehostname', '250');
$this->assertNoPattern('/501 Syntax: HELO hostname/', $this->Controller->EmailTest->smtpError);
}
/**
* testSendDebug method