clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo)

Browse Source
This commit is contained in:
Kalle Sommer Nielsen 2009-06-30 11:36:58 +00:00
parent dd196e2567
commit c1b4b045b1
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
win32/sendmail.c
View File

@ -37,6 +37,7 @@
#endif /* NETWARE */
#include "sendmail.h"
#include "php_ini.h"
#include "inet.h"
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
#include "ext/pcre/php_pcre.h"
@ -765,16 +766,52 @@ PostHeader_outofmem:
static int MailConnect()
{
int res;
int res, namelen;
short portnum;
struct hostent *ent;
IN_ADDR addr;
#ifdef HAVE_IPV6
IN6_ADDR addr6;
#endif
/* Create Socket */
if ((sc = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
if ((sc = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
return (FAILED_TO_OBTAIN_SOCKET_HANDLE);
}
/* Get our own host name */
if (gethostname(LocalHost, HOST_NAME_LEN))
if (gethostname(LocalHost, HOST_NAME_LEN)) {
return (FAILED_TO_GET_HOSTNAME);
}
ent = gethostbyname(LocalHost);
if (!ent) {
return (FAILED_TO_GET_HOSTNAME);
}
namelen = strlen(ent->h_name);
#ifdef HAVE_IPV6
if (inet_pton(AF_INET, ent->h_name, &addr) == 1 || inet_pton(AF_INET6, ent->h_name, &addr6) == 1)
#else
if (inet_pton(AF_INET, ent->h_name, &addr) == 1)
#endif
{
if (namelen + 2 >= HOST_NAME_LEN) {
return (FAILED_TO_GET_HOSTNAME);
}
strcpy(LocalHost, "[");
strcpy(LocalHost + 1, ent->h_name);
strcpy(LocalHost + namelen + 1, "]");
} else {
if (namelen >= HOST_NAME_LEN) {
return (FAILED_TO_GET_HOSTNAME);
}
strcpy(LocalHost, ent->h_name);
}
/* Resolve the servers IP */
/*
@ -794,8 +831,9 @@ static int MailConnect()
sock_in.sin_port = htons(portnum);
sock_in.sin_addr.S_un.S_addr = GetAddr(MailHost);
if (connect(sc, (LPSOCKADDR) & sock_in, sizeof(sock_in)))
if (connect(sc, (LPSOCKADDR) & sock_in, sizeof(sock_in))) {
return (FAILED_TO_CONNECT);
}
/* receive Server welcome message */
res = Ack(NULL);