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

ext/standard/mail.c: Reduce scope of some variable declarations

Browse Source
This commit is contained in:
Gina Peter Bnayard
2024-08-13 14:14:40 +02:00
parent c6e1e307a3
commit 962aba3b12
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/standard/mail.c
View File

@@ -410,12 +410,7 @@ static int php_mail_detect_multiple_crlf(const char *hdr) {
/* {{{ php_mail */
PHPAPI int php_mail(const char *to, const char *subject, const char *message, const char *headers, const char *extra_cmd)
{
#ifdef PHP_WIN32
int tsm_err;
char *tsm_errmsg = NULL;
#endif
FILE *sendmail;
int ret;
char *sendmail_path = INI_STR("sendmail_path");
char *sendmail_cmd = NULL;
char *mail_log = INI_STR("mail.log");
@@ -491,6 +486,9 @@ PHPAPI int php_mail(const char *to, const char *subject, const char *message, co
if (!sendmail_path) {
#ifdef PHP_WIN32
int tsm_err;
char *tsm_errmsg = NULL;
/* handle old style win smtp sending */
if (TSendMail(INI_STR("SMTP"), &tsm_err, &tsm_errmsg, hdr, subject, to, message, NULL, NULL, NULL) == FAILURE) {
if (tsm_errmsg) {
@@ -556,7 +554,7 @@ PHPAPI int php_mail(const char *to, const char *subject, const char *message, co
fprintf(sendmail, "%s%s", hdr, line_sep);
}
fprintf(sendmail, "%s%s%s", line_sep, message, line_sep);
ret = pclose(sendmail);
int ret = pclose(sendmail);
#if PHP_SIGCHILD
if (sig_handler) {