From: Anatoliy Belsky <ab@php.net>
Date: Wed, 31 Oct 2012 21:55:32 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24e4af0b8f8ca86e26a6e536c3827ae3f33bfebc;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63241 PHP fails to open Windows deduplicated files.
---

24e4af0b8f8ca86e26a6e536c3827ae3f33bfebc
diff --cc NEWS
index 7a1438a819,9b870113ac..503a9d5ab4
--- a/NEWS
+++ b/NEWS
@@@ -1,20 -1,11 +1,22 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2012, PHP 5.3.19
 +?? ??? 2012, PHP 5.4.9
  
 -- Core
 +- Core:
 +  . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence)
 +  . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes).
 +    (Tony, Andrew Sitnikov)
+   . Fixed bug #63241 PHP fails to open Windows deduplicated files.
+     (daniel dot stelter-gliese at innogames dot de)
  
 +- Curl:
 +  . Fixed bug #63363 (Curl silently accepts boolean true for SSL_VERIFYHOST).
 +    Patch by John Jawed GitHub PR #221 (Anthony)
 +
 +- Fileinfo:
 +  . Fixed bug #63248 (Load multiple magic files from a directory under Windows).
 +    (Anatoliy)
 +
  - Libxml
    . Fixed bug #63389 (Missing context check on libxml_set_streams_context()
      causes memleak). (Laruence)