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