From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 2 Aug 2017 16:18:23 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0beta3~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=042ff13ca94b71a7b72bd0d082f47d5b90c2eb26;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

042ff13ca94b71a7b72bd0d082f47d5b90c2eb26
diff --cc sapi/litespeed/lsapi_main.c
index bbd55eaa40,cd192ef0f0..b3471ca02d
--- a/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;