CVS update: php4/win32

Date: Thursday June 10, 1999 @ 5:10 Author: fmk Update of /repository/php4/win32 In directory php:/tmp/cvs-serv5342 Modified Files: sendmail.c Log Message: Sync. with php3. Only add Date: and From: if not supplied by user Index: php4/win32/sendmail.c diff -u php4/win32/sendmail.c:1.4 php4/win32/sendmail.c:1.5 --- php4/win32/sendmail.c:1.4 Fri Apr 23 20:12:00 1999 +++ php4/win32/sendmail.c Thu Jun 10 05:10:07 1999 @@ -316,19 +316,21 @@ zoneh /= (60 * 60); zonem = (abs(_timezone) / 60) - (zoneh * 60); - p += sprintf(p, "Date: %s, %02d %s %04d %02d:%02d:%02d %s%02d%02d\r\n", - days[tm->tm_wday], - tm->tm_mday, - months[tm->tm_mon], - tm->tm_year + 1900, - tm->tm_hour, - tm->tm_min, - tm->tm_sec, - (_timezone > 0) ? "+" : (_timezone < 0) ? "-" : "", - zoneh, - zonem); + if(!xheaders || !strstr(xheaders, "Date:")){ + p += sprintf(p, "Date: %s, %02d %s %04d %02d:%02d:%02d %s%02d%02d\r\n", + days[tm->tm_wday], + tm->tm_mday, + months[tm->tm_mon], + tm->tm_year + 1900, + tm->tm_hour, + tm->tm_min, + tm->tm_sec, + (_timezone > 0) ? "+" : (_timezone < 0) ? "-" : "", + zoneh, + zonem); + } - if(xheaders && strnicmp("From:",xheaders,5)){ + if(!xheaders || !strstr(xheaders, "From:")){ p += sprintf(p, "From: %s\r\n", RPath); } p += sprintf(p, "Subject: %s\r\n", Subject);