From: Stanislav Malyshev <stas@php.net>
Date: Tue, 8 May 2012 17:21:10 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~222
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08779069e86d72336f52078276c3296455fae4f7;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  c++ comments
  restore BC
  ws + restore BC to apache_request_headers
  fix bug #61807 - Buffer Overflow in apache_request_headers
---

08779069e86d72336f52078276c3296455fae4f7