com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/openssl/openssl.c
| From: | Daniel Lowrey | Date: | Thu, 05 Mar 2015 19:13:33 +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-85271@lists.php.net to get a copy of this message | ||
Commit: 010f17534f6c6a82183253937c75aa689e55e0bc
Author: Daniel Lowrey <rdlowrey@php.net> Thu, 5 Mar 2015 12:13:33 -0700
Parents: d4d05c891950fc7612fc4db9a2bac1920d9903dd e892f5382f8b2c652932060f1bd345eee4e59b84
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=010f17534f6c6a82183253937c75aa689e55e0bc
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix ZTS build
Changed paths:
MM ext/openssl/openssl.c
Diff: