Xinchen Hui 63d9c1f40b Merge branch 'PHP-5.4' ...

Conflicts:
	sapi/litespeed/lsapi_main.c

2012-09-05 23:20:42 +08:00

..

aolserver

- Year++

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

apache

- Year++

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

apache2filter

- Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)

2012-07-08 14:05:28 -03: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

Merge branch 'PHP-5.4'

2012-08-18 12:22:47 +08:00

cli

Merge branch 'PHP-5.4'

2012-09-05 23:20:42 +08: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 'PHP-5.3' into PHP-5.4

2012-09-05 23:11:19 +08:00

isapi

- Year++

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

litespeed

Merge branch 'PHP-5.4'

2012-09-05 23:20:42 +08: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