]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Thu, 2 Jul 2015 22:25:03 +0000 (00:25 +0200)
committerChristoph M. Becker <cmb@php.net>
Thu, 2 Jul 2015 22:25:03 +0000 (00:25 +0200)
* PHP-5.6:
  updated NEWS
  Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns

1  2 
ext/odbc/php_odbc.c

Simple merge