cvs: php4 /ext/standard mail.c
| From: | Hartmut Holzgraefe | Date: | Thu, 03 Aug 2000 19:26:20 +0000 |
| Subject: | cvs: php4 /ext/standard mail.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1019@lists.php.net to get a copy of this message | ||
hholzgra Thu Aug 3 12:26:20 2000 EDT
Modified files:
/php4/ext/standard mail.c
Log:
evaluate sendmail exit status, fixes unix side of bug #5630
Index: php4/ext/standard/mail.c
diff -u php4/ext/standard/mail.c:1.27 php4/ext/standard/mail.c:1.28
--- php4/ext/standard/mail.c:1.27 Thu Jun 29 07:07:10 2000
+++ php4/ext/standard/mail.c Thu Aug 3 12:26:19 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mail.c,v 1.27 2000/06/29 14:07:10 kk Exp $ */
+/* $Id: mail.c,v 1.28 2000/08/03 19:26:19 hholzgra Exp $ */
#include <stdlib.h>
#include <ctype.h>
@@ -25,6 +25,7 @@
#include "ext/standard/info.h"
#if !defined(PHP_WIN32)
#include "build-defs.h"
+#include <sysexits.h>
#endif
#include "php_mail.h"
#include "php_ini.h"
@@ -151,7 +152,7 @@
}
fprintf(sendmail, "\n%s\n", message);
ret = pclose(sendmail);
- if (ret == -1) {
+ if ((ret != EX_OK)&&(ret != EX_TEMPFAIL)) {
return 0;
} else {
return 1;