From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 31 Mar 2019 11:32:31 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.5RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8b7728b0e1306ccdfc346beaee8091abd930c03;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77827: preg_match does not ignore \r in regex flags
---

d8b7728b0e1306ccdfc346beaee8091abd930c03
diff --cc NEWS
index 2ca20ad97c,67028cd64c..207338cf61
--- a/NEWS
+++ b/NEWS
@@@ -10,10 -10,10 +10,14 @@@ PH
    . Fixed bug #72175 (Impossibility of creating multiple connections to
      Interbase with php 7.x). (Nikita)
  
 +- MySQLi:
 +  . Fixed bug #77773 (Unbuffered queries leak memory - MySQLi / mysqlnd).
 +    (Nikita)
 +
+ - PCRE:
+   . Fixed bug #77827 (preg_match does not ignore \r in regex flags). (requinix,
+     cmb)
+ 
  - phpdbg:
    . Fixed bug #76801 (too many open files). (alekitto)
    . Fixed bug #77800 (phpdbg segfaults on listing some conditional breakpoints).