Michael Wallner 03f56152e5 Merge branch 'PHP-5.6' ...

* PHP-5.6:
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).

2014-07-30 20:14:40 +02:00

..

aolserver

Bump year

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

apache

Merge branch 'PHP-5.6'

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

apache2filter

Merge branch 'PHP-5.6'

2014-03-24 17:53:08 +01:00

apache2handler

Merge branch 'PHP-5.6'

2014-04-13 15:40:21 -07:00

apache_hooks

Merge branch 'PHP-5.6'

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

caudium

Merge branch 'PHP-5.6'

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

cgi

This test depends on expose_php being on

2014-07-14 08:22:05 -07:00

cli

Merge branch 'PHP-5.6'

2014-07-12 15:11:18 +08: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 'PHP-5.5' into PHP-5.6

2014-07-25 10:52:41 +08:00

isapi

Bump year

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

litespeed

fixed broken merged code

2014-07-11 15:02:02 -04:00

milter

Merge branch 'PHP-5.6'

2014-07-30 20:14:40 +02:00

nsapi

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +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

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