--- embedaddon/php/ext/standard/mail.c	2012/02/21 23:48:02	1.1
+++ embedaddon/php/ext/standard/mail.c	2014/06/15 20:03:57	1.1.1.5
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mail.c,v 1.1 2012/02/21 23:48:02 misho Exp $ */
+/* $Id: mail.c,v 1.1.1.5 2014/06/15 20:03:57 misho Exp $ */
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -39,10 +39,10 @@
 #endif
 #endif
 
+#include "php_syslog.h"
 #include "php_mail.h"
 #include "php_ini.h"
 #include "php_string.h"
-#include "safe_mode.h"
 #include "exec.h"
 
 #ifdef PHP_WIN32
@@ -70,7 +70,7 @@
 		*p = ' ';								\
 	}											\
 
-extern long php_getuid(void);
+extern long php_getuid(TSRMLS_D);
 
 /* {{{ proto int ezmlm_hash(string addr)
    Calculate EZMLM list hash value. */
@@ -106,14 +106,7 @@ PHP_FUNCTION(mail)
 	char *to_r, *subject_r;
 	char *p, *e;
 
-	if (PG(safe_mode) && (ZEND_NUM_ARGS() == 5)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect.  The fifth parameter is disabled in SAFE MODE");
-		RETURN_FALSE;
-	}
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|ss",	&to, &to_len, &subject, &subject_len, &message, &message_len,
-																	&headers, &headers_len, &extra_cmd, &extra_cmd_len) == FAILURE
-	) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|ss",	&to, &to_len, &subject, &subject_len, &message, &message_len, &headers, &headers_len, &extra_cmd, &extra_cmd_len) == FAILURE) {
 		return;
 	}
 
@@ -197,6 +190,37 @@ PHP_FUNCTION(mail)
 }
 /* }}} */
 
+
+void php_mail_log_crlf_to_spaces(char *message) {
+	/* Find all instances of carriage returns or line feeds and
+	 * replace them with spaces. Thus, a log line is always one line
+	 * long
+	 */
+	char *p = message;
+	while ((p = strpbrk(p, "\r\n"))) {
+		*p = ' ';
+	}
+}
+
+void php_mail_log_to_syslog(char *message) {
+	/* Write 'message' to syslog. */
+#ifdef HAVE_SYSLOG_H
+	php_syslog(LOG_NOTICE, "%s", message);
+#endif
+}
+
+
+void php_mail_log_to_file(char *filename, char *message, size_t message_size TSRMLS_DC) {
+	/* Write 'message' to the given file. */
+	uint flags = IGNORE_URL_WIN | REPORT_ERRORS | STREAM_DISABLE_OPEN_BASEDIR;
+	php_stream *stream = php_stream_open_wrapper(filename, "a", flags, NULL);
+	if (stream) {
+		php_stream_write(stream, message, message_size);
+		php_stream_close(stream);
+	}
+}
+
+
 /* {{{ php_mail
  */
 PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char *extra_cmd TSRMLS_DC)
@@ -224,32 +248,35 @@ PHPAPI int php_mail(char *to, char *subject, char *mes
 	if (mail_log && *mail_log) {
 		char *tmp;
 		int l = spprintf(&tmp, 0, "mail() on [%s:%d]: To: %s -- Headers: %s\n", zend_get_executed_filename(TSRMLS_C), zend_get_executed_lineno(TSRMLS_C), to, hdr ? hdr : "");
-		php_stream *stream = php_stream_open_wrapper(mail_log, "a", IGNORE_URL_WIN | REPORT_ERRORS | STREAM_DISABLE_OPEN_BASEDIR, NULL);
 
-		if (hdr) { /* find all \r\n instances and replace them with spaces, so a log line is always one line long */ 
-			char *p = tmp;
-			while ((p = strpbrk(p, "\r\n"))) {
-				*p = ' ';
-			}
-			tmp[l - 1] = '\n';
+		if (hdr) {
+			php_mail_log_crlf_to_spaces(tmp);
 		}
-		if (stream) {
-			php_stream_write(stream, tmp, l);
-			php_stream_close(stream);
+
+		if (!strcmp(mail_log, "syslog")) {
+			/* Drop the final space when logging to syslog. */
+			tmp[l - 1] = 0;
+			php_mail_log_to_syslog(tmp);
 		}
+		else {
+			/* Convert the final space to a newline when logging to file. */
+			tmp[l - 1] = '\n';
+			php_mail_log_to_file(mail_log, tmp, l TSRMLS_CC);
+		}
+
 		efree(tmp);
 	}
 	if (PG(mail_x_header)) {
-		char *tmp = zend_get_executed_filename(TSRMLS_C);
+		const char *tmp = zend_get_executed_filename(TSRMLS_C);
 		char *f;
 		size_t f_len;
 
 		php_basename(tmp, strlen(tmp), NULL, 0,&f, &f_len TSRMLS_CC);
 
 		if (headers != NULL) {
-			spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n%s", php_getuid(), f, headers);
+			spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n%s", php_getuid(TSRMLS_C), f, headers);
 		} else {
-			spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n", php_getuid(), f);
+			spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s", php_getuid(TSRMLS_C), f);
 		}
 		efree(f);
 	}
@@ -288,10 +315,10 @@ PHPAPI int php_mail(char *to, char *subject, char *mes
 #endif
 
 #ifdef PHP_WIN32
-	sendmail = popen(sendmail_cmd, "wb");
+	sendmail = popen_ex(sendmail_cmd, "wb", NULL, NULL TSRMLS_CC);
 #else
 	/* 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
+	 * (e.g. the shell can't be executed) we explicitly set it to 0 to be
 	 * sure we don't catch any older errno value. */
 	errno = 0;
 	sendmail = popen(sendmail_cmd, "w");