com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS TSRM/tsrm_win32.c
| From: | Xinchen Hui | Date: | Fri, 02 Nov 2012 10:56:17 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS TSRM/tsrm_win32.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70492@lists.php.net to get a copy of this message | ||
Commit: 153bfada90b0733943c31e9d7e2bee57c5e7bcac
Author: Xinchen Hui <laruence@php.net> Fri, 2 Nov 2012 18:54:27 +0800
Parents: 24e4af0b8f8ca86e26a6e536c3827ae3f33bfebc 3fe3029ecb9f121eb6f535970d5cd18ecc8373a6
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=153bfada90b0733943c31e9d7e2bee57c5e7bcac
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM NEWS
MM TSRM/tsrm_win32.c
Diff:
diff --cc NEWS
index 503a9d5,2e1f13b..293dcb0
--- 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 b40af77,0332768..c33b599
--- 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 };