Mercurial > hg > nginx-mail

comparison src/mail/ngx_mail_auth_http_module.c @ 570:9773720b845e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 0.8.16.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 26 Sep 2009 01:25:07 +0400
parents d67e93e97b4a f39b9e29530d
children 0b460e61bdcd
comparison
equal deleted inserted replaced
511:1e91f9968443 570:9773720b845e
137 137
138 138
139 static ngx_str_t ngx_mail_auth_http_method[] = { 139 static ngx_str_t ngx_mail_auth_http_method[] = {
140 ngx_string("plain"), 140 ngx_string("plain"),
141 ngx_string("plain"), 141 ngx_string("plain"),
142 ngx_string("plain"),
142 ngx_string("apop"), 143 ngx_string("apop"),
143 ngx_string("cram-md5"), 144 ngx_string("cram-md5"),
144 ngx_string("none") 145 ngx_string("none")
145 }; 146 };
146 147
767 if (peer == NULL) { 768 if (peer == NULL) {
768 ngx_destroy_pool(ctx->pool); 769 ngx_destroy_pool(ctx->pool);
769 ngx_mail_session_internal_server_error(s); 770 ngx_mail_session_internal_server_error(s);
770 return; 771 return;
771 } 772 }
773
774 /* AF_INET only */
772 775
773 sin = ngx_pcalloc(s->connection->pool, sizeof(struct sockaddr_in)); 776 sin = ngx_pcalloc(s->connection->pool, sizeof(struct sockaddr_in));
774 if (sin == NULL) { 777 if (sin == NULL) {
775 ngx_destroy_pool(ctx->pool); 778 ngx_destroy_pool(ctx->pool);
776 ngx_mail_session_internal_server_error(s); 779 ngx_mail_session_internal_server_error(s);
1297 { 1300 {
1298 ngx_mail_auth_http_conf_t *ahcf; 1301 ngx_mail_auth_http_conf_t *ahcf;
1299 1302
1300 ahcf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_auth_http_conf_t)); 1303 ahcf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_auth_http_conf_t));
1301 if (ahcf == NULL) { 1304 if (ahcf == NULL) {
1302 return NGX_CONF_ERROR; 1305 return NULL;
1303 } 1306 }
1304 1307
1305 ahcf->timeout = NGX_CONF_UNSET_MSEC; 1308 ahcf->timeout = NGX_CONF_UNSET_MSEC;
1306 1309
1307 ahcf->file = cf->conf_file->file.name.data; 1310 ahcf->file = cf->conf_file->file.name.data;