diff options
| author | Anatol Belski <ab@php.net> | 2014-09-26 21:27:11 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-26 21:27:11 +0200 |
| commit | 86ef4876cd46f429d75d39a2b2a6307b579c574e (patch) | |
| tree | df877cc1509e587140bcb6991533479a27b3c891 | |
| parent | 8f0301ddf644d95bf06d5bf0bd9b079e880878fd (diff) | |
| download | php-git-86ef4876cd46f429d75d39a2b2a6307b579c574e.tar.gz | |
cleanup TSRMLS_FETCH in openssl
| -rwxr-xr-x | ext/openssl/openssl.c | 4 | ||||
| -rw-r--r-- | ext/openssl/xp_ssl.c | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index c4b155b478..c565a7fac5 100755 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -994,8 +994,6 @@ static int php_openssl_write_rand_file(const char * file, int egdsocket, int see { char buffer[MAXPATHLEN]; - TSRMLS_FETCH(); - if (egdsocket || !seeded) { /* if we did not manage to read the seed file, we should not write * a low-entropy seed file back */ @@ -2058,7 +2056,6 @@ static STACK_OF(X509) * load_all_certs_from_file(char *certfile) STACK_OF(X509) *stack=NULL, *ret=NULL; BIO *in=NULL; X509_INFO *xi; - TSRMLS_FETCH(); if(!(stack = sk_X509_new_null())) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "memory allocation failure"); @@ -2111,7 +2108,6 @@ static int check_cert(X509_STORE *ctx, X509 *x, STACK_OF(X509) *untrustedchain, { int ret=0; X509_STORE_CTX *csc; - TSRMLS_FETCH(); csc = X509_STORE_CTX_new(); if (csc == NULL) { diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 54562c22e5..62c69c4a5a 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -232,8 +232,6 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) /* {{{ */ zval *val; zend_ulong allowed_depth = OPENSSL_DEFAULT_STREAM_VERIFY_DEPTH; - TSRMLS_FETCH(); - ret = preverify_ok; /* determine the status for the current cert */ @@ -534,8 +532,6 @@ static int win_cert_verify_callback(X509_STORE_CTX *x509_store_ctx, void *arg) / zval *val; zend_bool is_self_signed = 0; - TSRMLS_FETCH(); - stream = (php_stream*)arg; sslsock = (php_openssl_netstream_data_t*)stream->abstract; @@ -987,8 +983,6 @@ static void limit_handshake_reneg(const SSL *ssl) /* {{{ */ if (sslsock->reneg->tokens > sslsock->reneg->limit) { zval *val; - TSRMLS_FETCH(); - sslsock->reneg->should_close = 1; if (PHP_STREAM_CONTEXT(stream) && (val = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), |