com php-src: Merge branch 'PHP-5.6': ext/odbc/php_odbc.h ext/odbc/php_odbc_includes.h
| From: | Anatol Belski | Date: | Fri, 06 Feb 2015 18:05:43 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/odbc/php_odbc.h ext/odbc/php_odbc_includes.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84685@lists.php.net to get a copy of this message | ||
Commit: d0319e60b94f0016a2c516f5e0f199f445360cba
Author: Anatol Belski <ab@php.net> Fri, 6 Feb 2015 19:05:43 +0100
Parents: e033af4ed6a811f0710acaba166a4924cda7f73e e46e208819f4ce18390d77131f79b5b498d59bb7
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d0319e60b94f0016a2c516f5e0f199f445360cba
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
Bugs:
https://bugs.php.net/68964
Changed paths:
MM ext/odbc/php_odbc.h
MM ext/odbc/php_odbc_includes.h
Diff: