Xinchen Hui 110bf9c720 Merge remote-tracking branch 'origin/master' into phpng ...

Conflicts:
	Zend/zend_compile.h
	ext/openssl/xp_ssl.c

2014-07-18 16:25:43 +08:00

..

aolserver

Cleanup (1-st round)

2014-04-15 15:40:40 +04:00

apache

Added support for apache and apache2handler SAPIs (They seem slower than FastCGI)

2014-05-06 13:26:23 +04:00

apache2filter

fix hash API calls

2014-05-17 08:12:18 +02:00

apache2handler

Added support for apache and apache2handler SAPIs (They seem slower than FastCGI)

2014-05-06 13:26:23 +04:00

apache_hooks

Cleanup (1-st round)

2014-04-15 15:40:40 +04:00

caudium

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

cgi

Merge remote-tracking branch 'origin/master' into phpng

2014-07-18 16:25:43 +08:00

cli

Merge branch 'master' into phpng

2014-07-14 11:44:53 +04:00

continuity

Update copyright year to 2014

2014-06-18 00:22:16 +03:00

embed

Merge branch 'PHP-5.6'

2014-03-24 10:32:07 +01:00

fpm

Merge branch 'master' into phpng

2014-07-09 18:35:30 +08:00

isapi

Bump year

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

litespeed

Merge branch 'master' into phpng

2014-07-14 11:44:53 +04:00

milter

Cleanup (1-st round)

2014-04-15 15:40:40 +04:00

nsapi

Cleanup (1-st round)

2014-04-15 15:40:40 +04: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

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

roxen

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

tests

- Rewrite scanner to be based on re2c instead of flex

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

thttpd

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

tux

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

webjames

Bump year

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