Commit Graph

129 Commits

Author SHA1 Message Date
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Tjerk Meesters
d022c8565d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
2014-02-28 22:30:21 +08:00
Tjerk Meesters
79b3c2a744 [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
A newline is added to the mail headers when mail.add_x_header is used and no other headers are passed to mail().

The scenario in which custom headers are used was already fixed in #48620, back in 2009.
2014-02-28 22:22:07 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Anatoliy Belsky
8a481c711a fix windows build 2013-01-06 18:37:26 +01:00
Martin Jansen
4a3bf25e3f Add a timestamp to the mail log.
This patch is loosely based on the one in bug #52126 but instead of
using a UNIX timestamp it uses the date format also being used by
error_log et al.
2013-01-06 15:04:19 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Felipe Pena
54cba5aa91 - Fixed ZTS build 2012-07-24 10:02:32 -03:00
Florian Anderiasch
ddc8d16245 Add syslog support to mail.log #62356
Patch by Michael Orlitzky
2012-07-24 14:31:30 +02:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Dmitry Stogov
4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye
c17f8ecd6a - use popen_ex directly, avoid the tsrm fetch 2010-09-17 10:04:28 +00:00
Adam Harvey
6c9ca56c19 Fix for bug #52317 (Segmentation fault when using mail() on a rhel 4.x (only 64
bit)).
2010-07-19 10:46:44 +00:00
Johannes Schlüter
94694f924a - Ignore empty filename for mail.log, treat it like none given 2010-06-18 10:16:35 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00
Adam Harvey
c6e8a8957b Fix for bug #51604 (newline in end of header is shown in start of message).
Patch by Daniel Egeberg.
2010-04-22 02:22:49 +00:00
Kalle Sommer Nielsen
6169d91ba7 * Pass TSRMLS_C around pageinfo.c
* Use zend_parse_parameters_none() in pageinfo.c
2010-04-13 11:41:40 +00:00
Ilia Alshanetsky
d5fd93e997 Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX). 2010-02-02 12:50:21 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Ilia Alshanetsky
81e5787949 Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in
existing headers)
2009-06-21 15:29:16 +00:00
Ilia Alshanetsky
28db7c0207 Fixed bug #47969 (ezmlm_hash() returns different values depend on OS) 2009-04-15 14:24:38 +00:00
Ilia Alshanetsky
4093573e5c Fixed a bug inside mail() logging code that prevents log file from existing
outside of open_basedir
2009-01-13 21:29:12 +00:00
Antony Dovgal
2538bd21e7 fix ZTS build 2009-01-09 15:08:10 +00:00
Ilia Alshanetsky
905a5c0590 [DOC]
Added mail logging functionality that allows logging of mail sent via
mail() function

THe logging functionality is disabled by default but can be enabled on a
per-directory or globaly via 2 INI settings.

The mail.log directive allows you to specify the file where each call to
mail() will be logged. The log file will contain the path and line # of the
calling script in addition to all of the headers indicated by the user.

The mail.add_x_header directive will introduce a X-PHP-Originating-Script
header that will contain the file name (no path) of the calling script and
the uid of the script. This combination should be sufficient for the admin
to locate the sending script.
2009-01-09 14:59:30 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Arnaud Le Blanc
d69dfa4b9f MFH: initialize optional vars 2008-10-21 22:08:38 +00:00
Mikko Koppanen
e3c65a369f Adds signal handling around popen/pclose in mail.c.
Related information on bugs #8992 and #14032
Original patch by D. Parthey
2008-10-03 13:32:41 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Jani Taskinen
c955f26ab9 MFH: ws + cs 2007-11-06 17:58:53 +00:00
Jani Taskinen
6723ed1db3 MFH: Nuked ending dots from error messages 2007-09-30 05:49:45 +00:00
Johannes Schlüter
dc8d09bbbd - MFH: Always enable mail() function 2007-07-11 17:36:56 +00:00
Stanislav Malyshev
37781a5a84 Escape mail.force_extra_parameters value 2007-07-10 20:21:24 +00:00
Ilia Alshanetsky
86ca439a5d Fixed MOPB-34-2007:PHP mail() Header Injection Through Subject and To
Parameters
2007-03-30 00:28:58 +00:00
Antony Dovgal
b9bffbe019 fix compile warning 2007-03-27 09:20:27 +00:00
Ilia Alshanetsky
ae1c5674cb Fixed MOPB-33-2007:PHP mail() Message ASCIIZ Byte Truncation 2007-03-27 00:13:09 +00:00
Ilia Alshanetsky
094a5717b1 Eliminate strcat() and strcpy() 2007-01-25 00:26:51 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
df5cfe27b4 - Fixed bug #29334 (mail() provides incorrect message time header) 2005-08-07 22:06:29 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Anantha Kesari H Y
83b5eb54c4 defined EX_OK and EX_TEMPFAIL in ext/standard/mail.c for NETWARE rather than including a sysexits.h.
-Kamesh
2005-07-28 09:41:34 +00:00
Anantha Kesari H Y
146cb29054 removing unwanted header files getting included 2004-09-25 14:48:44 +00:00
Antony Dovgal
cc39d06e4e fix typo in mail.c: mail_force_extra_parameters -> mail.force_extra_parameters 2004-08-03 06:25:25 +00:00
Ilia Alshanetsky
2736c55e3e Fixed bug #26847 (memory leak in mail() when to/subject contain only spaces) 2004-01-09 01:35:44 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00