Merge branch 'PHP-7.1' into PHP-7.2

diff --cc sapi/litespeed/lsapi_main.c
index bbd55eaa4073c3a7cd65e7eacf03ed117641a6e2,cd192ef0f04c07c04fea3129aed278f480701dd4..b3471ca02d12398a2ccd0b04d4b9140e062842d5
--- 1/sapi/litespeed/lsapi_main.c
--- 2/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -822,7 -769,7 +767,7 @@@ static int lsapi_activate_user_ini_walk
                                                        void* next)
  {
      time_t request_time = sapi_get_request_time();
-     uint32_t path_len, docroot_len;
 -    uint docroot_len;
++    uint32_t docroot_len;
      int rc = SUCCESS;
      fn_activate_user_ini_chain_t *fn_next = next;