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

Merge branch 'PHP-8.3'

Browse Source
This commit is contained in:
Levi Morrison
2023-10-02 22:08:03 -06:00
parent cb0d04e9f4 08c3b332a1
commit 24915924bf
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ext/mbstring/mbstring.c
View File

@@ -4202,10 +4202,8 @@ PHP_FUNCTION(mb_send_mail)
size_t i; size_t i;
char *to_r = NULL; char *to_r = NULL;
char *force_extra_parameters = INI_STR("mail.force_extra_parameters"); char *force_extra_parameters = INI_STR("mail.force_extra_parameters");
struct { bool suppress_content_type = false;
int cnt_type:1; bool suppress_content_transfer_encoding = false;
int cnt_trans_enc:1;
} suppressed_hdrs = { 0, 0 };
char *p; char *p;
enum mbfl_no_encoding; enum mbfl_no_encoding;
@@ -4288,7 +4286,7 @@ PHP_FUNCTION(mb_send_mail)
} }
} }
} }
suppressed_hdrs.cnt_type = 1; suppress_content_type = true;
} }
if ((s = zend_hash_str_find(&ht_headers, "content-transfer-encoding", sizeof("content-transfer-encoding") - 1))) { if ((s = zend_hash_str_find(&ht_headers, "content-transfer-encoding", sizeof("content-transfer-encoding") - 1))) {
@@ -4308,7 +4306,7 @@ PHP_FUNCTION(mb_send_mail)
body_enc = &mbfl_encoding_8bit; body_enc = &mbfl_encoding_8bit;
break; break;
} }
suppressed_hdrs.cnt_trans_enc = 1; suppress_content_transfer_encoding = true;
} }
/* To: */ /* To: */
@@ -4393,7 +4391,7 @@ PHP_FUNCTION(mb_send_mail)
empty = false; empty = false;
} }
if (!suppressed_hdrs.cnt_type) { if (!suppress_content_type) {
if (!empty) { if (!empty) {
smart_str_appendl(&str, line_sep, line_sep_len); smart_str_appendl(&str, line_sep, line_sep_len);
} }
@@ -4407,7 +4405,7 @@ PHP_FUNCTION(mb_send_mail)
empty = false; empty = false;
} }
if (!suppressed_hdrs.cnt_trans_enc) { if (!suppress_content_transfer_encoding) {
if (!empty) { if (!empty) {
smart_str_appendl(&str, line_sep, line_sep_len); smart_str_appendl(&str, line_sep, line_sep_len);
} }