diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-03-05 20:58:23 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-03-05 20:58:23 +0100 |
| commit | 6f6b14fec42cc43386c4263867fad1ea0da0f131 (patch) | |
| tree | 1dc98621c5e7242f723debfaa03ee9e3ad92fbac | |
| parent | d24c57e8350f786cebc2573c85b6664d75bac74a (diff) | |
| parent | c985ec737d8340e941feda05de647cce10b744ea (diff) | |
| download | php-git-6f6b14fec42cc43386c4263867fad1ea0da0f131.tar.gz | |
Merge branch 'PHP-5.6' into PHP-5.6.7
* PHP-5.6:
Fix ZTS
Fix ZTS build
| -rw-r--r-- | ext/openssl/openssl.c | 2 | ||||
| -rw-r--r-- | ext/openssl/xp_ssl.c | 6 |
2 files changed, 4 insertions, 4 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); diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 18417705ed..bfa46e3de0 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -307,7 +307,7 @@ static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val TSRMLS_DC) ulong key_index; if (!zend_hash_num_elements(Z_ARRVAL_P(val))) { - php_error_docref(NULL, E_WARNING, "Invalid peer_fingerprint array; [algo => fingerprint] form required"); + php_error_docref(NULL, E_WARNING, "Invalid peer_fingerprint array; [algo => fingerprint] form required" TSRMLS_CC); return 0; } @@ -318,7 +318,7 @@ static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val TSRMLS_DC) int key_type = zend_hash_get_current_key_ex(Z_ARRVAL_P(val), &key, &key_len, &key_index, 0, &pos); if (!(key_type == HASH_KEY_IS_STRING && Z_TYPE_PP(current) == IS_STRING)) { - php_error_docref(NULL, E_WARNING, "Invalid peer_fingerprint array; [algo => fingerprint] form required"); + php_error_docref(NULL, E_WARNING, "Invalid peer_fingerprint array; [algo => fingerprint] form required" TSRMLS_CC); return 0; } if (php_x509_fingerprint_cmp(peer, key, Z_STRVAL_PP(current) TSRMLS_CC) != 0) { @@ -330,7 +330,7 @@ static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val TSRMLS_DC) } else { php_error_docref(NULL, E_WARNING, - "Invalid peer_fingerprint value; fingerprint string or array of the form [algo => fingerprint] required"); + "Invalid peer_fingerprint value; fingerprint string or array of the form [algo => fingerprint] required" TSRMLS_CC); } return 0; |