Commit Graph

152 Commits

Author SHA1 Message Date
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
Ilia Alshanetsky
d9edc99fbe MFB: Fix for possible uninitialized usage of subject_r. 2003-11-30 19:56:30 +00:00
Ilia Alshanetsky
21fceae7d6 Fixed bug #25923 (mail() modifies the to & subject arguments). 2003-10-20 14:22:01 +00:00
Ilia Alshanetsky
3158ff714e Remove sendmail patch check. 2003-10-13 04:15:09 +00:00
Ilia Alshanetsky
f3f3b772b2 Cleanup r1.76 patch 2003-09-11 04:46:10 +00:00
Ilia Alshanetsky
80fb9496b3 Re-enable sendmail binary check, now with parameter detection. 2003-09-08 20:15:35 +00:00
Stanislav Malyshev
90f7a474ac The sendmail_path executable check breaks setups that use parameters
for sendmail - including the default setup - so I'm disabling it for now.
2003-09-01 08:20:17 +00:00
Ilia Alshanetsky
32b5df0bc7 Prevent abrupt script execution when sendmail_path contains invalid
executable.
Add more detail to the warnings regarding execution of sendmail binary.
2003-08-27 23:53:15 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Sara Golemon
13191aa841 Revert, this caused more trouble than it fixed. 2003-05-07 20:33:53 +00:00
Sara Golemon
48c947389e Bug #22962 2003-04-01 06:21:54 +00:00
Derick Rethans
424c41a72e - Added an extra ini setting with which extra commands can be forced to
the sendmail deamon on a per-vhost base. The value in this ini setting
  will override all extra commands passed as the 5th parameter to mail()
  and will work in Safe Mode.
@- Added an extra ini setting (mail_force_extra_paramaters) which forces
@  the addition of the specified parameters to be passed as extra
@  parameters to the sendmail binary. These parameters will always replace
@  the value of the 5th parameter to mail(), even in safe mode. (Derick)
2003-02-26 20:04:16 +00:00
Ilia Alshanetsky
4474f9225a Fixed bug #22355 (PHP would remove folding from Subject & To fields). 2003-02-24 19:41:18 +00:00
Sebastian Bergmann
b506f5c8f8 Bump year. 2002-12-31 16:08:15 +00:00
Martin Kraemer
c5a7a522a1 Portability: Use 0 if the platform does not define EX_OK 2002-11-28 08:23:36 +00:00
Sascha Schumann
2909e5c9c9 centralize #include "build-defs.h" and drop (sometimes inconsistent) other
instances
2002-10-24 13:15:49 +00:00
Derick Rethans
d52983dfab - Unbreak build 2002-09-22 16:23:44 +00:00
James Cox
b1b0230e6d typo 2002-09-22 16:14:11 +00:00
Derick Rethans
dc3ea09991 - Please do not use spaces for indentation!
- Removed redundend ifdefs
2002-09-06 07:30:51 +00:00
Anantha Kesari H Y
dc5d3f5585 NetWare related additions/modifications 2002-09-06 07:27:27 +00:00
Derick Rethans
fc7eb838fc - Whitespace 2002-08-26 09:47:46 +00:00
Derick Rethans
7edb660af9 @- Use escape_shell_cmd() to allow multiple extra parameters to the
@  invocation of the mailer as used in the fifth parameter to mail(). (Derick)
- Use escape_shell_cmd() to allow multiple extra parameters to the invocation
  of the mailer as used in the fifth parameter to mail().
2002-08-26 09:44:31 +00:00
Stefan Esser
3efb925931 Overwrite control chars in parameters with whitespace instead of truncating. 2002-08-24 11:37:50 +00:00
Marcus Boerger
149ad05b4f php_error_docref
#New conversion available at: http://docref.txt.marcus-boerger.de
2002-08-24 01:19:28 +00:00
Frank M. Kromann
8a7c339974 Add default arguments to new internal mail function. 2002-07-02 23:46:15 +00:00
Derick Rethans
f7cab95a7d - Be nice to users and allow them to check if the mail was send 2002-07-02 14:22:22 +00:00
Derick Rethans
0d61ab3814 - Disable 5th parameter to mail in safemode
@- Disabled the fifth parameter to the mail function in safemode. (Derick)
2002-07-02 13:56:47 +00:00
Stefan Esser
2eb859842b Fixed: possible bufferunderrun (worst case == invalid free bytes counter)
Fixed: isXXXX macros need (unsigned char) cast

Fixed: bug#17746 - control chars are now filtered within "to" and "subject" parameters
2002-06-13 18:54:45 +00:00
Markus Fischer
9b86cff931 - Adjust for improved error messages from win32/sendmail.c 2002-05-14 20:43:48 +00:00
Markus Fischer
ac50b53018 - WS fix. 2002-03-16 15:50:20 +00:00
Markus Fischer
3c52ef676f - Don't forget to close the handle. 2002-03-16 15:42:34 +00:00
Markus Fischer
d4e63bc5bf - Raise warning when trying to execute non-executeable shell
for mail delivery binary.
2002-03-16 12:45:43 +00:00
Sebastian Bergmann
90613d2282 Maintain headers. 2002-02-28 08:29:35 +00:00
Jon Parise
d299bdc5d9 Add a comment indicating that this return statement will never be reached.
# Perhaps it should just be removed?
2002-01-27 07:15:07 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Hartmut Holzgraefe
34feef0d6b - switch to new paramter parser
- make sure To: and Subject: do not end with a newline character
2001-12-02 17:57:17 +00:00
Jeroen van Wolffelaar
6cfba2a3ea 2nd phase in back-substitution those macro's
I've got pretty much everything now...
2001-09-25 22:49:04 +00:00
Jeroen van Wolffelaar
c033288573 Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know. 2001-09-25 21:58:48 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
Zeev Suraski
797a079a95 More TSRMLS_FETCH work, and a bit of cleanup 2001-07-30 06:18:13 +00:00
Zeev Suraski
d87cc976e1 Redesigned thread safety mechanism - nua nua 2001-07-28 11:36:37 +00:00
Shane Caraveo
fd2c27c061 Enable using an external mailer under windows.
1. this depends on the patch to fix tsrm I sent to dev
2. this provides backwards compatibility, as long as sendmail_path in the ini file is empty, the old internal mailer will be used, once sendmail_path is defined, the external sendmail program will be used.

I tested with indigomail from www.indigostar.com, which provides the same command line interface as sendmail no linux.
2001-07-08 22:30:11 +00:00
Sascha Schumann
69d129bdfb Needed for the prototype of php_escape_shell_cmd(). 2001-07-08 19:09:59 +00:00
Derick Rethans
832fe2e636 - Fix for the first part of Bug #11890
@- Fixed a bug that allowed users to spawn processes while using the 5th
@  parameter to mail(). (Derick)
2001-07-05 08:47:37 +00:00
Daniel Beulshausen
491fcd2ef8 used in extension(s) as well 2001-06-11 15:18:44 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Rasmus Lerdorf
25c3a3a39d vim-6 does folding - clean up a bunch of missing folding tags plus
some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 13:12:10 +00:00
James Moore
e52ec10341 remove rogue ZEND_GET_MODULE() 2001-04-02 16:37:50 +00:00
Ben Mansell
6d7ce5ffa0 UnixWare 7.1 does not have EX_TEMPFAIL or (as far as I can tell)
a concept of a temporary failure response to pclose().
2001-03-21 15:15:31 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Derick Rethans
cf11a4fbc8 - Added a new parameter to mail() which appends aditional command line
parameters to the mail program. This is usefull to set the From headers
  correctly with the -f parameter to sendmail p.e.
@- Added a new parameter to mail() which appends aditional command line
@  parameters to the mail program. (Derick)
2001-02-05 21:30:29 +00:00
Rasmus Lerdorf
83cf6629ec @BeOS patch from svanegmond@bang.dhs.org modified somewhat by Rasmus
BeOS patch from svanegmond@bang.dhs.org modified somewhat by Rasmus
2001-01-21 17:29:15 +00:00
Hartmut Holzgraefe
9cd387439e evaluate sendmail exit status, fixes unix side of bug #5630 2000-08-03 19:26:19 +00:00
Kristian Köhntopp
02cad904ee ezmlm_hash() function also available for php4. 2000-06-29 14:07:10 +00:00
Andi Gutmans
3701bc4207 - ARG_COUNT(ht) -> ZEND_NUM_ARGS() mega patch 2000-06-05 19:47:54 +00:00
Sascha Schumann
4686a3b50e Use #ifdef COMPILE_DL_EXTNAME solely. 2000-05-23 09:33:51 +00:00
Zeev Suraski
e043439ff6 Update the license with the new clause 6 2000-05-18 15:34:45 +00:00
Sascha Schumann
fe50664d4d #if COMPILE_DL
becomes

    #if defined(COMPILE_DL) || defined(COMPILE_DL_EXTENSION_NAME)
2000-05-02 00:44:35 +00:00
Sascha Schumann
0d383d9373 Replace the various get_module() functions with a uniform
ZEND_GET_MODULE(name) macro.
2000-05-02 00:30:36 +00:00
Colin Viebrock
0c2b366ce1 phpinfo() prettying 2000-04-05 21:43:03 +00:00
Stig Bakken
99e0b36321 @Cleaned up extension namespace (Stig)
Cleaned up extension namespace, and changed ext/standard into one single
extension.
2000-03-06 20:37:11 +00:00
Zeev Suraski
86fa2aade2 the pipe is breaking all the time 2000-02-19 23:41:32 +00:00
Zeev Suraski
80bdd19e03 Fine tune Andi's patch 2000-02-11 15:59:30 +00:00
Andi Gutmans
29280bb9ec - Get rid of some more evil MSVC5's and switch standard/ to use PHP_WIN32 2000-02-10 21:53:56 +00:00
Zeev Suraski
6d0ab6166c SAPIfication, Episode VI: Return of the SAPI
Remove mostly all references to APACHE and CGI_BINARY from the code.

- Apache include files are no longer included by any PHP code, except for the Apache SAPI module.
- No server specific code is in any of the base PHP code.

Still left to be done:
- Eliminate any references to APACHE from the few remaining modules.
- Move request_info.c's logic to SAPI
- Modify the regex function names, and globals, so that we can always
  include them, without having to fear any interference with Apache;
  Always use the bundled regex library
2000-02-10 19:41:21 +00:00
Sascha Schumann
43ae2bffbb Happy Y2K patch! Happy new year (or the new millennium, depending on whether
you start counting at 0 or 1).
2000-01-01 01:32:05 +00:00
Zeev Suraski
a1ad2872ee - The tree compiles again 1999-12-18 22:40:35 +00:00
Zeev Suraski
3ee4e65c95 More php3_ annihilation 1999-12-18 04:01:20 +00:00
Zeev Suraski
fb1c77bd4f - Made PHP_VERSION and PHP_OS work again
- More php3_ cleanup
@- Restored the PHP_VERSION and PHP_OS constants (Zeev)
1999-12-17 20:55:31 +00:00
Sascha Schumann
5b983c944f Clean up php3.*\.h files. The files itself are renamed, and references in all
.*\.[ch] files were changed. There is a slight chance that my script missed
a few changes, please correct them manually.
1999-12-04 19:19:57 +00:00
Sascha Schumann
00b2df7b8f New Zend API 1999-09-25 12:09:50 +00:00
Zeev Suraski
3cb1eb0471 Removed '3' from key functions in PHP (maintained compatibility through
php3_compat.h)
1999-08-02 19:17:14 +00:00
Andrey Hristov
1b2c932cc2 More symbol work.
I've defined a few macros to help with module/request init/startup function definitions.
Basically:

PHP_MINIT_FUNCTION(module)
PHP_MSHUTDOWN_FUNCTION(module)
PHP_RINIT_FUNCTION(module)
PHP_RSHUTDOWN_FUNCTION(module)
PHP_MINFO_FUNCTION(module)

These will expand to proper function prototypes.

Now to specify these in the module entry, use:

PHP_MINIT(module)
PHP_MSHUTDOWN(module)
PHP_RINIT(module)
PHP_RSHUTDOWN(module)
PHP_MINFO(module)

I've updated all modules in ext/standard and everything from ext/apache to ext/db.
If you can, please update your module to use these macros.
1999-07-26 20:09:08 +00:00
Andrey Hristov
736f4831a5 A bunch of grunt work updating function entries and declarations. 1999-07-24 22:16:54 +00:00
Zeev Suraski
c5724cbd14 License update 1999-07-16 13:13:16 +00:00
Sascha Schumann
39691bed9e conv_proto *.[ch] 1999-05-16 11:19:26 +00:00
Zeev Suraski
bc415d5a88 * Finalizing the PHP version of SAPI. Support POST and cookies among other things.
* Fully implement ISAPI support - POST and cookies among other things.
* Almost completely rewrote phpinfo().  Allow modules to easily display their
  information in phpinfo() without modifying phpinfo() itself (prototype for
  the module info function was changed, thus the large amount of updated module
  files).
* Initial extended SAPI support for Apache, completely untested.
* CGI now uses SAPI fully as well.
1999-05-09 08:48:05 +00:00
Zeev Suraski
0818d96c97 A lot of cleanups... Removed old thread-safe code and other redundant code and files 1999-04-24 00:12:00 +00:00