com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/openssl/openssl.c ext/openssl/x
p_ssl.c
| From: | Anatol Belski | Date: | Tue, 04 Mar 2014 19:20:15 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/openssl/openssl.c ext/openssl/x p_ssl.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76323@lists.php.net to get a copy of this message | ||
Commit: 30cad902613fa9dc81b412c2aa81a40d1f7e3c07
Author: Anatol Belski <ab@php.net> Tue, 4 Mar 2014 20:20:15 +0100
Parents: b1dbe97bb60587adf29d40f2adc1f63d76c46ed5 b186b2774abe3e63f7c4b40084a76c5733589493
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=30cad902613fa9dc81b412c2aa81a40d1f7e3c07
Log:
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into
str_size_and_int64
* origin/str_size_and_int64_56_backport:
Improves fix for memory leak, keep in sync with upstream.
Add notice about tsrm_virtual_cwd.h moved to zend_virtual_cwd.h as this introduce need for awfull
hacks...
Fixed NEWS for #60602
Fixed news for #60602
Updated news for #60602
proc_open(): separate environment values that aren't strings
Added DateTimeImmutable::createFromMutable.
Sort alphabetically
Fixed NEWS.
Capture peer cert even if verify fails
Windows cert verify improvements + leak fixes
Updated news for #66535 and #66109
Updated NEWS for #66535
Conflicts:
ext/openssl/xp_ssl.c
Bugs:
https://bugs.php.net/60602
https://bugs.php.net/66535
https://bugs.php.net/66109
Changed paths:
MM ext/openssl/openssl.c
MM ext/openssl/xp_ssl.c
Diff: