]> granicus.if.org Git - php/commitdiff
Really fix zts this time
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 21:08:46 +0000 (14:08 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 21:09:25 +0000 (14:09 -0700)
ext/openssl/xp_ssl.c

index bfa46e3de0a81ffa1877ac897c9ad3736c23c0f4..d04b3161b29fd6c3d5985376af70fd0d1b8dadda 100644 (file)
@@ -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;