From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 22 Jan 2020 08:45:37 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f4d07bff0e82d5aca187cc76246cc225333900a;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79149: SEGV in mb_convert_encoding with non-string encodings
---

8f4d07bff0e82d5aca187cc76246cc225333900a