Skip to content

Commit 55d4185

Browse files
committed
initialize global connection pool for nginx module
1 parent f3b9abd commit 55d4185

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

nginx/ngx_http_mapcache_module.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ ngx_http_mapcache_create_conf(ngx_conf_t *cf)
6262
apr_pool_create(&process_pool,NULL);
6363
mapcache_context *ctx = apr_pcalloc(process_pool, sizeof(mapcache_ngx_context));
6464
ctx->pool = process_pool;
65-
ctx->process_pool = process_pool;
65+
ctx->connection_pool = NULL;
6666
ctx->threadlock = NULL;
6767
mapcache_context_init(ctx);
6868
ctx->log = ngx_mapcache_context_log;
@@ -211,7 +211,6 @@ ngx_http_mapcache_handler(ngx_http_request_t *r)
211211
mapcache_ngx_context *ngctx = ngx_http_get_module_loc_conf(r, ngx_http_mapcache_module);
212212
mapcache_context *ctx = (mapcache_context*)ngctx;
213213
apr_pool_create(&(ctx->pool),process_pool);
214-
ctx->process_pool = process_pool;
215214
ngctx->r = r;
216215
mapcache_request *request = NULL;
217216
mapcache_http_response *http_response;
@@ -298,7 +297,8 @@ ngx_http_mapcache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
298297
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,ctx->get_error_message(ctx));
299298
return NGX_CONF_ERROR;
300299
}
301-
ctx->config->non_blocking = 1;
300+
mapcache_connection_pool_create(&ctx->connection_pool,ctx->pool);
301+
ctx->config->non_blocking = 0;
302302

303303
ngx_http_core_loc_conf_t *clcf;
304304

0 commit comments

Comments
 (0)