Merge branch 'PHP-8.1' into PHP-8.2

nielsdos · nielsdos · commit 1288c07ba6c9 · 2023-06-27T17:54:39.000+02:00
* PHP-8.1:
  Fix context option check for "overwrite" in FTP
diff --git a/NEWS b/NEWS
@@ -8,6 +8,9 @@ PHP                                                                        NEWS
 - Date:
   . Fixed bug GH-11368 (Date modify returns invalid datetime). (Derick)
 
+- FTP:
+  . Fix context option check for "overwrite". (JonasQuinten)
+
 - PCNTL:
   . Fixed bug GH-11498 (SIGCHLD is not always returned from proc_open).
     (nielsdos)
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
@@ -490,7 +490,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, const char *pa
 	} else if (read_write == 2) {
 		/* when writing file (but not appending), it must NOT exist, unless a context option exists which allows it */
 		if (context && (tmpzval = php_stream_context_get_option(context, "ftp", "overwrite")) != NULL) {
-			allow_overwrite = Z_LVAL_P(tmpzval) ? 1 : 0;
+			allow_overwrite = zend_is_true(tmpzval);
 		}
 		if (result <= 299 && result >= 200) {
 			if (allow_overwrite) {

Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper wrapper, const char pa`
`490`	`490`	`} else if (read_write == 2) {`
`491`	`491`	`/* when writing file (but not appending), it must NOT exist, unless a context option exists which allows it */`
`492`	`492`	`if (context && (tmpzval = php_stream_context_get_option(context, "ftp", "overwrite")) != NULL) {`
`493`		`- allow_overwrite = Z_LVAL_P(tmpzval) ? 1 : 0;`
	`493`	`+ allow_overwrite = zend_is_true(tmpzval);`
`494`	`494`	`}`
`495`	`495`	`if (result <= 299 && result >= 200) {`
`496`	`496`	`if (allow_overwrite) {`