Anatol Belski 552cfcc578 Merge branch 'PHP-5.5' into PHP-5.6 ...

* PHP-5.5:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapilib.c

2014-07-10 22:03:45 +02:00

..

aolserver

Bump year

2014-01-03 11:08:10 +08:00

apache

Bump year

2014-01-03 11:08:10 +08:00

apache2filter

fix some warnings

2014-03-24 17:51:50 +01:00

apache2handler

Merge branch 'PHP-5.5' into PHP-5.6

2014-04-13 15:39:32 -07:00

apache_hooks

Bump year

2014-01-03 11:08:10 +08:00

caudium

Bump year

2014-01-03 11:08:10 +08:00

cgi

Shut up, my lovely compiler; I do not like your warnings

2014-04-11 19:33:56 +02:00

cli

Merge branch 'PHP-5.5' into PHP-5.6

2014-07-07 20:45:01 +00:00

continuity

Bump year

2014-01-03 11:08:10 +08:00

embed

Merge branch 'PHP-5.4' into PHP-5.5

2014-03-24 10:28:48 +01:00

fpm

5.6 have fpm_globals.force_stderr

2014-07-08 08:33:48 +02:00

isapi

Bump year

2014-01-03 11:08:10 +08:00

litespeed

Merge branch 'PHP-5.5' into PHP-5.6

2014-07-10 22:03:45 +02:00

milter

Bump year

2014-01-03 11:08:10 +08:00

nsapi

Bump year

2014-01-03 11:08:10 +08:00

phpdbg

Merge sapi/phpdbg into PHP-5.6

2014-07-06 01:17:50 +02:00

phttpd

Bump year

2014-01-03 11:08:10 +08:00

pi3web

Bump year

2014-01-03 11:08:10 +08:00

roxen

Bump year

2014-01-03 11:08:10 +08:00

tests

- Rewrite scanner to be based on re2c instead of flex

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

thttpd

Bump year

2014-01-03 11:08:10 +08:00

tux

Bump year

2014-01-03 11:08:10 +08:00

webjames

Bump year

2014-01-03 11:08:10 +08:00