From: Stanislav Malyshev <stas@php.net>
Date: Mon, 22 Jul 2013 05:30:00 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~13^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=476924ec3dbc3e500dc14576e3375f03d8e8f824;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
---

476924ec3dbc3e500dc14576e3375f03d8e8f824
diff --cc NEWS
index b9d3446c73,e71d072735..540daf24d0
--- a/NEWS
+++ b/NEWS
@@@ -1,8 -1,8 +1,11 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.19
 +?? ??? 2013, PHP 5.5.2
  
 -- Core.
 +- Core:
++  . Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
++    erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey
++    avp200681 gmail com).
    . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
    . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
      limited case). (Arpad)