iliaa Mon Oct 13 00:15:26 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard mail.c
Log:
MFH: Remove sendmail patch check.
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.66.2.9 php-src/ext/standard/mail.c:1.66.2.10
--- php-src/ext/standard/mail.c:1.66.2.9 Thu Sep 11 00:46:31 2003
+++ php-src/ext/standard/mail.c Mon Oct 13 00:15:25 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mail.c,v 1.66.2.9 2003/09/11 04:46:31 iliaa Exp $ */
+/* $Id: mail.c,v 1.66.2.10 2003/10/13 04:15:25 iliaa Exp $ */
#include <stdlib.h>
#include <ctype.h>
@@ -195,31 +195,6 @@
#ifdef PHP_WIN32
sendmail = popen(sendmail_cmd, "wb");
#else
- /* make sure that sendmail_path contains a valid executable, failure to do
- * would make PHP abruptly exit without a useful error message. */
- {
- char *s=NULL, *p;
-
- if ((s = strchr(sendmail_path, ' '))) {
- p = estrndup(sendmail_path, s - sendmail_path);
- } else {
- p = sendmail_path;
- }
- if (access(p, X_OK)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Permission
denied: unable to execute shell to run mail delivery binary '%s'", sendmail_path);
- if (extra_cmd != NULL) {
- efree(sendmail_cmd);
- }
- if (s) {
- efree(p);
- }
- return 0;
- }
- if (s) {
- efree(p);
- }
- }
-
/* Since popen() doesn't indicate if the internal fork() doesn't work
* (e.g. the shell can't be executed) we explicitely set it to 0 to be
* sure we don't catch any older errno value. */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
