Mercurial > hg > nginx-mail
comparison src/mail/ngx_mail.h @ 472:b2e9a7371d49
Mail: remove merge artifact.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 12 Jan 2009 21:30:08 +0300 |
parents | 2580fe1c5a9a |
children | abbf48179d76 |
comparison
equal
deleted
inserted
replaced
471:173bfcba4ada | 472:b2e9a7371d49 |
---|---|
363 u_char *ngx_mail_log_error(ngx_log_t *log, u_char *buf, size_t len); | 363 u_char *ngx_mail_log_error(ngx_log_t *log, u_char *buf, size_t len); |
364 | 364 |
365 | 365 |
366 char *ngx_mail_capabilities(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 366 char *ngx_mail_capabilities(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
367 | 367 |
368 #if (NGX_MAIL_SSL) | |
369 void ngx_mail_starttls_handler(ngx_event_t *rev); | |
370 #endif | |
371 | 368 |
372 /* STUB */ | 369 /* STUB */ |
373 void ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_peer_addr_t *peer); | 370 void ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_peer_addr_t *peer); |
374 void ngx_mail_auth_http_init(ngx_mail_session_t *s); | 371 void ngx_mail_auth_http_init(ngx_mail_session_t *s); |
375 /**/ | 372 /**/ |