Kouhei Sutou
null+****@clear*****
Tue Oct 15 14:56:02 JST 2013
Kouhei Sutou 2013-10-15 14:56:02 +0900 (Tue, 15 Oct 2013) New Revision: 77b5863ff1eba9c059bc7d7b782a06fb0c01cbdf https://github.com/groonga/groonga/commit/77b5863ff1eba9c059bc7d7b782a06fb0c01cbdf Message: httpd: fix a bug groonga_database_auto_create parameter isn't inherited It means that "groonga_database_auto_create off" was only used in location block. These parameters in other blocks were ignored. Modified files: src/httpd/nginx-module/ngx_http_groonga_module.c Modified: src/httpd/nginx-module/ngx_http_groonga_module.c (+3 -0) =================================================================== --- src/httpd/nginx-module/ngx_http_groonga_module.c 2013-10-15 14:42:39 +0900 (90c48b1) +++ src/httpd/nginx-module/ngx_http_groonga_module.c 2013-10-15 14:56:02 +0900 (f0fbed6) @@ -1031,6 +1031,9 @@ ngx_http_groonga_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_http_groonga_loc_conf_t *conf = child; ngx_conf_merge_str_value(conf->database_path, prev->database_path, NULL); + ngx_conf_merge_value(conf->database_auto_create, + prev->database_auto_create, + GRN_FALSE); ngx_conf_merge_size_value(conf->cache_limit, prev->cache_limit, GRN_CACHE_DEFAULT_MAX_N_ENTRIES); -------------- next part -------------- HTML����������������������������...Télécharger
