Stanislav Malyshev 9fb92eed83 Merge branch 'PHP-5.6' ...

* PHP-5.6:
  fix apr_psprintf format string from e0df4e3dba
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height

2014-04-13 15:40:21 -07: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

Merge branch 'PHP-5.6'

2014-04-11 19:35:11 +02:00

cli

Merge branch 'PHP-5.6'

2014-04-07 16:59:27 +02:00

continuity

Merge branch 'PHP-5.6'

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

embed

Merge branch 'PHP-5.6'

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

fpm

add clear_env option to FPM config

2014-02-25 12:12:09 +04:00

isapi

Bump year

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

litespeed

Bump year

2014-01-03 11:06:16 +08:00

milter

Merge branch 'PHP-5.6'

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

nsapi

Merge branch 'PHP-5.6'

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

phpdbg

Fixed wrong indentation

2014-03-18 10:49:28 +01: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