[php-src] master: Merge branch 'PHP-7.4' into PHP-8.0

Author: Nikita Popov (nikic) Date: 2021-04-27T10:10:55+02:00 Commit: https://github.com/php/php-src/commit/7544f66da93803f82c2111fefe5bccb5208255f8 Raw diff: https://github.com/php/php-src/commit/7544f66da93803f82c2111fefe5bccb5208255f8.diff Merge branch 'PHP-7.4' into PHP-8.0 * PHP-7.4: Fix build warning Changed paths: M ext/imap/php_imap.c Diff: diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 806d9d1bba3f..7e0faa4b7b1d 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -3072,7 +3072,7 @@ static zend_bool header_injection(zend_string *str, zend_bool adrlist) /* adrlists do not support folding, but swallow trailing line breaks */ && !((adrlist && p[1] == '\0') /* other headers support folding */ - || !adrlist && (p[1] == ' ' || p[1] == '\t'))) { + || (!adrlist && (p[1] == ' ' || p[1] == '\t')))) { return 1; } p++;