git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13728
7612ce4b-ef26-0410-bec9-
ea0150e637f0
+ // if the host is an IPv4 address, enclose it in brackets
+ //
+ if (preg_match('/\d+\.\d+\.\d+\.\d+/', $helohost))
+ $helohost = '[' . $helohost . ']';
+
/* Lets introduce ourselves */
fputs($stream, "EHLO $helohost\r\n");
// Read ehlo response
/* Lets introduce ourselves */
fputs($stream, "EHLO $helohost\r\n");
// Read ehlo response
if ($use_smtp_tls===2) {
// if something breaks, script should close smtp connection on exit.
if ($use_smtp_tls===2) {
// if something breaks, script should close smtp connection on exit.
+
+ // format EHLO argument correctly if needed
+ //
+ if (preg_match('/\d+\.\d+\.\d+\.\d+/', $client_ip))
+ $helohost = '[' . $client_ip . ']';
+ else // some day might add IPv6 here
+ $helohost = $client_ip;
+
+
- fwrite($stream,"EHLO $client_ip\r\n");
+ fwrite($stream,"EHLO $helohost\r\n");
$ehlo=array();
$ehlo_error = false;
$ehlo=array();
$ehlo_error = false;