diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-03-05 12:13:33 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-03-05 12:13:33 -0700 |
| commit | 010f17534f6c6a82183253937c75aa689e55e0bc (patch) | |
| tree | ab2c07593c21eba779b879c2aa605b39db825338 | |
| parent | d4d05c891950fc7612fc4db9a2bac1920d9903dd (diff) | |
| parent | e892f5382f8b2c652932060f1bd345eee4e59b84 (diff) | |
| download | php-git-010f17534f6c6a82183253937c75aa689e55e0bc.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix ZTS build
| -rw-r--r-- | ext/openssl/openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 290b480eaa..e78d3b15aa 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1978,7 +1978,7 @@ PHP_FUNCTION(openssl_x509_parse) sig_nid = OBJ_obj2nid((cert)->sig_alg->algorithm); add_assoc_string(return_value, "signatureTypeSN", (char*)OBJ_nid2sn(sig_nid), 1); add_assoc_string(return_value, "signatureTypeLN", (char*)OBJ_nid2ln(sig_nid), 1); - add_assoc_long(return_value, "signatureTypeNID", sig_nid TSRMLS_CC); + add_assoc_long(return_value, "signatureTypeNID", sig_nid); MAKE_STD_ZVAL(subitem); array_init(subitem); |