]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  c++ comments
  restore BC
  ws + restore BC to apache_request_headers
  fix bug #61807 - Buffer Overflow in apache_request_headers

1  2 
sapi/cgi/cgi_main.c

Simple merge