From: Christopher Jones <sixd@php.net>
Date: Wed, 9 Oct 2013 16:40:54 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
X-Git-Tag: php-5.5.5~4^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fbfdb3396657caf143265d63c2a00362c14398d;p=php

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
---

9fbfdb3396657caf143265d63c2a00362c14398d