granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 307e155 f5c0754)

author	Anatol Belski <ab@php.net>
	Tue, 21 Nov 2017 19:11:21 +0000 (20:11 +0100)
committer	Anatol Belski <ab@php.net>
	Tue, 21 Nov 2017 19:11:21 +0000 (20:11 +0100)
commit	f6b0d365a709ae71cd9f77b25c337a6e6883f68d
tree	a5647801ccd95876c8c2ef3a143870906fe3a56e	tree \| snapshot
parent	307e15592b31d65047aa04ba7892193a22ff4f94	commit \| diff
parent	f5c0754f6e235c54ccee03c520969ee75723c83d	commit \| diff

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

ext/pcre/php_pcre.c

Unnamed repository; edit this file 'description' to name the repository.