comparison src/mail/ngx_mail_smtp_handler.c @ 1850:40116ff1cbd4 stable-0.5

r1763 merge: fix STARTTLS prompt in SMTP
author Igor Sysoev <igor@sysoev.ru>
date Tue, 08 Jan 2008 17:24:36 +0000
parents ed9cd1702f7a
children
comparison
equal deleted inserted replaced
1849:8ca85249de24 1850:40116ff1cbd4
27 ngx_connection_t *c, char *err); 27 ngx_connection_t *c, char *err);
28 28
29 29
30 static u_char smtp_ok[] = "250 2.0.0 OK" CRLF; 30 static u_char smtp_ok[] = "250 2.0.0 OK" CRLF;
31 static u_char smtp_bye[] = "221 2.0.0 Bye" CRLF; 31 static u_char smtp_bye[] = "221 2.0.0 Bye" CRLF;
32 static u_char smtp_starttls[] = "220 2.0.0 Start TLS" CRLF;
32 static u_char smtp_next[] = "334 " CRLF; 33 static u_char smtp_next[] = "334 " CRLF;
33 static u_char smtp_username[] = "334 VXNlcm5hbWU6" CRLF; 34 static u_char smtp_username[] = "334 VXNlcm5hbWU6" CRLF;
34 static u_char smtp_password[] = "334 UGFzc3dvcmQ6" CRLF; 35 static u_char smtp_password[] = "334 UGFzc3dvcmQ6" CRLF;
35 static u_char smtp_invalid_command[] = "500 5.5.1 Invalid command" CRLF; 36 static u_char smtp_invalid_command[] = "500 5.5.1 Invalid command" CRLF;
36 static u_char smtp_invalid_pipelining[] = 37 static u_char smtp_invalid_pipelining[] =
248 case NGX_SMTP_RSET: 249 case NGX_SMTP_RSET:
249 break; 250 break;
250 251
251 case NGX_SMTP_STARTTLS: 252 case NGX_SMTP_STARTTLS:
252 rc = ngx_mail_smtp_starttls(s, c); 253 rc = ngx_mail_smtp_starttls(s, c);
254 s->out.len = sizeof(smtp_starttls) - 1;
255 s->out.data = smtp_starttls;
253 break; 256 break;
254 257
255 default: 258 default:
256 rc = NGX_MAIL_PARSE_INVALID_COMMAND; 259 rc = NGX_MAIL_PARSE_INVALID_COMMAND;
257 break; 260 break;