diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-03-06 11:31:04 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-03-06 11:31:04 -0700 |
| commit | 00c35cb6a52b2898f79d91738094a4d711de2553 (patch) | |
| tree | b12610f6b4d910243e5da55afc5ff346924988c9 /ext/pcre/php_pcre.c | |
| parent | 9f9ffdd0a022138056608d1e21e57b09fb120fae (diff) | |
| parent | 0928bad9ac9110a8a321c334444b7026bffad5f7 (diff) | |
| download | php-git-00c35cb6a52b2898f79d91738094a4d711de2553.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
Conflicts:
ext/openssl/openssl.c
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions