comparison src/mail/ngx_mail_imap_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
300 300
301 301
302 static ngx_int_t 302 static ngx_int_t
303 ngx_mail_imap_login(ngx_mail_session_t *s, ngx_connection_t *c) 303 ngx_mail_imap_login(ngx_mail_session_t *s, ngx_connection_t *c)
304 { 304 {
305 ngx_str_t *arg; 305 ngx_str_t *arg;
306 306
307 #if (NGX_MAIL_SSL) 307 #if (NGX_MAIL_SSL)
308 if (ngx_mail_starttls_only(s, c)) { 308 if (ngx_mail_starttls_only(s, c)) {
309 return NGX_MAIL_PARSE_INVALID_COMMAND; 309 return NGX_MAIL_PARSE_INVALID_COMMAND;
310 } 310 }
408 408
409 static ngx_int_t 409 static ngx_int_t
410 ngx_mail_imap_capability(ngx_mail_session_t *s, ngx_connection_t *c) 410 ngx_mail_imap_capability(ngx_mail_session_t *s, ngx_connection_t *c)
411 { 411 {
412 ngx_mail_imap_srv_conf_t *iscf; 412 ngx_mail_imap_srv_conf_t *iscf;
413
414 iscf = ngx_mail_get_module_srv_conf(s, ngx_mail_imap_module);
415
413 #if (NGX_MAIL_SSL) 416 #if (NGX_MAIL_SSL)
414 ngx_mail_ssl_conf_t *sslcf;
415 #endif
416
417 iscf = ngx_mail_get_module_srv_conf(s, ngx_mail_imap_module);
418
419 #if (NGX_MAIL_SSL)
420 417
421 if (c->ssl == NULL) { 418 if (c->ssl == NULL) {
419 ngx_mail_ssl_conf_t *sslcf;
420
422 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); 421 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
423 422
424 if (sslcf->starttls == NGX_MAIL_STARTTLS_ON) { 423 if (sslcf->starttls == NGX_MAIL_STARTTLS_ON) {
425 s->text = iscf->starttls_capability; 424 s->text = iscf->starttls_capability;
426 return NGX_OK; 425 return NGX_OK;