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

Author: Nikita Popov (nikic) Date: 2021-04-27T10:11:20+02:00 Commit: https://github.com/php/php-src/commit/b74f5ee477da4b4096d2dbe916f979fc9884d18c Raw diff: https://github.com/php/php-src/commit/b74f5ee477da4b4096d2dbe916f979fc9884d18c.diff Merge branch 'PHP-8.0' * PHP-8.0: 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 76a3c7f2c008..4275360165c1 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -3032,7 +3032,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++;