Merge branch 'PHP-7.1' into PHP-7.2

diff --cc sapi/litespeed/lsapi_main.c
index 0126147d7d5e0bcaf24415e9b9ee8117e12ebd2a,a2f7ed8f00e9093d88f26ddaedaf07936878d196..d0d4cdbb0bc96cc1dfa66315dbe7dec3aa5d5674
--- 1/sapi/litespeed/lsapi_main.c
--- 2/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -684,8 -722,9 +722,7 @@@ static int lsapi_activate_user_ini_mk_p
      /* Extract dir name from path_translated * and store it in 'path' */
      ctx->path_len = strlen(ctx->path);
      path = ctx->path = estrndup(SG(request_info).path_translated, ctx->path_len);
 -    if (!path)
 -        return FAILURE;
      ctx->path_len = zend_dirname(path, ctx->path_len);
-     DEBUG_MESSAGE("dirname: %s", ctx->path);
  
      if (*fn_next) {
          rc = (*fn_next)(ctx, fn_next + 1);