com php-src: Merge remote-tracking branch 'origin/master' into native-tls: ext/openssl/openssl.c ext/phar/phar_object.c
| From: | Anatol Belski | Date: | Tue, 16 Dec 2014 07:42:18 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into native-tls: ext/openssl/openssl.c ext/phar/phar_object.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83729@lists.php.net to get a copy of this message | ||
Commit: 50a93357fb748ee1976fb7993abccae9c8105157
Author: Anatol Belski <ab@php.net> Tue, 16 Dec 2014 08:42:18 +0100
Parents: c0cb3a1dc400e6d5120b4b5f941969b7865a5160 62691b2d6a70b62b80f9b586c3f48c776b041c7f
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=50a93357fb748ee1976fb7993abccae9c8105157
Log:
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix perms
fix perms
PowerPC64 support in safe_address function
Changed paths:
MM ext/openssl/openssl.c
MM ext/phar/phar_object.c
Diff:
diff --cc ext/openssl/openssl.c
index a69ce81,60d36ff..a69ce81
mode 100755,100644..100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
diff --cc ext/phar/phar_object.c
index 70577ff,d23c7cd..70577ff
mode 100755,100644..100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c