David Soria Parra 443e3b4c93 Merge branch 'PHP-5.4' ...

* PHP-5.4:
  Fixed bug #61461 (missing checks around malloc() calls).

Conflicts:
	NEWS

2012-03-21 12:15:33 +01:00

..

aolserver

- Year++

2012-01-01 13:15:04 +00:00

apache

- Year++

2012-01-01 13:15:04 +00:00

apache2filter

Fixed bug #61172 (Add Apache 2.4 support)

2012-03-02 00:07:41 +00:00

apache2handler

Fixed bug #61172 (Add Apache 2.4 support)

2012-03-02 00:07:41 +00:00

apache_hooks

- Year++

2012-01-01 13:15:04 +00:00

caudium

- Year++

2012-01-01 13:15:04 +00:00

cgi

Fixed reinitialization of SAPI callbacks after php_module_startup()

2012-02-14 13:31:23 +00:00

cli

Fixed bug #61461 (missing checks around malloc() calls).

2012-03-20 21:07:08 -04:00

continuity

Merge branch 'PHP-5.3' into PHP-5.4

2012-03-20 17:58:58 +01:00

embed

- Year++

2012-01-01 13:15:04 +00:00

fpm

Merge branch '53' into 54

2012-03-19 13:10:53 -04:00

isapi

- Year++

2012-01-01 13:15:04 +00:00

litespeed

fixed a crash in cli mode when apache_request_headers() is called

2011-12-31 18:15:22 +00:00

milter

- Year++

2012-01-01 13:15:04 +00:00

nsapi

Merge branch 'PHP-5.3' into PHP-5.4

2012-03-20 17:58:58 +01:00

phttpd

- Year++

2012-01-01 13:15:04 +00:00

pi3web

- Year++

2012-01-01 13:15:04 +00:00

roxen

- Year++

2012-01-01 13:15:04 +00:00

tests

- Rewrite scanner to be based on re2c instead of flex

2008-03-16 21:06:55 +00:00

thttpd

- Year++

2012-01-01 13:15:04 +00:00

tux

- Year++

2012-01-01 13:15:04 +00:00

webjames

- Year++

2012-01-01 13:15:04 +00:00