Skip to content

Commit fda064f

Browse files
committed
Fix GH-17509: Apache parent and subrequest double bailout
1 parent f8b57ff commit fda064f

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

sapi/apache2handler/sapi_apache2.c

+6
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,8 @@ static int php_handler(request_rec *r)
665665
ap_add_cgi_vars(r);
666666
}
667667

668+
JMP_BUF *parent_bailout = parent_req && EG(bailout) ? EG(bailout): NULL;
669+
668670
zend_first_try {
669671

670672
if (ctx == NULL) {
@@ -749,6 +751,10 @@ zend_first_try {
749751
ctx->r = parent_req;
750752
}
751753

754+
if (parent_bailout) {
755+
EG(bailout) = parent_bailout;
756+
}
757+
752758
return OK;
753759
}
754760

0 commit comments

Comments
 (0)