]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Wed, 9 Oct 2013 16:40:54 +0000 (09:40 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 9 Oct 2013 16:40:54 +0000 (09:40 -0700)
# By Daniel Lowrey (1) and Michael Wallner (1)
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  C89 compatibility
  Fixed segfault when built with OpenSSL >= 1.0.1


Trivial merge