]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Wed, 19 Feb 2014 11:19:30 +0000 (04:19 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Wed, 19 Feb 2014 11:19:30 +0000 (04:19 -0700)
commitaf318419adaa25be22326a2fb9908fd65d84e6ed
treeb5af85d8b9ebb7886a19396985abfa6cf7a9bcba
parent4c1baa8263f94b4690e1ba9b43d0177fc18d43ee
parente272225e2a7b7725fdc9741a549ba428acca49e7
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add tests for Bug #65538
  Fix Bug #65538 (cafile now supports stream wrappers)
ext/openssl/openssl.c