Fix phpGH-17509: Apache parent and subrequest double bailout

bukka · Jan 31, 2025 · fda064f · fda064f
1 parent f8b57ff
commit fda064f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
@@ -665,6 +665,8 @@ static int php_handler(request_rec *r)
 		ap_add_cgi_vars(r);
 	}
 
+	JMP_BUF *parent_bailout = parent_req && EG(bailout) ? EG(bailout): NULL;
+
 zend_first_try {
 
 	if (ctx == NULL) {
@@ -749,6 +751,10 @@ zend_first_try {
 		ctx->r = parent_req;
 	}
 
+	if (parent_bailout) {
+		EG(bailout) = parent_bailout;
+	}
+
 	return OK;
 }