[PHP-DEV] CVS update: php3/win32 From: jim (php-dev <email protected>)
Date: 06/29/99

Date: Tuesday June 29, 1999 @ 14:50
Author: jim

Update of /repository/php3/win32
In directory php:/tmp/cvs-serv3732/win32

Modified Files:
        sendmail.c
Log Message:
Fix from #1622. SMTP does require \r\n, even though some transports (notably sendmail) don't.

Index: php3/win32/sendmail.c
diff -u php3/win32/sendmail.c:1.24 php3/win32/sendmail.c:1.25
--- php3/win32/sendmail.c:1.24 Thu Jun 10 04:55:58 1999
+++ php3/win32/sendmail.c Tue Jun 29 14:50:16 1999
@@ -1,4 +1,4 @@
-/* $Id: sendmail.c,v 1.24 1999/06/10 08:55:58 fmk Exp $ */
+/* $Id: sendmail.c,v 1.25 1999/06/29 18:50:16 jim Exp $ */
 
 /*
  * PHP Sendmail for Windows.
@@ -161,7 +161,7 @@
 {
         TLS_VARS;
 
- Post("QUIT\n");
+ Post("QUIT\r\n");
         Ack();
         // to guarantee that the cleanup is not made twice and
         // compomise the rest of the application if sockets are used
@@ -221,7 +221,7 @@
         if (strchr(mailTo, '@') == NULL)
                 return (BAD_MSG_DESTINATION);
 
- sprintf(GLOBAL(Buffer), "HELO %s\n", GLOBAL(LocalHost));
+ sprintf(GLOBAL(Buffer), "HELO %s\r\n", GLOBAL(LocalHost));
 
         // in the beggining of the dialog
         // attempt reconnect if the first Post fail
@@ -233,20 +233,20 @@
         if ((res = Ack()) != SUCCESS)
                 return (res);
 
- sprintf(GLOBAL(Buffer), "MAIL FROM:<%s>\n", RPath);
+ sprintf(GLOBAL(Buffer), "MAIL FROM:<%s>\r\n", RPath);
         if ((res = Post(GLOBAL(Buffer))) != SUCCESS)
                 return (res);
         if ((res = Ack()) != SUCCESS)
                 return (res);
 
 
- sprintf(GLOBAL(Buffer), "RCPT TO:<%s>\n", mailTo);
+ sprintf(GLOBAL(Buffer), "RCPT TO:<%s>\r\n", mailTo);
         if ((res = Post(GLOBAL(Buffer))) != SUCCESS)
                 return (res);
         if ((res = Ack()) != SUCCESS)
                 return (res);
 
- if ((res = Post("DATA\n")) != SUCCESS)
+ if ((res = Post("DATA\r\n")) != SUCCESS)
                 return (res);
         if ((res = Ack()) != SUCCESS)
                 return (res); 

-- 
PHP Development Mailing List (http://www.php.net/)
To unsubscribe, e-mail: php-dev-unsubscribe <email protected>
For additional commands, e-mail: php-dev-help <email protected>
To contact the list administrators, e-mail: php-list-admin <email protected>