com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pcre/pcrelib/ChangeLog ext/pcre/pcrelib/doc/pcre.txt ext/pcre/pcrelib/pcre_compile.c
ext/pcre/pcrelib/pcre_e xec.c ext/pcre/pcrelib/pcre_internal.h ext/pcre/pcrel ib/pcre_study.c ext/pcre/pcrelib/pcre_xclass.c ext/
pcre/tests/backtrack_limit.phpt

From: Date: Mon, 01 Feb 2016 05:39:24 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pcre/pcrelib/ChangeLog ext/pcre/pcrelib/doc/pcre.txt ext/pcre/pcrelib/pcre_compile.c
ext/pcre/pcrelib/pcre_e xec.c ext/pcre/pcrelib/pcre_internal.h ext/pcre/pcrel ib/pcre_study.c ext/pcre/pcrelib/pcre_xclass.c ext/
pcre/tests/backtrack_limit.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90847@lists.php.net to get a copy of this message
Commit: 916c1fb3af99706f73c5974616834bb5a71909e3 Author: Stanislav Malyshev <stas@php.net> Sun, 31 Jan 2016 21:29:46 -0800 Parents: 265ccef39bacb3982e4c9a7d7fc589ee1af4da52 00788f9cfbdca9b52b148b7219c9ba05cdc6e130 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=916c1fb3af99706f73c5974616834bb5a71909e3 Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Upgrade bundled PCRE to 8.38 Fixed NEWS file entry fix the fix for bug #70976 (imagerotate) Conflicts: ext/pcre/pcrelib/config.h Bugs: https://bugs.php.net/70976 Changed paths: MM ext/pcre/pcrelib/ChangeLog MM ext/pcre/pcrelib/doc/pcre.txt MM ext/pcre/pcrelib/pcre_compile.c MM ext/pcre/pcrelib/pcre_exec.c MM ext/pcre/pcrelib/pcre_internal.h MM ext/pcre/pcrelib/pcre_study.c MM ext/pcre/pcrelib/pcre_xclass.c MM ext/pcre/tests/backtrack_limit.phpt Diff: diff --cc ext/pcre/tests/backtrack_limit.phpt index 419e6c2,419e6c2..3f0d8e6 --- a/ext/pcre/tests/backtrack_limit.phpt +++ b/ext/pcre/tests/backtrack_limit.phpt @@@ -8,6 -8,6 +8,7 @@@ if (@preg_match_all('/\p{N}/', '0123456 ?> --INI-- pcre.backtrack_limit=2 ++pcre.jit=0 --FILE-- <?php

« previous php.cvs (#90847) next »