summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Lowrey <rdlowrey@php.net>2015-03-05 14:08:46 -0700
committerFerenc Kovacs <tyrael@php.net>2015-03-05 22:16:05 +0100
commit4245c9327be61ba97ccabaefe84d6e5df3ebd1d2 (patch)
treec00a33fb5fcbdb6607911fa6476220d8f2231565
parent4bf74b5af739d26cecee80b581cfdc8df73f6991 (diff)
downloadphp-git-4245c9327be61ba97ccabaefe84d6e5df3ebd1d2.tar.gz
Really fix zts this timephp-5.6.7RC1
-rw-r--r--ext/openssl/xp_ssl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index bfa46e3de0..d04b3161b2 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" TSRMLS_CC);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid peer_fingerprint array; [algo => fingerprint] form required");
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" TSRMLS_CC);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid peer_fingerprint array; [algo => fingerprint] form required");
return 0;
}
if (php_x509_fingerprint_cmp(peer, key, Z_STRVAL_PP(current) TSRMLS_CC) != 0) {
@@ -329,8 +329,8 @@ static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val TSRMLS_DC)
return 1;
} else {
- php_error_docref(NULL, E_WARNING,
- "Invalid peer_fingerprint value; fingerprint string or array of the form [algo => fingerprint] required" TSRMLS_CC);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ "Invalid peer_fingerprint value; fingerprint string or array of the form [algo => fingerprint] required");
}
return 0;