Skip to content

Commit 1be9fa3

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: updated VERSION for 2.3.42 update CONTRIBUTORS for 2.3.42 updated CHANGELOG for 2.3.42 Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)" Partial revert of previous PR [DependencyInjection] Skip deep reference check for 'service_container' Catch \Throwable [Serializer] Add missing @throws annotations Fix for #18843 force enabling the external XML entity loaders Removed UTC specification with timestamp
2 parents 298c80b + 57e0329 commit 1be9fa3

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

DependencyInjection/ContainerAwareHttpKernel.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
7171
$this->container->set('request', null, 'request');
7272
$this->container->leaveScope('request');
7373

74+
throw $e;
75+
} catch (\Throwable $e) {
76+
$this->container->set('request', null, 'request');
77+
$this->container->leaveScope('request');
78+
7479
throw $e;
7580
}
7681

0 commit comments

Comments
 (0)