IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disabled duplicate http, mail, and stream blocks.

Browse Source 
Such configurations have very limited use, introduce various problems and
are not officially supported.
This commit is contained in:
Vladimir Homutov 2015-06-16 23:28:38 +03:00
parent 9efe6c2243
commit b7a8f2a08f
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/ngx_http.c
View File

@ -128,6 +128,10 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_http_core_srv_conf_t **cscfp; ngx_http_core_srv_conf_t **cscfp;
ngx_http_core_main_conf_t *cmcf; ngx_http_core_main_conf_t *cmcf;
if (*(ngx_http_conf_ctx_t **) conf) {
return "is duplicate";
}
/* the main http context */ /* the main http context */
ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t)); ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t));

4
src/mail/ngx_mail.c
View File

@ -76,6 +76,10 @@ ngx_mail_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_mail_core_srv_conf_t **cscfp; ngx_mail_core_srv_conf_t **cscfp;
ngx_mail_core_main_conf_t *cmcf; ngx_mail_core_main_conf_t *cmcf;
if (*(ngx_mail_conf_ctx_t **) conf) {
return "is duplicate";
}
/* the main mail context */ /* the main mail context */
ctx = ngx_pcalloc(cf->pool, sizeof(ngx_mail_conf_ctx_t)); ctx = ngx_pcalloc(cf->pool, sizeof(ngx_mail_conf_ctx_t));

4
src/stream/ngx_stream.c
View File

@ -76,6 +76,10 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_stream_core_srv_conf_t **cscfp; ngx_stream_core_srv_conf_t **cscfp;
ngx_stream_core_main_conf_t *cmcf; ngx_stream_core_main_conf_t *cmcf;
if (*(ngx_stream_conf_ctx_t **) conf) {
return "is duplicate";
}
/* the main stream context */ /* the main stream context */
ctx = ngx_pcalloc(cf->pool, sizeof(ngx_stream_conf_ctx_t)); ctx = ngx_pcalloc(cf->pool, sizeof(ngx_stream_conf_ctx_t));