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

diff --cc ext/mbstring/mbstring.c
index 20bca129ffbefc2bb793c9a55e740f2c38b4a972,965c6be356eda2fa042966b90e82a6ba75a087a1..d2c9ace36ec8f3f2e89c5264c183fa4147daedc8
--- 1/ext/mbstring/mbstring.c
--- 2/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@@ -204,15 -204,8 +204,8 @@@ static const struct mb_overload_def mb_
        {MB_OVERLOAD_STRING, "strtolower", "mb_strtolower", "mb_orig_strtolower"},
        {MB_OVERLOAD_STRING, "strtoupper", "mb_strtoupper", "mb_orig_strtoupper"},
        {MB_OVERLOAD_STRING, "substr_count", "mb_substr_count", "mb_orig_substr_count"},
- #if HAVE_MBREGEX
-       {MB_OVERLOAD_REGEX, "ereg", "mb_ereg", "mb_orig_ereg"},
-       {MB_OVERLOAD_REGEX, "eregi", "mb_eregi", "mb_orig_eregi"},
-       {MB_OVERLOAD_REGEX, "ereg_replace", "mb_ereg_replace", "mb_orig_ereg_replace"},
-       {MB_OVERLOAD_REGEX, "eregi_replace", "mb_eregi_replace", "mb_orig_eregi_replace"},
-       {MB_OVERLOAD_REGEX, "split", "mb_split", "mb_orig_split"},
- #endif
        {0, NULL, NULL, NULL}
 -}; 
 +};
  /* }}} */
  
  /* {{{ arginfo */

diff --cc ext/opcache/zend_accelerator_blacklist.c
Simple merge

diff --cc ext/pgsql/pgsql.c
index f0e453223753afa581b24f62394cb232cd9292e0,1d51b05b9fb28ab8e266755ba83a710c0741e0e3..e54e8adbbc1b71591ea4ac8f5aa8ec550212f562
--- 1/ext/pgsql/pgsql.c
--- 2/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -35,8 -35,8 +35,8 @@@
  #include "php.h"
  #include "php_ini.h"
  #include "ext/standard/php_standard.h"
 -#include "ext/standard/php_smart_str.h"
 +#include "zend_smart_str.h"
- #include "ext/ereg/php_regex.h"
+ #include "ext/pcre/php_pcre.h"
  #ifdef PHP_WIN32
  # include "win32/time.h"
  #endif
@@@ -5715,12 -5635,12 +5715,12 @@@ static php_pgsql_data_type php_pgsql_ge
  /* {{{ php_pgsql_convert_match
   * test field value with regular expression specified.
   */
 -static int php_pgsql_convert_match(const char *str, size_t str_len, const char *regex , int icase TSRMLS_DC)
 +static int php_pgsql_convert_match(const char *str, size_t str_len, const char *regex , int icase)
  {
-       regex_t re;
-       regmatch_t *subs;
-       int regopt = REG_EXTENDED;
-       int regerr, ret = SUCCESS;
+       pcre *re;
+       const char *err_msg;
+       int err_offset;
+       int options = PCRE_NO_AUTO_CAPTURE, res;
        size_t i;
  
        /* Check invalid chars for POSIX regex */