]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Thu, 31 Jul 2014 04:18:19 +0000 (12:18 +0800)
committerTjerk Meesters <datibbaw@php.net>
Thu, 31 Jul 2014 04:18:19 +0000 (12:18 +0800)
commita41a16c5cd5af985be349d0cad8d0ad37698aae1
tree1dc84c632fd1d2b252db8a52adebf2609712e440
parent33ce329f57c039c45c6c5ab3239bcb9354f87ac3
parent8f345a7148dc396722dd48e25f17146975a04a63
Merge branch 'PHP-5.6'

* PHP-5.6:
  Moved streams related functions to xp_ssl.c
ext/openssl/openssl.c
ext/openssl/xp_ssl.c