com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/openssl.c
| From: | rdlowrey@php.net | Date: | Wed, 19 Feb 2014 00:06:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76101@lists.php.net to get a copy of this message | ||
Commit: 5727fd5f1380fa275b84fdb5f706040468a95134
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 18 Feb 2014 17:06:56 -0700
Parents: de9c8d9e9c2ca8447faa1c703b35bca51776ba5c 5e14a1269dbf9f2f73ad7f63be88174f9e5a49fd
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5727fd5f1380fa275b84fdb5f706040468a95134
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix tests failing if EC unavailable
Conflicts:
ext/openssl/openssl.c
Changed paths:
MM ext/openssl/openssl.c
Diff: