com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pcre/pcrelib/config.h
| From: | Stanislav Malyshev | Date: | Sun, 31 May 2015 04:18:28 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pcre/pcrelib/config.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87011@lists.php.net to get a copy of this message | ||
Commit: 930fb8b1f32437851b7a162a36cce56e5f54e4f9
Author: Stanislav Malyshev <stas@php.net> Sat, 30 May 2015 21:18:28 -0700
Parents: 5683b6fa3962f483a407ca17d49397b203ed4145 f38ca75a3cc5737bdb922dc5e2a7505cd20cd7ea
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=930fb8b1f32437851b7a162a36cce56e5f54e4f9
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update PCRE version (bug #69689)
move test
NEWS 5.4
fix new test
Fixed Bug #69667 segfault in php_pgsql_meta_data
5.4.42 next
Conflicts:
configure.in
main/php_version.h
Bugs:
https://bugs.php.net/69689
https://bugs.php.net/69667
Changed paths:
MM ext/pcre/pcrelib/config.h
Diff: