Mercurial > hg > nginx-quic
comparison src/mail/ngx_mail_pop3_handler.c @ 1704:e584e946e198
move condition declarations inside blocks where they are used
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 10 Dec 2007 12:09:51 +0000 |
parents | f69493e8faab |
children | 2a92804f4109 62c95a6b143b |
comparison
equal
deleted
inserted
replaced
1703:43747661804d | 1704:e584e946e198 |
---|---|
281 } | 281 } |
282 | 282 |
283 static ngx_int_t | 283 static ngx_int_t |
284 ngx_mail_pop3_user(ngx_mail_session_t *s, ngx_connection_t *c) | 284 ngx_mail_pop3_user(ngx_mail_session_t *s, ngx_connection_t *c) |
285 { | 285 { |
286 ngx_str_t *arg; | 286 ngx_str_t *arg; |
287 | 287 |
288 #if (NGX_MAIL_SSL) | 288 #if (NGX_MAIL_SSL) |
289 if (ngx_mail_starttls_only(s, c)) { | 289 if (ngx_mail_starttls_only(s, c)) { |
290 return NGX_MAIL_PARSE_INVALID_COMMAND; | 290 return NGX_MAIL_PARSE_INVALID_COMMAND; |
291 } | 291 } |
342 | 342 |
343 static ngx_int_t | 343 static ngx_int_t |
344 ngx_mail_pop3_capa(ngx_mail_session_t *s, ngx_connection_t *c, ngx_int_t stls) | 344 ngx_mail_pop3_capa(ngx_mail_session_t *s, ngx_connection_t *c, ngx_int_t stls) |
345 { | 345 { |
346 ngx_mail_pop3_srv_conf_t *pscf; | 346 ngx_mail_pop3_srv_conf_t *pscf; |
347 | |
348 pscf = ngx_mail_get_module_srv_conf(s, ngx_mail_pop3_module); | |
349 | |
347 #if (NGX_MAIL_SSL) | 350 #if (NGX_MAIL_SSL) |
348 ngx_mail_ssl_conf_t *sslcf; | |
349 #endif | |
350 | |
351 pscf = ngx_mail_get_module_srv_conf(s, ngx_mail_pop3_module); | |
352 | |
353 #if (NGX_MAIL_SSL) | |
354 | 351 |
355 if (stls && c->ssl == NULL) { | 352 if (stls && c->ssl == NULL) { |
353 ngx_mail_ssl_conf_t *sslcf; | |
354 | |
356 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); | 355 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); |
357 | 356 |
358 if (sslcf->starttls == NGX_MAIL_STARTTLS_ON) { | 357 if (sslcf->starttls == NGX_MAIL_STARTTLS_ON) { |
359 s->out = pscf->starttls_capability; | 358 s->out = pscf->starttls_capability; |
360 return NGX_OK; | 359 return NGX_OK; |