comparison src/mail/ngx_mail_pop3_handler.c @ 356:b743d290eb3b NGINX_0_6_22

nginx 0.6.22 *) Change: now all ngx_http_perl_module methods return values copied to perl's allocated memory. *) Bugfix: if nginx was built with ngx_http_perl_module, the perl before 5.8.6 was used, and perl supported threads, then during reconfiguration the master process aborted; bug appeared in 0.5.9. Thanks to Boris Zhmurov. *) Bugfix: the ngx_http_perl_module methods may get invalid values of the regex captures. *) Bugfix: a segmentation fault occurred in worker process, if the $r->has_request_body() method was called for a request whose small request body was already received. *) Bugfix: large_client_header_buffers did not freed before going to keep-alive state. Thanks to Olexander Shtepa. *) Bugfix: the last address was missed in the $upstream_addr variable; bug appeared in 0.6.18. *) Bugfix: the "fastcgi_catch_stderr" directive did return error code; now it returns 502 code, that can be rerouted to a next server using the "fastcgi_next_upstream invalid_header" directive. *) Bugfix: a segmentation fault occurred in master process if the "fastcgi_catch_stderr" directive was used; bug appeared in 0.6.10. Thanks to Manlio Perillo.
author Igor Sysoev <http://sysoev.ru>
date Wed, 19 Dec 2007 00:00:00 +0300
parents 1c519aff5c0c
children 984bb0b1399b
comparison
equal deleted inserted replaced
355:3ac45897a61c 356:b743d290eb3b
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;