summaryrefslogtreecommitdiff
path: root/ext/mcrypt/mcrypt.c
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2014-10-31 18:58:59 +0100
committerMatteo Beccati <mbeccati@php.net>2014-10-31 18:58:59 +0100
commitddcd221e5ebdf1a0609fea7798b6e4a190e9a1be (patch)
tree3824ede0824286724ca2c0890a1aaaa00f5aeb09 /ext/mcrypt/mcrypt.c
parent53f258e2d409679989430147a43ce0c5bb29775f (diff)
parente797db890913924ae1d344c3bbd985169c42a87a (diff)
downloadphp-git-ddcd221e5ebdf1a0609fea7798b6e4a190e9a1be.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: 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/mcrypt/mcrypt.c')
0 files changed, 0 insertions, 0 deletions