]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 06:56:36 +0000 (23:56 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 06:56:36 +0000 (23:56 -0700)
* PHP-5.6:
  Fixed bug #68265 (SAN match fails with trailing DNS dot)

1  2 
ext/openssl/xp_ssl.c

Simple merge