From: Anatol Belski <ab@php.net>
Date: Tue, 21 Nov 2017 19:11:21 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.1RC1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6b0d365a709ae71cd9f77b25c337a6e6883f68d;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed #75539 and #74183 - preg_last_error not returning error code after error
---

f6b0d365a709ae71cd9f77b25c337a6e6883f68d