Klaus Demo nginx / c3d20f5
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 changed file(s) with 9 addition(s) and 9 deletion(s). Raw diff Collapse all Expand all
44 */
55
66
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_
99
1010
1111 #include <ngx_config.h>
336336 extern ngx_module_t *ngx_modules[];
337337
338338
339 #endif /* _NGX_HTTP_CONF_FILE_H_INCLUDED_ */
339 #endif /* _NGX_CONF_FILE_H_INCLUDED_ */
1414 } ngx_openssl_conf_t;
1515
1616
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);
1818 static void ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where,
1919 int ret);
2020 static void ngx_ssl_handshake_handler(ngx_event_t *ev);
341341 {
342342 STACK_OF(X509_NAME) *list;
343343
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);
345345
346346 SSL_CTX_set_verify_depth(ssl->ctx, depth);
347347
456456
457457
458458 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)
460460 {
461461 #if (NGX_DEBUG)
462462 char *subject, *issuer;
2424 void *conf);
2525
2626
27 static ngx_conf_enum_t ngx_http_starttls_state[] = {
27 static ngx_conf_enum_t ngx_mail_starttls_state[] = {
2828 { ngx_string("off"), NGX_MAIL_STARTTLS_OFF },
2929 { ngx_string("on"), NGX_MAIL_STARTTLS_ON },
3030 { ngx_string("only"), NGX_MAIL_STARTTLS_ONLY },
5757 ngx_mail_ssl_starttls,
5858 NGX_MAIL_SRV_CONF_OFFSET,
5959 offsetof(ngx_mail_ssl_conf_t, starttls),
60 ngx_http_starttls_state },
60 ngx_mail_starttls_state },
6161
6262 { ngx_string("ssl_certificate"),
6363 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
180180 } else {
181181 c->tcp_nodelay = NGX_TCP_NODELAY_UNSET;
182182
183 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
183 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
184184 "no tcp_nodelay");
185185 }
186186 }