comparison src/mail/ngx_mail_smtp_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 9121a0a91f47
comparison
equal deleted inserted replaced
355:3ac45897a61c 356:b743d290eb3b
317 static ngx_int_t 317 static ngx_int_t
318 ngx_mail_smtp_helo(ngx_mail_session_t *s, ngx_connection_t *c) 318 ngx_mail_smtp_helo(ngx_mail_session_t *s, ngx_connection_t *c)
319 { 319 {
320 ngx_str_t *arg; 320 ngx_str_t *arg;
321 ngx_mail_smtp_srv_conf_t *sscf; 321 ngx_mail_smtp_srv_conf_t *sscf;
322 #if (NGX_MAIL_SSL)
323 ngx_mail_ssl_conf_t *sslcf;
324 #endif
325 322
326 if (s->args.nelts != 1) { 323 if (s->args.nelts != 1) {
327 s->out.len = sizeof(smtp_invalid_argument) - 1; 324 s->out.len = sizeof(smtp_invalid_argument) - 1;
328 s->out.data = smtp_invalid_argument; 325 s->out.data = smtp_invalid_argument;
329 s->state = 0; 326 s->state = 0;
350 s->esmtp = 1; 347 s->esmtp = 1;
351 348
352 #if (NGX_MAIL_SSL) 349 #if (NGX_MAIL_SSL)
353 350
354 if (c->ssl == NULL) { 351 if (c->ssl == NULL) {
352 ngx_mail_ssl_conf_t *sslcf;
353
355 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); 354 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
356 355
357 if (sslcf->starttls == NGX_MAIL_STARTTLS_ON) { 356 if (sslcf->starttls == NGX_MAIL_STARTTLS_ON) {
358 s->out = sscf->starttls_capability; 357 s->out = sscf->starttls_capability;
359 return NGX_OK; 358 return NGX_OK;