]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Tue, 8 May 2012 17:21:10 +0000 (10:21 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 8 May 2012 17:21:10 +0000 (10:21 -0700)
commit08779069e86d72336f52078276c3296455fae4f7
tree1168404ead10379e6e11942f5894e8d7ab48311b
parenteafc567213886cc049fdbca147ab5d84dd93b117
parent057f4719d3825fff3f0cfe0f263168b227d93205
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
sapi/cgi/cgi_main.c