Merge branch 'PHP-8.0'

nikic · nikic · commit b74f5ee477da · 2021-04-27T10:11:20.000+02:00
* PHP-8.0:
  Fix build warning
diff --git 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++;

Original file line number	Diff line number	Diff line change
`@@ -3032,7 +3032,7 @@ static zend_bool header_injection(zend_string *str, zend_bool adrlist)`
`3032`	`3032`	`/* adrlists do not support folding, but swallow trailing line breaks */`
`3033`	`3033`	`&& !((adrlist && p[1] == '\0')`
`3034`	`3034`	`/* other headers support folding */`
`3035`		`- \|\| !adrlist && (p[1] == ' ' \|\| p[1] == '\t'))) {`
	`3035`	`+ \|\| (!adrlist && (p[1] == ' ' \|\| p[1] == '\t')))) {`
`3036`	`3036`	`return 1;`
`3037`	`3037`	`}`
`3038`	`3038`	`p++;`