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)
commit73de105481a97c60cd4a931d53cc17a9e3772b40
tree3cd945794c3c2ff4720cb4f470e00232d878ffad
parentfe29b8134cbacf6ca07e948be4fe66813817cdad
parent65a9a5ca1283cf7ed59a5a14362fd6de0ad713b8
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #68265 (SAN match fails with trailing DNS dot)
ext/openssl/xp_ssl.c