comparison src/mail/ngx_mail_core_module.c @ 428:9205084bd1f3

Merge with nginx 0.7.14.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 01 Sep 2008 23:28:02 +0400
parents 3ff402661f4c a094317ba307
children 1e91f9968443
comparison
equal deleted inserted replaced
425:3ff402661f4c 428:9205084bd1f3
349 break; 349 break;
350 } 350 }
351 } 351 }
352 } 352 }
353 353
354 if (cf->args->nelts == 2) { 354 for (i = 2; i < cf->args->nelts; i++) {
355 return NGX_CONF_OK; 355
356 } 356 if (ngx_strcmp(value[i].data, "bind") == 0) {
357 357 imls->bind = 1;
358 if (ngx_strcmp(value[2].data, "bind") == 0) { 358 continue;
359 imls->bind = 1; 359 }
360 return NGX_CONF_OK; 360
361 } 361 if (ngx_strcmp(value[i].data, "ssl") == 0) {
362 362 #if (NGX_MAIL_SSL)
363 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 363 imls->ssl = 1;
364 "the invalid \"%V\" parameter", &value[2]); 364 continue;
365 return NGX_CONF_ERROR; 365 #else
366 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
367 "the \"ssl\" parameter requires "
368 "ngx_mail_ssl_module");
369 return NGX_CONF_ERROR;
370 #endif
371 }
372
373 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
374 "the invalid \"%V\" parameter", &value[i]);
375 return NGX_CONF_ERROR;
376 }
377
378 return NGX_CONF_OK;
366 } 379 }
367 380
368 381
369 static char * 382 static char *
370 ngx_mail_core_protocol(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) 383 ngx_mail_core_protocol(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)