Xinchen Hui 463413db53 Merge branch 'PHP-7.1' into PHP-7.2 ...

* PHP-7.1:
  Update NEWS
  Fixed bug #74947 (Segfault in scanner on INF number)

Conflicts:
	Zend/zend_language_scanner.c

2017-07-21 12:02:54 +08:00

..

apache2handler

Merge branch 'PHP-7.1'

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

cgi

Exclude warm-up requests from callgrind profile.

2017-05-31 16:16:56 +03:00

cli

Fixed bug #74849 Process is started as interactive shell in PhpStorm

2017-07-03 21:59:31 +02:00

embed

Update copyright headers to 2017

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

fpm

Remove superfluous semicolons

2017-06-26 00:23:25 +02:00

litespeed

Merge branch 'PHP-7.1'

2017-06-27 23:18:27 -04:00

phpdbg

Merge branch 'PHP-7.1' into PHP-7.2

2017-07-21 12:02:54 +08:00

tests

Merge branch 'PHP-5.6'

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