archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Patch core for PCRE2 support

Browse source 
RFC https://wiki.php.net/rfc/pcre2-migration
This commit is contained in:
Anatol Belski 2017-10-12 12:48:36 +02:00
parent fd463cfbad
commit a5bc5aed71
186 changed files with 39246 additions and 125222 deletions
Download patch file Download diff file Expand all files Collapse all files

7
win32/sendmail.c
View file

@ -145,7 +145,7 @@ static zend_string *php_win32_mail_trim_header(char *header)
regex = zend_string_init(PHP_WIN32_MAIL_UNIFY_PATTERN, sizeof(PHP_WIN32_MAIL_UNIFY_PATTERN)-1, 0);
result = php_pcre_replace(regex,
NULL, header, (int)strlen(header),
NULL, header, strlen(header),
replace,
-1,
NULL);
@ -161,7 +161,7 @@ static zend_string *php_win32_mail_trim_header(char *header)
regex = zend_string_init(PHP_WIN32_MAIL_RMVDBL_PATTERN, sizeof(PHP_WIN32_MAIL_RMVDBL_PATTERN)-1, 0);
result2 = php_pcre_replace(regex,
result, ZSTR_VAL(result), (int)ZSTR_LEN(result),
result, ZSTR_VAL(result), ZSTR_LEN(result),
replace,
-1,
NULL);
@ -220,6 +220,9 @@ PHPAPI int TSendMail(char *host, int *error, char **error_message,
/* Create a lowercased header for all the searches so we're finally case
* insensitive when searching for a pattern. */
headers_lc = zend_string_tolower(headers_trim);
if (headers_lc == headers_trim) {
zend_string_release(headers_lc);
}
}
/* Fall back to sendmail_from php.ini setting */