com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c
| From: | Remi Collet | Date: | Tue, 16 Dec 2014 07:38:29 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83728@lists.php.net to get a copy of this message | ||
Commit: ee0b922ecee9796087bbbf281e9f0f873a02b714
Author: Remi Collet <remi@php.net> Tue, 16 Dec 2014 08:38:29 +0100
Parents: 1e82da8d170066fa8c456a98f0242b8a6d1e6f86 181f34f3757563381ce8eaf963e73cd64b38ec21
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ee0b922ecee9796087bbbf281e9f0f873a02b714
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
fix perms
Changed paths:
MM ext/openssl/openssl.c
Diff:
diff --cc ext/openssl/openssl.c
index 60d36ff,00fd444..60d36ff
mode 100755,100644..100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c