From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 15 Oct 2020 11:20:58 +0000 (+0200)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecd51aa099854a85585671947f053b69d5b73ceb;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix broken fix for #80239
---

ecd51aa099854a85585671947f053b69d5b73ceb