From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 21 Jun 2009 15:30:23 +0000 (+0000)
Subject: MFB: Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in
X-Git-Tag: php-5.4.0alpha1~191^2~3277
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca74bf9e4477eb9ddb53e676a1e37fc138ad373c;p=php

MFB: Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in
existing headers)
---

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index dd26522eff..9eeb30022a 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -235,7 +235,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
 		php_basename(tmp, strlen(tmp), NULL, 0, &f, &f_len TSRMLS_CC);
 
 		if (headers != NULL) {
-			spprintf(&hdr, 0, "%s\r\nX-PHP-Originating-Script: %ld:%s\n", headers, php_getuid(), f);
+			spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\r\n%s", php_getuid(), f, headers);
 		} else {
 			spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n", php_getuid(), f);
 		}