]> granicus.if.org Git - php/commit
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)
commit9fbfdb3396657caf143265d63c2a00362c14398d
tree7738a7bd7ae92827ccbff14176e3049776c5cd68
parentb5a0f128718d93a236b450bb9b409477f0a97888
parent22700890d4c332b76866c73a5a68c76f601257a6
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# 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