mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-16 13:26:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' into PHP-5.6

Browse Source 
* PHP-5.5:
  Fix ZTS build
This commit is contained in:
Daniel Lowrey 2015-03-05 12:13:33 -07:00
commit 010f17534f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/openssl/openssl.c
View File

@ -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);