Skip to content

ext/standard/mail: Various refactorings (part 2) #20791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Girgias wants to merge 7 commits into
base: master
Choose a base branch
from
+126 −126
Draft

ext/standard/mail: Various refactorings (part 2) #20791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1753055
ext/standard/mail: use zend_string* for message param of php_mail()
Girgias Dec 24, 2025
46c5814
ext/standard/mail: use zend_string* for headers param of php_mail()
Girgias Dec 24, 2025
e0874e1
ext/standard/mail: use zend_string* for headers inside php_mail()
Girgias Dec 25, 2025
d85b4f6
ext/standard/mail: refactor php_mail_detect_multiple_crlf()
Girgias Dec 25, 2025
876fb36
ext/standard/mail.c: use guard pattern to reduce nesting
Girgias Dec 27, 2025
49a04cf
ext/standard/mail.c: remove useless default case
Girgias Dec 27, 2025
f4a47fd
ext/standard/mail.c: remove unused include
Girgias Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ext/mbstring/mbstring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4633,9 +4633,8 @@ PHP_FUNCTION(mb_send_mail)

unsigned int num_errors = 0;
zend_string *tmpstr = mb_fast_convert((unsigned char*)message, message_len, msg_enc, tran_cs, '?', MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR, &num_errors);
zend_string *conv = mb_fast_convert((unsigned char*)ZSTR_VAL(tmpstr), ZSTR_LEN(tmpstr), &mbfl_encoding_8bit, body_enc, '?', MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR, &num_errors);
zend_string *converted_message = mb_fast_convert((unsigned char*)ZSTR_VAL(tmpstr), ZSTR_LEN(tmpstr), &mbfl_encoding_8bit, body_enc, '?', MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR, &num_errors);
zend_string_free(tmpstr);
message = ZSTR_VAL(conv);

/* other headers */
#define PHP_MBSTR_MAIL_MIME_HEADER1 "MIME-Version: 1.0"
Expand Down Expand Up @@ -4703,7 +4702,7 @@ PHP_FUNCTION(mb_send_mail)
extra_cmd = php_escape_shell_cmd(extra_cmd);
}

RETVAL_BOOL(php_mail(to_r, ZSTR_VAL(subject), message, ZSTR_VAL(str_headers), extra_cmd));
RETVAL_BOOL(php_mail(to_r, ZSTR_VAL(subject), converted_message, str_headers, extra_cmd));

if (extra_cmd) {
zend_string_release_ex(extra_cmd, 0);
Expand All @@ -4712,7 +4711,7 @@ PHP_FUNCTION(mb_send_mail)
efree(to_r);
}
zend_string_release(subject);
zend_string_free(conv);
zend_string_free(converted_message);
zend_hash_destroy(&ht_headers);
if (str_headers) {
zend_string_release_ex(str_headers, 0);
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,7 +1353,7 @@ PHPAPI zend_result _php_error_log(int opt_err, const zend_string *message, const
switch (opt_err)
{
case 1: /*send an email */
if (!php_mail(ZSTR_VAL(opt), "PHP error_log message", ZSTR_VAL(message), ZSTR_VAL(headers), NULL)) {
if (!php_mail(ZSTR_VAL(opt), "PHP error_log message", message, headers, NULL)) {
return FAILURE;
}
break;
Expand Down
Loading