]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'datibbaw/kill-ereg'
authorAdam Harvey <aharvey@php.net>
Thu, 5 Mar 2015 00:21:38 +0000 (00:21 +0000)
committerAdam Harvey <aharvey@php.net>
Thu, 5 Mar 2015 00:21:38 +0000 (00:21 +0000)
commitfea9a6fc7702c53df5e9f4c16857dc921d8b5997
treeda608158cb83f5be92a760c5191c6028dfb171df
parentfd1578c196575c7e120a84ee030bb87c14a199b0
parentfcb1ab1b0e9a2d89ec52f321de184c558d97d0c1
Merge remote-tracking branch 'datibbaw/kill-ereg'

Conflicts:
ext/ereg/config.w32
ext/ereg/config0.m4
ext/ereg/ereg.c
ext/ereg/php_ereg.h
ext/ereg/php_regex.h
ext/ereg/regex/engine.c
ext/ereg/regex/main.c
ext/ereg/regex/regcomp.c
ext/ereg/regex/regerror.c
ext/ereg/tests/split_error_002.phpt
ext/ereg/tests/split_variation_003.phpt
ext/ereg/tests/spliti_error_002.phpt
ext/ereg/tests/spliti_variation_003.phpt
ext/pgsql/pgsql.c
sapi/apache/php_apache_http.h
sapi/apache_hooks/php_apache_http.h
ext/mbstring/mbstring.c
ext/opcache/zend_accelerator_blacklist.c
ext/pgsql/pgsql.c