From: Stanislav Malyshev <stas@php.net>
Date: Mon, 23 Mar 2015 05:12:36 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3342a248a243560f61bc3301bac5654fa407cf97;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed #68021 - get_browser() browser_name_regex
---

3342a248a243560f61bc3301bac5654fa407cf97
diff --cc NEWS
index 92d014e102,53c8340dcd..d8e30b2494
--- a/NEWS
+++ b/NEWS
@@@ -5,6 -5,10 +5,8 @@@ PH
  - Core:
    . Fixed bug #66609 (php crashes with __get() and ++ operator in some cases).
      (Dmitry, Laruence)
 -  . Fixed bug #67626 (User exceptions not properly handled in streams). 
 -    (Julian)
+   . Fixed bug #68021 (get_browser() browser_name_regex returns non-utf-8
+     characters). (Tjerk)
    . Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
    . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
      configuration options). (Anatol Belski)