summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG5
-rw-r--r--config/main.inc.php.dist6
-rw-r--r--program/include/rcube_smtp.inc2
3 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f227acbc3..03db1d3f7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
CHANGELOG RoundCube Webmail
---------------------------
+2007/09/20 (robin)
+----------
+- Make smtp HELO/EHLO hostname configurable (#1484067)
+
+
2007/09/19 (thomasb)
----------
- Unlock interface when message sending fails (#1484570)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index b948b3845..6aa6e4b40 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -77,6 +77,12 @@ $rcmail_config['smtp_pass'] = '';
// best server supported one)
$rcmail_config['smtp_auth_type'] = '';
+// SMTP HELO host
+// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages
+// Leave this blank and you will get the server variable 'server_name' or
+// localhost if that isn't defined.
+$rcmail_config['smtp_helo_host'] = '';
+
// Log sent messages
$rcmail_config['smtp_log'] = TRUE;
diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc
index 7b839873e..f56246bbd 100644
--- a/program/include/rcube_smtp.inc
+++ b/program/include/rcube_smtp.inc
@@ -76,7 +76,7 @@ function smtp_mail($from, $recipients, &$headers, &$body, &$response)
// create Net_SMTP object and connect to server
if (!is_object($smtp_conn))
{
- $helo_host = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost';
+ $helo_host = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : (!empty($CONFIG['smtp_helo_host']) ? $CONFIG['smtp_helo_host'] : 'localhost');
$SMTP_CONN = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
// set debugging