]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 6 Feb 2015 18:05:43 +0000 (19:05 +0100)
committerAnatol Belski <ab@php.net>
Fri, 6 Feb 2015 18:05:43 +0000 (19:05 +0100)
commitd0319e60b94f0016a2c516f5e0f199f445360cba
tree253484e871e31214d47fc0223169e1b37f008850
parente033af4ed6a811f0710acaba166a4924cda7f73e
parente46e208819f4ce18390d77131f79b5b498d59bb7
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #68964 Allowed memory size exhausted with odbc_exec
ext/odbc/php_odbc.h
ext/odbc/php_odbc_includes.h