]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 21 Feb 2014 22:14:48 +0000 (23:14 +0100)
committerAnatol Belski <ab@php.net>
Fri, 21 Feb 2014 22:14:48 +0000 (23:14 +0100)
commit38d02db86da7bb314cd921fbe5893b9faadc721e
tree19863969e112b645559fc9f2f26d221427c6f044
parenta27db7d2daa9ded873f7589272a2d12d7f586f9d
parent5b6ef90bc0de63d2aa1f91d52b46021313aa18b5
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix linkage
  More openssl UPGRADING updates
  Fix build against older OpenSSL libs
  Update NEWS/UPGRADING with openssl additions
ext/openssl/openssl.c
ext/openssl/xp_ssl.c