Merge branch 'PHP-7.4' into PHP-8.0

nikic · nikic · commit 7544f66da938 · 2021-04-27T10:10:55.000+02:00
* PHP-7.4:
  Fix build warning
diff --git 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++;

Original file line number	Diff line number	Diff line change
`@@ -3072,7 +3072,7 @@ static zend_bool header_injection(zend_string *str, zend_bool adrlist)`
`3072`	`3072`	`/* adrlists do not support folding, but swallow trailing line breaks */`
`3073`	`3073`	`&& !((adrlist && p[1] == '\0')`
`3074`	`3074`	`/* other headers support folding */`
`3075`		`- \|\| !adrlist && (p[1] == ' ' \|\| p[1] == '\t'))) {`
	`3075`	`+ \|\| (!adrlist && (p[1] == ' ' \|\| p[1] == '\t')))) {`
`3076`	`3076`	`return 1;`
`3077`	`3077`	`}`
`3078`	`3078`	`p++;`