Curl shutdown check on progress.

a.stecher · a.stecher · commit 048c504c9cbb · 2026-03-15T17:58:11.000+01:00
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -602,9 +602,9 @@ static int curl_fnmatch(void *ctx, const char *pattern, const char *string)
 /* {{{ curl_progress */
 static int curl_progress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
 {
-	/* 2. Check if we are in a "bailout" state (timeout) */
-	if (EG(exception) || (EG(flags) & ZEN_EG_BAILOUT)) {
-		return 1; 
+	/* 2. Do not call progress callback if we are in a shutdown state (eg. timeout)*/
+	if (UNEXPECTED(EG(flags) & EG_FLAGS_IN_SHUTDOWN)) {
+		return 0;
 	}
 
 	php_curl *ch = (php_curl *)clientp;

Original file line number	Diff line number	Diff line change
`@@ -602,9 +602,9 @@ static int curl_fnmatch(void ctx, const char pattern, const char *string)`
`602`	`602`	`/* {{{ curl_progress */`
`603`	`603`	`static int curl_progress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)`
`604`	`604`	`{`
`605`		`- /* 2. Check if we are in a "bailout" state (timeout) */`
`606`		`- if (EG(exception) \|\| (EG(flags) & ZEN_EG_BAILOUT)) {`
`607`		`- return 1;`
	`605`	`+ /* 2. Do not call progress callback if we are in a shutdown state (eg. timeout)*/`
	`606`	`+ if (UNEXPECTED(EG(flags) & EG_FLAGS_IN_SHUTDOWN)) {`
	`607`	`+ return 0;`
`608`	`608`	`}`
`609`	`609`
`610`	`610`	`php_curl ch = (php_curl )clientp;`