Merge branch 'PHP-8.2'

bukka · bukka · commit 443eb50a4ca0 · 2023-01-19T19:06:38.000Z
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -4318,7 +4318,9 @@ PHP_FUNCTION(mb_send_mail)
 	if (orig_str.encoding->no_encoding == mbfl_no_encoding_invalid || orig_str.encoding->no_encoding == mbfl_no_encoding_pass) {
 		orig_str.encoding = mb_guess_encoding((unsigned char*)subject, subject_len, MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size), MBSTRG(strict_detection));
 	}
-	pstr = mbfl_mime_header_encode(&orig_str, &conv_str, tran_cs, head_enc, CRLF, sizeof("Subject: [PHP-jp nnnnnnnn]" CRLF) - 1);
+	const char *line_sep = PG(mail_mixed_lf_and_crlf) ? "\n" : CRLF;
+	size_t line_sep_len = strlen(line_sep);
+	pstr = mbfl_mime_header_encode(&orig_str, &conv_str, tran_cs, head_enc, line_sep, strlen("Subject: [PHP-jp nnnnnnnn]") + line_sep_len);
 	if (pstr != NULL) {
 		subject_buf = subject = (char *)pstr->val;
 	}
@@ -4356,14 +4358,14 @@ PHP_FUNCTION(mb_send_mail)
 		n = ZSTR_LEN(str_headers);
 		mbfl_memory_device_strncat(&device, p, n);
 		if (n > 0 && p[n - 1] != '\n') {
-			mbfl_memory_device_strncat(&device, CRLF, sizeof(CRLF)-1);
+			mbfl_memory_device_strncat(&device, line_sep, line_sep_len);
 		}
 		zend_string_release_ex(str_headers, 0);
 	}
 
 	if (!zend_hash_str_exists(&ht_headers, "mime-version", sizeof("mime-version") - 1)) {
 		mbfl_memory_device_strncat(&device, PHP_MBSTR_MAIL_MIME_HEADER1, sizeof(PHP_MBSTR_MAIL_MIME_HEADER1) - 1);
-		mbfl_memory_device_strncat(&device, CRLF, sizeof(CRLF)-1);
+		mbfl_memory_device_strncat(&device, line_sep, line_sep_len);
 	}
 
 	if (!suppressed_hdrs.cnt_type) {
@@ -4374,7 +4376,7 @@ PHP_FUNCTION(mb_send_mail)
 			mbfl_memory_device_strncat(&device, PHP_MBSTR_MAIL_MIME_HEADER3, sizeof(PHP_MBSTR_MAIL_MIME_HEADER3) - 1);
 			mbfl_memory_device_strcat(&device, p);
 		}
-		mbfl_memory_device_strncat(&device, CRLF, sizeof(CRLF)-1);
+		mbfl_memory_device_strncat(&device, line_sep, line_sep_len);
 	}
 	if (!suppressed_hdrs.cnt_trans_enc) {
 		mbfl_memory_device_strncat(&device, PHP_MBSTR_MAIL_MIME_HEADER4, sizeof(PHP_MBSTR_MAIL_MIME_HEADER4) - 1);
@@ -4383,10 +4385,12 @@ PHP_FUNCTION(mb_send_mail)
 			p = "7bit";
 		}
 		mbfl_memory_device_strcat(&device, p);
-		mbfl_memory_device_strncat(&device, CRLF, sizeof(CRLF)-1);
+		mbfl_memory_device_strncat(&device, line_sep, line_sep_len);
 	}
 
-	mbfl_memory_device_unput(&device);
+	if (!PG(mail_mixed_lf_and_crlf)) {
+		mbfl_memory_device_unput(&device);
+	}
 	mbfl_memory_device_unput(&device);
 	mbfl_memory_device_output('\0', &device);
 	str_headers = zend_string_init((char *)device.buffer, strlen((char *)device.buffer), 0);
diff --git a/ext/mbstring/tests/gh8086.phpt b/ext/mbstring/tests/gh8086.phpt
@@ -0,0 +1,33 @@
+--TEST--
+GH-8086 (mb_send_mail() function not working correctly in PHP 8.x)
+--SKIPIF--
+<?php
+if (!extension_loaded("mbstring")) die("skip mbstring extension not available");
+?>
+--INI--
+sendmail_path={MAIL:{PWD}/gh8086.eml}
+mail.mixed_lf_and_crlf=on
+--FILE--
+<?php
+mb_internal_encoding("UTF-8");
+mb_language("uni");
+$to = "omittedvalidaddress@example.com";
+$subject = "test mail";
+$message = "body of testing php mail";
+$header["Mime-Version"] = "1.0";
+$header["Content-Type"] = "text/html; charset=UTF-8";
+$header["From"] = "omittedvalidaddress2@example.com";
+$header["X-Mailer"] = "PHP/" . phpversion();
+mb_send_mail($to, $subject, $message, $header);
+
+$stream = fopen(__DIR__ . "/gh8086.eml", "rb");
+$eml = stream_get_contents($stream);
+fclose($stream);
+var_dump(preg_match_all('/(?<!\r)\n/', $eml));
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/gh8086.eml");
+?>
+--EXPECT--
+int(6)
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
@@ -429,14 +429,16 @@ PHPAPI int php_mail(const char *to, const char *subject, const char *message, co
 		MAIL_RET(0);
 	}
 
+	char *line_sep = PG(mail_mixed_lf_and_crlf) ? "\n" : "\r\n";
+
 	if (PG(mail_x_header)) {
 		const char *tmp = zend_get_executed_filename();
 		zend_string *f;
 
 		f = php_basename(tmp, strlen(tmp), NULL, 0);
 
 		if (headers != NULL && *headers) {
-			spprintf(&ahdr, 0, "X-PHP-Originating-Script: " ZEND_LONG_FMT ":%s\r\n%s", php_getuid(), ZSTR_VAL(f), headers);
+			spprintf(&ahdr, 0, "X-PHP-Originating-Script: " ZEND_LONG_FMT ":%s%s%s", php_getuid(), ZSTR_VAL(f), line_sep, headers);
 		} else {
 			spprintf(&ahdr, 0, "X-PHP-Originating-Script: " ZEND_LONG_FMT ":%s", php_getuid(), ZSTR_VAL(f));
 		}
@@ -510,12 +512,12 @@ PHPAPI int php_mail(const char *to, const char *subject, const char *message, co
 			MAIL_RET(0);
 		}
 #endif
-		fprintf(sendmail, "To: %s\r\n", to);
-		fprintf(sendmail, "Subject: %s\r\n", subject);
+		fprintf(sendmail, "To: %s%s", to, line_sep);
+		fprintf(sendmail, "Subject: %s%s", subject, line_sep);
 		if (hdr != NULL) {
-			fprintf(sendmail, "%s\r\n", hdr);
+			fprintf(sendmail, "%s%s", hdr, line_sep);
 		}
-		fprintf(sendmail, "\r\n%s\r\n", message);
+		fprintf(sendmail, "%s%s%s", line_sep, message, line_sep);
 		ret = pclose(sendmail);
 
 #if PHP_SIGCHILD
diff --git a/ext/standard/tests/mail/gh8086.phpt b/ext/standard/tests/mail/gh8086.phpt
@@ -0,0 +1,18 @@
+--TEST--
+GH-8086 (Mail() function not working correctly in PHP 8.x)
+--INI--
+sendmail_path={MAIL:gh8086.out}
+mail.mixed_lf_and_crlf=on
+--FILE--
+<?php
+var_dump(mail('user@example.com', 'Test Subject', 'A Message', 'KHeaders'));
+$mail = file_get_contents('gh8086.out');
+var_dump(preg_match_all('/(?<!\r)\n/', $mail));
+?>
+--CLEAN--
+<?php
+unlink('gh8086.out');
+?>
+--EXPECT--
+bool(true)
+int(5)
diff --git a/main/main.c b/main/main.c
@@ -738,6 +738,7 @@ PHP_INI_BEGIN()
 	PHP_INI_ENTRY("SMTP",						"localhost",PHP_INI_ALL,		NULL)
 	PHP_INI_ENTRY("smtp_port",					"25",		PHP_INI_ALL,		NULL)
 	STD_PHP_INI_BOOLEAN("mail.add_x_header",			"0",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateBool,			mail_x_header,			php_core_globals,	core_globals)
+	STD_PHP_INI_BOOLEAN("mail.mixed_lf_and_crlf",			"0",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateBool,			mail_mixed_lf_and_crlf,			php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("mail.log",					NULL,		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateMailLog,			mail_log,			php_core_globals,	core_globals)
 	PHP_INI_ENTRY("browscap",					NULL,		PHP_INI_SYSTEM,		OnChangeBrowscap)
 	PHP_INI_ENTRY("memory_limit",				"128M",		PHP_INI_ALL,		OnChangeMemoryLimit)
diff --git a/main/php_globals.h b/main/php_globals.h
@@ -153,6 +153,7 @@ struct _php_core_globals {
 	char *request_order;
 
 	bool mail_x_header;
+	bool mail_mixed_lf_and_crlf;
 	char *mail_log;
 
 	bool in_error_log;
diff --git a/php.ini-development b/php.ini-development
@@ -1105,6 +1105,10 @@ smtp_port = 25
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
 mail.add_x_header = Off
 
+; Use mixed LF and CRLF line separators to keep compatibility with some
+; RFC 2822 non conformant MTA.
+mail.mixed_lf_and_crlf = Off
+
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.
 ;mail.log =
diff --git a/php.ini-production b/php.ini-production
@@ -1107,6 +1107,10 @@ smtp_port = 25
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
 mail.add_x_header = Off
 
+; Use mixed LF and CRLF line separators to keep compatibility with some
+; RFC 2822 non conformant MTA.
+mail.mixed_lf_and_crlf = Off
+
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.
 ;mail.log =

Original file line number	Diff line number	Diff line change
`@@ -4318,7 +4318,9 @@ PHP_FUNCTION(mb_send_mail)`
`4318`	`4318`	`if (orig_str.encoding->no_encoding == mbfl_no_encoding_invalid \|\| orig_str.encoding->no_encoding == mbfl_no_encoding_pass) {`
`4319`	`4319`	`orig_str.encoding = mb_guess_encoding((unsigned char*)subject, subject_len, MBSTRG(current_detect_order_list), MBSTRG(current_detect_order_list_size), MBSTRG(strict_detection));`
`4320`	`4320`	`}`
`4321`		`- pstr = mbfl_mime_header_encode(&orig_str, &conv_str, tran_cs, head_enc, CRLF, sizeof("Subject: [PHP-jp nnnnnnnn]" CRLF) - 1);`
	`4321`	`+ const char *line_sep = PG(mail_mixed_lf_and_crlf) ? "\n" : CRLF;`
	`4322`	`+ size_t line_sep_len = strlen(line_sep);`
	`4323`	`+ pstr = mbfl_mime_header_encode(&orig_str, &conv_str, tran_cs, head_enc, line_sep, strlen("Subject: [PHP-jp nnnnnnnn]") + line_sep_len);`
`4322`	`4324`	`if (pstr != NULL) {`
`4323`	`4325`	`subject_buf = subject = (char *)pstr->val;`
`4324`	`4326`	`}`
`@@ -4356,14 +4358,14 @@ PHP_FUNCTION(mb_send_mail)`
`4356`	`4358`	`n = ZSTR_LEN(str_headers);`
`4357`	`4359`	`mbfl_memory_device_strncat(&device, p, n);`
`4358`	`4360`	`if (n > 0 && p[n - 1] != '\n') {`
`4359`		`- mbfl_memory_device_strncat(&device, CRLF, sizeof(CRLF)-1);`
	`4361`	`+ mbfl_memory_device_strncat(&device, line_sep, line_sep_len);`
`4360`	`4362`	`}`
`4361`	`4363`	`zend_string_release_ex(str_headers, 0);`
`4362`	`4364`	`}`
`4363`	`4365`
`4364`	`4366`	`if (!zend_hash_str_exists(&ht_headers, "mime-version", sizeof("mime-version") - 1)) {`
`4365`	`4367`	`mbfl_memory_device_strncat(&device, PHP_MBSTR_MAIL_MIME_HEADER1, sizeof(PHP_MBSTR_MAIL_MIME_HEADER1) - 1);`
`4366`		`- mbfl_memory_device_strncat(&device, CRLF, sizeof(CRLF)-1);`
	`4368`	`+ mbfl_memory_device_strncat(&device, line_sep, line_sep_len);`
`4367`	`4369`	`}`
`4368`	`4370`
`4369`	`4371`	`if (!suppressed_hdrs.cnt_type) {`
`@@ -4374,7 +4376,7 @@ PHP_FUNCTION(mb_send_mail)`
`4374`	`4376`	`mbfl_memory_device_strncat(&device, PHP_MBSTR_MAIL_MIME_HEADER3, sizeof(PHP_MBSTR_MAIL_MIME_HEADER3) - 1);`
`4375`	`4377`	`mbfl_memory_device_strcat(&device, p);`
`4376`	`4378`	`}`
`4377`		`- mbfl_memory_device_strncat(&device, CRLF, sizeof(CRLF)-1);`
	`4379`	`+ mbfl_memory_device_strncat(&device, line_sep, line_sep_len);`
`4378`	`4380`	`}`
`4379`	`4381`	`if (!suppressed_hdrs.cnt_trans_enc) {`
`4380`	`4382`	`mbfl_memory_device_strncat(&device, PHP_MBSTR_MAIL_MIME_HEADER4, sizeof(PHP_MBSTR_MAIL_MIME_HEADER4) - 1);`
`@@ -4383,10 +4385,12 @@ PHP_FUNCTION(mb_send_mail)`
`4383`	`4385`	`p = "7bit";`
`4384`	`4386`	`}`
`4385`	`4387`	`mbfl_memory_device_strcat(&device, p);`
`4386`		`- mbfl_memory_device_strncat(&device, CRLF, sizeof(CRLF)-1);`
	`4388`	`+ mbfl_memory_device_strncat(&device, line_sep, line_sep_len);`
`4387`	`4389`	`}`
`4388`	`4390`
`4389`		`- mbfl_memory_device_unput(&device);`
	`4391`	`+ if (!PG(mail_mixed_lf_and_crlf)) {`
	`4392`	`+ mbfl_memory_device_unput(&device);`
	`4393`	`+ }`
`4390`	`4394`	`mbfl_memory_device_unput(&device);`
`4391`	`4395`	`mbfl_memory_device_output('\0', &device);`
`4392`	`4396`	`str_headers = zend_string_init((char )device.buffer, strlen((char )device.buffer), 0);`