George Wang 2ec012fa2a Merge branch 'PHP-7.2' ...

Conflicts:
	sapi/litespeed/lsapi_main.c

2018-02-27 13:57:06 -05:00

..

apache2handler

Fix race conditions with Apache vhost vs. per dir config

2018-02-01 15:24:31 +01:00

cgi

Use EXPECT instead of EXPECTF when possible

2018-02-20 21:53:48 +01:00

cli

Use EXPECT instead of EXPECTF when possible

2018-02-20 21:53:48 +01:00

embed

year++

2018-01-02 12:57:58 +08:00

fpm

Use EXPECT instead of EXPECTF when possible

2018-02-20 21:53:48 +01:00

litespeed

Merge branch 'PHP-7.2'

2018-02-27 13:57:06 -05:00

phpdbg

Use EXPECT instead of EXPECTF when possible

2018-02-20 21:53:48 +01:00

tests

Merge branch 'PHP-5.6'

2015-08-11 01:42:25 +02:00