From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 11 Aug 2003 18:03:24 +0000 (+0000)
Subject: Fixed bug #22947 (Ack() inside win32/sendmail.c may stall in certain
X-Git-Tag: RELEASE_0_7~727
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=579062688199d76d7e4b093f6b5d990d7a9b25e9;p=php

Fixed bug #22947 (Ack() inside win32/sendmail.c may stall in certain
situations).
---

diff --git a/win32/sendmail.c b/win32/sendmail.c
index 82e8437a84..199a8f66df 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -883,11 +883,11 @@ int Ack(char **server_response)
 	/* Check for newline */
 	Index += rlen;
 	
-	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
-		                           And not contain a space followed by a '-' */
+	/* SMPT RFC says \r\n is the only valid line ending, who are we to argue ;)
+	 * The response code must contain at least 5 characters ex. 220\r\n */
+	if (Received < 5 || buf[Received - 1] != '\n' || buf[Received - 2] != '\r') {
+		goto again;
+	}
 
 	if (buf[0] > '3') {
 		/* If we've a valid pointer, return the SMTP server response so the error message contains more information */