Xinchen Hui 696bd37e67 Merge branch 'PHP-7.1' ...

* PHP-7.1:
  Fixed condition check
  Fixed condition check
  another place

Conflicts:
	ext/mcrypt/mcrypt.c

2017-04-10 14:49:13 +08:00

..

apache2handler

Merge branch 'PHP-7.1'

2017-03-28 13:17:05 +02:00

cgi

Merge branch 'PHP-7.1'

2017-01-12 22:08:20 +01:00

cli

Merge branch 'PHP-7.1'

2017-04-03 14:25:37 +02:00

embed

Update copyright headers to 2017

2017-01-04 11:23:42 -06:00

fpm

Try fallback on IPv4 ANYADDR when IPv6 ANYADDR fails

2017-03-08 11:02:54 -08:00

litespeed

Remove superfluous allocation checks around ZMM-based functions

2017-04-02 00:58:19 +02:00

phpdbg

Merge branch 'PHP-7.1'

2017-04-10 14:49:13 +08:00

tests

Merge branch 'PHP-5.6'

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