summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2014-10-31 18:57:59 +0100
committerMatteo Beccati <mbeccati@php.net>2014-10-31 18:57:59 +0100
commite797db890913924ae1d344c3bbd985169c42a87a (patch)
tree87288c29519800114cbc226e94095ce19713e9ac /ext/pcre/php_pcre.c
parentd017c4bf3ae8c49340b56f9ab1d31d2793f65489 (diff)
parent29ee69434122bcda8c904ff6fbde2b9c74332240 (diff)
downloadphp-git-e797db890913924ae1d344c3bbd985169c42a87a.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions