]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Tue, 21 Nov 2017 19:11:21 +0000 (20:11 +0100)
committerAnatol Belski <ab@php.net>
Tue, 21 Nov 2017 19:11:21 +0000 (20:11 +0100)
* PHP-7.1:
  Fixed #75539 and #74183 - preg_last_error not returning error code after error

1  2 
ext/pcre/php_pcre.c

Simple merge