com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/ldap/ ldap.c ext/openssl/openssl.c
ext/session/mod_files. c
| From: | Anatol Belski | Date: | Tue, 15 Apr 2014 08:23:51 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/ldap/ ldap.c ext/openssl/openssl.c ext/session/mod_files. c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76902@lists.php.net to get a copy of this message | ||
Commit: bc2b0d8ba3158d709d3b3acc97b3d77fbb3cebf7
Author: Anatol Belski <ab@php.net> Tue, 15 Apr 2014 10:23:51 +0200
Parents: 4be58a12d840500ccaf4efd2cca524f73310db42 bfbb409b32493d7510a943c1201caa89484a0f65
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bc2b0d8ba3158d709d3b3acc97b3d77fbb3cebf7
Log:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
fix test - doesn't seem to produce warning
Fix test - on CI somebody could create a process in the meantime
fix windows build
Fix #66942: openssl_seal() memory leak
ws fix
Fix #66942: openssl_seal() memory leak
ws fix
Fix null byte in LDAP bindings
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Fix bug #66171: better handling of symlinks
Add test
Conflicts:
ext/openssl/openssl.c
Bugs:
https://bugs.php.net/66942
https://bugs.php.net/66171
Changed paths:
MM ext/ldap/ldap.c
MM ext/openssl/openssl.c
MM ext/session/mod_files.c
Diff:
diff --cc ext/openssl/openssl.c
index ca7d067,8badbf7..8cea4a3
mode 100644,100755..100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -5026,7 -4913,8 +5029,8 @@@ PHP_FUNCTION(openssl_seal
} else {
efree(buf);
}
- RETVAL_LONG(len1 + len2);
+ RETVAL_INT(len1 + len2);
+ EVP_CIPHER_CTX_cleanup(&ctx);
clean_exit:
for (i=0; i<nkeys; i++) {