ext/session: remove unused progress parameter in early_find_sid_in()

Girgias · Girgias · commit 38467a06d63a · 2026-02-05T23:52:28.000Z
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -3047,7 +3047,7 @@ static PHP_MINFO_FUNCTION(session)
    * Upload hook handling *
    ************************ */
 
-static bool early_find_sid_in(zval *dest, int where, php_session_rfc1867_progress *progress)
+static bool early_find_sid_in(zval *dest, int where)
 {
 	zval *potential_session_id;
 
@@ -3070,7 +3070,7 @@ static void php_session_rfc1867_early_find_sid(php_session_rfc1867_progress *pro
 
 	if (PS(use_cookies)) {
 		sapi_module.treat_data(PARSE_COOKIE, NULL, NULL);
-		if (early_find_sid_in(&progress->sid, TRACK_VARS_COOKIE, progress)) {
+		if (early_find_sid_in(&progress->sid, TRACK_VARS_COOKIE)) {
 			progress->apply_trans_sid = false;
 			return;
 		}
@@ -3079,7 +3079,7 @@ static void php_session_rfc1867_early_find_sid(php_session_rfc1867_progress *pro
 		return;
 	}
 	sapi_module.treat_data(PARSE_GET, NULL, NULL);
-	early_find_sid_in(&progress->sid, TRACK_VARS_GET, progress);
+	early_find_sid_in(&progress->sid, TRACK_VARS_GET);
 }
 
 static bool php_check_cancel_upload(php_session_rfc1867_progress *progress)

Original file line number	Diff line number	Diff line change
`@@ -3047,7 +3047,7 @@ static PHP_MINFO_FUNCTION(session)`
`3047`	`3047`	`* Upload hook handling *`
`3048`	`3048`	`************************ */`
`3049`	`3049`
`3050`		`-static bool early_find_sid_in(zval dest, int where, php_session_rfc1867_progress progress)`
	`3050`	`+static bool early_find_sid_in(zval *dest, int where)`
`3051`	`3051`	`{`
`3052`	`3052`	`zval *potential_session_id;`
`3053`	`3053`
`@@ -3070,7 +3070,7 @@ static void php_session_rfc1867_early_find_sid(php_session_rfc1867_progress *pro`
`3070`	`3070`
`3071`	`3071`	`if (PS(use_cookies)) {`
`3072`	`3072`	`sapi_module.treat_data(PARSE_COOKIE, NULL, NULL);`
`3073`		`- if (early_find_sid_in(&progress->sid, TRACK_VARS_COOKIE, progress)) {`
	`3073`	`+ if (early_find_sid_in(&progress->sid, TRACK_VARS_COOKIE)) {`
`3074`	`3074`	`progress->apply_trans_sid = false;`
`3075`	`3075`	`return;`
`3076`	`3076`	`}`
`@@ -3079,7 +3079,7 @@ static void php_session_rfc1867_early_find_sid(php_session_rfc1867_progress *pro`
`3079`	`3079`	`return;`
`3080`	`3080`	`}`
`3081`	`3081`	`sapi_module.treat_data(PARSE_GET, NULL, NULL);`
`3082`		`- early_find_sid_in(&progress->sid, TRACK_VARS_GET, progress);`
	`3082`	`+ early_find_sid_in(&progress->sid, TRACK_VARS_GET);`
`3083`	`3083`	`}`
`3084`	`3084`
`3085`	`3085`	`static bool php_check_cancel_upload(php_session_rfc1867_progress *progress)`