diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-11-15 13:30:52 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-11-15 13:30:52 +0000 |
commit | 0e5dc5cff692f532f0ccb2655ab196995f4233e0 (patch) | |
tree | f56f40e788077b9820ebb45f3e0739fabb7be421 /src/imap/ngx_imap.c | |
parent | 2a7f83eceda87e520f36bbfb16b82b8c2d6606d7 (diff) | |
download | nginx-release-0.3.10.tar.gz |
nginx-0.3.10-RELEASE importrelease-0.3.10
*) Change: the "valid_referers" directive and the "$invalid_referer"
variable were moved to the new ngx_http_referer_module from the
ngx_http_rewrite_module.
*) Change: the "$apache_bytes_sent" variable name was changed to
"$body_bytes_sent".
*) Feature: the "$sent_http_..." variables.
*) Feature: the "if" directive supports the "=" and "!=" operations.
*) Feature: the "proxy_pass" directive supports the HTTPS protocol.
*) Feature: the "proxy_set_body" directive.
*) Feature: the "post_action" directive.
*) Feature: the ngx_http_empty_gif_module.
*) Feature: the "worker_cpu_affinity" directive for Linux.
*) Bugfix: the "rewrite" directive did not unescape URI part in
redirect, now it is unescaped except the %00-%25 and %7F-%FF
characters.
*) Bugfix: nginx could not be built by the icc 9.0 compiler.
*) Bugfix: if the SSI was enabled for zero size static file, then the
chunked response was encoded incorrectly.
Diffstat (limited to 'src/imap/ngx_imap.c')
-rw-r--r-- | src/imap/ngx_imap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/imap/ngx_imap.c b/src/imap/ngx_imap.c index b8a75ad2b..2b768ddfb 100644 --- a/src/imap/ngx_imap.c +++ b/src/imap/ngx_imap.c @@ -28,12 +28,12 @@ static ngx_command_t ngx_imap_commands[] = { ngx_null_command }; - + static ngx_core_module_t ngx_imap_module_ctx = { ngx_string("imap"), NULL, NULL -}; +}; ngx_module_t ngx_imap_module = { @@ -164,7 +164,7 @@ ngx_imap_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) /* init imap{} main_conf's */ if (module->init_main_conf) { - rv = module->init_main_conf(cf, ctx->main_conf[mi]); + rv = module->init_main_conf(cf, ctx->main_conf[mi]); if (rv != NGX_CONF_OK) { *cf = pcf; return rv; @@ -172,9 +172,9 @@ ngx_imap_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } for (s = 0; s < cmcf->servers.nelts; s++) { - + /* merge the server{}s' srv_conf's */ - + if (module->merge_srv_conf) { rv = module->merge_srv_conf(cf, ctx->srv_conf[mi], @@ -187,9 +187,9 @@ ngx_imap_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } } - /* imap{}'s cf->ctx was needed while the configuration merging */ - - *cf = pcf; + /* imap{}'s cf->ctx was needed while the configuration merging */ + + *cf = pcf; return NGX_CONF_OK; } |