cvs: php4 /win32 sendmail.c
| From: | Sterling Hughes | Date: | Tue, 05 Sep 2000 00:26:15 +0000 |
| Subject: | cvs: php4 /win32 sendmail.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1564@lists.php.net to get a copy of this message | ||
sterling Mon Sep 4 17:26:15 2000 EDT
Modified files:
/php4/win32 sendmail.c
Log:
This should fix the multiple-line problem.
Index: php4/win32/sendmail.c
diff -u php4/win32/sendmail.c:1.19 php4/win32/sendmail.c:1.20
--- php4/win32/sendmail.c:1.19 Sun Aug 6 14:42:10 2000
+++ php4/win32/sendmail.c Mon Sep 4 17:26:15 2000
@@ -493,9 +493,12 @@
/* Check for newline */
Index += rlen;
- if ((buf[Received - 2] != '\r') || (buf[Received - 1] != '\n'))
+
+ if ((buf[Received - 4] == ' ' && buf[Received - 3] == '-') ||
+ (buf[Received - 2] != '\r') || (buf[Received - 1] != '\n'))
/* err_msg fprintf(stderr,"Incomplete server message. Awaiting CRLF\n"); */
- goto again; /* Incomplete data. Line must be terminated by CRLF */
+ goto again; /* Incomplete data. Line must be terminated by CRLF
+ And not contain a space followed by a '-' */
if (buf[0] > '3')
return (SMTP_SERVER_ERROR);