We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 6bb56fe commit 10f1c9bCopy full SHA for 10f1c9b
sapi/apache2handler/sapi_apache2.c
@@ -592,6 +592,7 @@ static int php_handler(request_rec *r)
592
apr_bucket *bucket;
593
apr_status_t rv;
594
request_rec * volatile parent_req = NULL;
595
+ JMP_BUF *parent_bailout = NULL;
596
#ifdef ZTS
597
/* initial resource fetch */
598
(void)ts_resource(0);
@@ -665,6 +666,10 @@ static int php_handler(request_rec *r)
665
666
ap_add_cgi_vars(r);
667
}
668
669
+ if (parent_bailout == NULL && parent_req && EG(bailout)) {
670
+ parent_bailout = EG(bailout);
671
+ }
672
+
673
zend_first_try {
674
675
if (ctx == NULL) {
@@ -749,6 +754,10 @@ zend_first_try {
749
754
ctx->r = parent_req;
750
755
751
756
757
+ if (parent_bailout) {
758
+ EG(bailout) = parent_bailout;
759
760
752
761
return OK;
753
762
763
0 commit comments