From: Stanislav Malyshev <stas@php.net>
Date: Mon, 21 Oct 2019 20:17:09 +0000 (-0700)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.25RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b5cdda0c793ef4f225a82d448183044441ca2b5;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
---

4b5cdda0c793ef4f225a82d448183044441ca2b5