]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Wed, 26 Feb 2014 20:24:07 +0000 (13:24 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Wed, 26 Feb 2014 20:24:07 +0000 (13:24 -0700)
commited00de58bfc04c5889c3df783c6789b0f4fb4a51
tree4ed70e5748b89d070cfa4914b0584b7a9e29cd0c
parentbfd967c11f040e4cf8eaa11c103ea29c8aad7905
parentd0a6f8c68ec1044e936735f28bdc1bbd35f81362
Merge branch 'PHP-5.6'

* PHP-5.6:
  Deprecate CN_match in favor of peer_name in SSL contexts
ext/openssl/openssl.c