From: Xinchen Hui <laruence@php.net>
Date: Fri, 2 Nov 2012 10:54:27 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=153bfada90b0733943c31e9d7e2bee57c5e7bcac;p=php

Merge branch 'PHP-5.3' into PHP-5.4
---

153bfada90b0733943c31e9d7e2bee57c5e7bcac
diff --cc NEWS
index 503a9d5ab4,2e1f13bd5e..293dcb0ffd
--- a/NEWS
+++ b/NEWS
@@@ -1,22 -1,13 +1,24 @@@
  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.
+   . Fixed bug #63241 (PHP fails to open Windows deduplicated files).
      (daniel dot stelter-gliese at innogames dot de)
+   . Fixed bug #62444 (Handle leak in is_readable on windows). 
+     (krazyest at seznam dot cz)
  
 +- 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)
diff --cc TSRM/tsrm_win32.c
index b40af77c44,03327683cb..c33b599147
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@@ -190,10 -190,10 +190,10 @@@ Finished
  	return NULL;
  }
  
 -TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 +TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
  {
  	time_t t;
- 	HANDLE thread_token;
+ 	HANDLE thread_token = NULL;
  	PSID token_sid;
  	SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
  	GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };