Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix build warning
This commit is contained in:
Nikita Popov 2021-04-27 10:11:20 +02:00
commit b74f5ee477

View file

@ -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 */ /* adrlists do not support folding, but swallow trailing line breaks */
&& !((adrlist && p[1] == '\0') && !((adrlist && p[1] == '\0')
/* other headers support folding */ /* other headers support folding */
|| !adrlist && (p[1] == ' ' || p[1] == '\t'))) { || (!adrlist && (p[1] == ' ' || p[1] == '\t')))) {
return 1; return 1;
} }
p++; p++;