From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 16 Nov 2017 14:10:04 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.3.0alpha1~1009
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73bde7bbd0e2207383752581d10bdd92b897dd37;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fix (*NO_JIT) usage when JIT is enabled
  Refactor ASCII to wide conversion
---

73bde7bbd0e2207383752581d10bdd92b897dd37