mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

limit minimal pool size

Browse Source
This commit is contained in:
Igor Sysoev 2007-05-07 09:20:42 +00:00
parent 5a8bc36118
commit 08d068f943
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ngx_palloc.h
View File

@ -19,7 +19,9 @@
*/ */
#define NGX_MAX_ALLOC_FROM_POOL (ngx_pagesize - 1) #define NGX_MAX_ALLOC_FROM_POOL (ngx_pagesize - 1)
#define NGX_DEFAULT_POOL_SIZE (16 * 1024) #define NGX_DEFAULT_POOL_SIZE (16 * 1024)
#define NGX_MIN_POOL_SIZE \
(sizeof(ngx_pool_t) + 2 * sizeof(ngx_pool_large_t))
typedef void (*ngx_pool_cleanup_pt)(void *data); typedef void (*ngx_pool_cleanup_pt)(void *data);

24
src/http/ngx_http_core_module.c
View File

@ -70,10 +70,14 @@ static char *ngx_http_core_internal(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf); void *conf);
static char *ngx_http_core_lowat_check(ngx_conf_t *cf, void *post, void *data); static char *ngx_http_core_lowat_check(ngx_conf_t *cf, void *post, void *data);
static char *ngx_http_core_pool_size(ngx_conf_t *cf, void *post, void *data);
static ngx_conf_post_t ngx_http_core_lowat_post = static ngx_conf_post_t ngx_http_core_lowat_post =
{ ngx_http_core_lowat_check }; { ngx_http_core_lowat_check };
static ngx_conf_post_handler_pt ngx_http_core_pool_size_p =
ngx_http_core_pool_size;
static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_host_names = { static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_host_names = {
ngx_conf_deprecated, "optimize_host_names", "optimize_server_names" ngx_conf_deprecated, "optimize_host_names", "optimize_server_names"
}; };
@ -129,14 +133,14 @@ static ngx_command_t ngx_http_core_commands[] = {
ngx_conf_set_size_slot, ngx_conf_set_size_slot,
NGX_HTTP_SRV_CONF_OFFSET, NGX_HTTP_SRV_CONF_OFFSET,
offsetof(ngx_http_core_srv_conf_t, connection_pool_size), offsetof(ngx_http_core_srv_conf_t, connection_pool_size),
NULL }, &ngx_http_core_pool_size_p },
{ ngx_string("request_pool_size"), { ngx_string("request_pool_size"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
ngx_conf_set_size_slot, ngx_conf_set_size_slot,
NGX_HTTP_SRV_CONF_OFFSET, NGX_HTTP_SRV_CONF_OFFSET,
offsetof(ngx_http_core_srv_conf_t, request_pool_size), offsetof(ngx_http_core_srv_conf_t, request_pool_size),
NULL }, &ngx_http_core_pool_size_p },
{ ngx_string("client_header_timeout"), { ngx_string("client_header_timeout"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
@ -3052,3 +3056,19 @@ ngx_http_core_lowat_check(ngx_conf_t *cf, void *post, void *data)
return NGX_CONF_OK; return NGX_CONF_OK;
} }
static char *
ngx_http_core_pool_size(ngx_conf_t *cf, void *post, void *data)
{
size_t *sp = data;
if (*sp < NGX_MIN_POOL_SIZE) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"pool must be no less than %uz", NGX_MIN_POOL_SIZE);
return NGX_CONF_ERROR;
}
return NGX_CONF_OK;
}