Merge branch 'PHP-7.1'
authorGeorge Wang <gwang@php.net>
Wed, 28 Jun 2017 03:18:27 +0000 (23:18 -0400)
committerGeorge Wang <gwang@php.net>
Wed, 28 Jun 2017 03:18:27 +0000 (23:18 -0400)
1  2 
sapi/litespeed/lsapi_main.c

Simple merge