From: Sterling Hughes <sterling@php.net>
Date: Tue, 5 Sep 2000 00:26:15 +0000 (+0000)
Subject: This should fix the multiple-line problem.
X-Git-Tag: php-4.0.3RC1~310
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a2726e208fb4f25ef7032ae0cf2e51b7f403030;p=php

This should fix the multiple-line problem.
---

diff --git a/win32/sendmail.c b/win32/sendmail.c
index 58182c00e6..0e3ddb34e8 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -493,9 +493,12 @@ int Ack()
 
 	/* 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);