Style: remove unnecessary references to HTTP from non-HTTP modules.
No functional changes.
Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
Piotr Sikora
9 years ago
4 | 4 |
*/
|
5 | 5 |
|
6 | 6 |
|
7 | |
#ifndef _NGX_HTTP_CONF_FILE_H_INCLUDED_
|
8 | |
#define _NGX_HTTP_CONF_FILE_H_INCLUDED_
|
|
7 |
#ifndef _NGX_CONF_FILE_H_INCLUDED_
|
|
8 |
#define _NGX_CONF_FILE_H_INCLUDED_
|
9 | 9 |
|
10 | 10 |
|
11 | 11 |
#include <ngx_config.h>
|
|
336 | 336 |
extern ngx_module_t *ngx_modules[];
|
337 | 337 |
|
338 | 338 |
|
339 | |
#endif /* _NGX_HTTP_CONF_FILE_H_INCLUDED_ */
|
|
339 |
#endif /* _NGX_CONF_FILE_H_INCLUDED_ */
|
14 | 14 |
} ngx_openssl_conf_t;
|
15 | 15 |
|
16 | 16 |
|
17 | |
static int ngx_http_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store);
|
|
17 |
static int ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store);
|
18 | 18 |
static void ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where,
|
19 | 19 |
int ret);
|
20 | 20 |
static void ngx_ssl_handshake_handler(ngx_event_t *ev);
|
|
341 | 341 |
{
|
342 | 342 |
STACK_OF(X509_NAME) *list;
|
343 | 343 |
|
344 | |
SSL_CTX_set_verify(ssl->ctx, SSL_VERIFY_PEER, ngx_http_ssl_verify_callback);
|
|
344 |
SSL_CTX_set_verify(ssl->ctx, SSL_VERIFY_PEER, ngx_ssl_verify_callback);
|
345 | 345 |
|
346 | 346 |
SSL_CTX_set_verify_depth(ssl->ctx, depth);
|
347 | 347 |
|
|
456 | 456 |
|
457 | 457 |
|
458 | 458 |
static int
|
459 | |
ngx_http_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store)
|
|
459 |
ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store)
|
460 | 460 |
{
|
461 | 461 |
#if (NGX_DEBUG)
|
462 | 462 |
char *subject, *issuer;
|
24 | 24 |
void *conf);
|
25 | 25 |
|
26 | 26 |
|
27 | |
static ngx_conf_enum_t ngx_http_starttls_state[] = {
|
|
27 |
static ngx_conf_enum_t ngx_mail_starttls_state[] = {
|
28 | 28 |
{ ngx_string("off"), NGX_MAIL_STARTTLS_OFF },
|
29 | 29 |
{ ngx_string("on"), NGX_MAIL_STARTTLS_ON },
|
30 | 30 |
{ ngx_string("only"), NGX_MAIL_STARTTLS_ONLY },
|
|
57 | 57 |
ngx_mail_ssl_starttls,
|
58 | 58 |
NGX_MAIL_SRV_CONF_OFFSET,
|
59 | 59 |
offsetof(ngx_mail_ssl_conf_t, starttls),
|
60 | |
ngx_http_starttls_state },
|
|
60 |
ngx_mail_starttls_state },
|
61 | 61 |
|
62 | 62 |
{ ngx_string("ssl_certificate"),
|
63 | 63 |
NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
|
180 | 180 |
} else {
|
181 | 181 |
c->tcp_nodelay = NGX_TCP_NODELAY_UNSET;
|
182 | 182 |
|
183 | |
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
|
|
183 |
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
184 | 184 |
"no tcp_nodelay");
|
185 | 185 |
}
|
186 | 186 |
}
|