com php-src: Merge remote-tracking branch 'datibbaw/kill-ereg': ext/mbstring/mbstring.c ext/opcache/zend_accelerator_blackl ist.c ext/pgsql/pgsql.c

From: Date: Thu, 05 Mar 2015 00:21:38 +0000
Subject: com php-src: Merge remote-tracking branch 'datibbaw/kill-ereg': ext/mbstring/mbstring.c ext/opcache/zend_accelerator_blackl ist.c ext/pgsql/pgsql.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85227@lists.php.net to get a copy of this message
Commit: fea9a6fc7702c53df5e9f4c16857dc921d8b5997 Author: Adam Harvey <aharvey@php.net> Thu, 5 Mar 2015 00:21:38 +0000 Parents: fd1578c196575c7e120a84ee030bb87c14a199b0 fcb1ab1b0e9a2d89ec52f321de184c558d97d0c1 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fea9a6fc7702c53df5e9f4c16857dc921d8b5997 Log: 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 Changed paths: MM ext/mbstring/mbstring.c MM ext/opcache/zend_accelerator_blacklist..c MM ext/pgsql/pgsql.c Diff: diff --cc ext/mbstring/mbstring.c index 20bca12,965c6be..d2c9ace --- a/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/pgsql/pgsql.c index f0e4532,1d51b05..e54e8ad --- a/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 */

« previous php.cvs (#85227) next »