Access log: fixed redundant buffer reallocation.

Previously a new buffer was allocated for every "access_log" directive with the
same file path and "buffer=" parameters, while only one buffer per file is used.
This commit is contained in:
Valentin Bartenev 2012-12-23 15:27:55 +00:00
parent 7c4068d349
commit df71cd1125

View file

@ -970,11 +970,15 @@ buffer:
return NGX_CONF_ERROR;
}
if (log->file->buffer && log->file->last - log->file->pos != buf) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"access_log \"%V\" already defined "
"with different buffer size", &value[1]);
return NGX_CONF_ERROR;
if (log->file->buffer) {
if (log->file->last - log->file->pos != buf) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"access_log \"%V\" already defined "
"with different buffer size", &value[1]);
return NGX_CONF_ERROR;
}
return NGX_CONF_OK;
}
log->file->buffer = ngx_palloc(cf->pool, buf);