comparison src/http/ngx_http_request.c @ 8411:7995cd199b52 quic

Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Tue, 26 May 2020 20:26:44 +0300
parents 5b367070cc9c 8409f9df6219
children 2bf17a829ddc
comparison
equal deleted inserted replaced
8410:c7d1b500bd0a 8411:7995cd199b52
2125 #if (NGX_HTTP_SSL) 2125 #if (NGX_HTTP_SSL)
2126 2126
2127 if (r->http_connection->ssl) { 2127 if (r->http_connection->ssl) {
2128 long rc; 2128 long rc;
2129 X509 *cert; 2129 X509 *cert;
2130 const char *s;
2130 ngx_http_ssl_srv_conf_t *sscf; 2131 ngx_http_ssl_srv_conf_t *sscf;
2131 2132
2132 if (c->ssl == NULL) { 2133 if (c->ssl == NULL) {
2133 ngx_log_error(NGX_LOG_INFO, c->log, 0, 2134 ngx_log_error(NGX_LOG_INFO, c->log, 0,
2134 "client sent plain HTTP request to HTTPS port"); 2135 "client sent plain HTTP request to HTTPS port");
2168 ngx_http_finalize_request(r, NGX_HTTPS_NO_CERT); 2169 ngx_http_finalize_request(r, NGX_HTTPS_NO_CERT);
2169 return; 2170 return;
2170 } 2171 }
2171 2172
2172 X509_free(cert); 2173 X509_free(cert);
2174 }
2175
2176 if (ngx_ssl_ocsp_get_status(c, &s) != NGX_OK) {
2177 ngx_log_error(NGX_LOG_INFO, c->log, 0,
2178 "client SSL certificate verify error: %s", s);
2179
2180 ngx_ssl_remove_cached_session(c->ssl->session_ctx,
2181 (SSL_get0_session(c->ssl->connection)));
2182
2183 ngx_http_finalize_request(r, NGX_HTTPS_CERT_ERROR);
2184 return;
2173 } 2185 }
2174 } 2186 }
2175 } 2187 }
2176 2188
2177 #endif 2189 #endif