php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 13:31:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adds signal handling around popen/pclose in mail.c.

Browse Source 
Related information on bugs #8992 and #14032
Original patch by D. Parthey
This commit is contained in:
Mikko Koppanen
2008-10-03 13:32:41 +00:00
parent e72b3afeb5
commit e3c65a369f
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ext/standard/mail.c
View File

@@ -31,6 +31,12 @@
#include <sys/sysexits.h>
#endif
#if PHP_SIGCHILD
#if HAVE_SIGNAL_H
#include <signal.h>
#endif
#endif
#include "php_mail.h"
#include "php_ini.h"
#include "safe_mode.h"
@@ -193,6 +199,9 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
int ret;
char *sendmail_path = INI_STR("sendmail_path");
char *sendmail_cmd = NULL;
#if PHP_SIGCHILD
void (*sig_handler)() = NULL;
#endif
if (!sendmail_path) {
#if (defined PHP_WIN32 || defined NETWARE)
@@ -217,6 +226,16 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
sendmail_cmd = sendmail_path;
}
#if PHP_SIGCHILD
/* Set signal handler of SIGCHLD to default to prevent other signal handlers
* from being called and reaping the return code when our child exits.
* The original handler needs to be restored after pclose() */
sig_handler = (void *)signal(SIGCHLD, SIG_DFL);
if (sig_handler == SIG_ERR) {
sig_handler = NULL;
}
#endif
#ifdef PHP_WIN32
sendmail = popen(sendmail_cmd, "wb");
#else
@@ -235,6 +254,13 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
if (EACCES == errno) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Permission denied: unable to execute shell to run mail delivery binary '%s'", sendmail_path);
pclose(sendmail);
#if PHP_SIGCHILD
/* Restore handler in case of error on Windows
Not sure if this applicable on Win but just in case. */
if (sig_handler) {
signal(SIGCHLD, sig_handler);
}
#endif
return 0;
}
#endif
@@ -246,6 +272,12 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
fprintf(sendmail, "\n%s\n", message);
ret = pclose(sendmail);
#if PHP_SIGCHILD
if (sig_handler) {
signal(SIGCHLD, sig_handler);
}
#endif
#ifdef PHP_WIN32
if (ret == -1)
#else
@@ -264,6 +296,11 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
}
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute mail delivery program '%s'", sendmail_path);
#if PHP_SIGCHILD
if (sig_handler) {
signal(SIGCHLD, sig_handler);
}
#endif
return 0;
}