Mercurial > hg > nginx
comparison src/core/ngx_cycle.c @ 5053:004af18ddb86 stable-1.2
Merge of r4985, r4986, r4987, r4988, r4989, r5002: access_log gzip.
*) 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.
*) Reopening log files code moved to a separate function. The code
refactored in a way to call custom handler that can do appropriate
cleanup work (if any), like flushing buffers, finishing compress
streams, finalizing connections to log daemon, etc..
*) Access log: the "flush" parameter of the "access_log" directive.
*) Configure: added the NGX_ZLIB define. This was introduced for
conditional compilation of the code that requires the zlib library.
*) Access log: the "gzip" parameter of the "access_log" directive.
Note: this requires zlib version 1.2.0.4 or above to work.
*) The data pointer in ngx_open_file_t objects must be initialized.
Uninitialized pointer may result in arbitrary segfaults if access_log
is used without buffer and without variables in file path.
Patch by Tatsuhiko Kubo (ticket #268).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 11 Feb 2013 14:34:00 +0000 |
parents | f4809ba58b15 |
children | c0497468f521 |
comparison
equal
deleted
inserted
replaced
5052:f2dcb25987df | 5053:004af18ddb86 |
---|---|
1113 | 1113 |
1114 | 1114 |
1115 void | 1115 void |
1116 ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user) | 1116 ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user) |
1117 { | 1117 { |
1118 ssize_t n, len; | |
1119 ngx_fd_t fd; | 1118 ngx_fd_t fd; |
1120 ngx_uint_t i; | 1119 ngx_uint_t i; |
1121 ngx_list_part_t *part; | 1120 ngx_list_part_t *part; |
1122 ngx_open_file_t *file; | 1121 ngx_open_file_t *file; |
1123 | 1122 |
1137 | 1136 |
1138 if (file[i].name.len == 0) { | 1137 if (file[i].name.len == 0) { |
1139 continue; | 1138 continue; |
1140 } | 1139 } |
1141 | 1140 |
1142 len = file[i].pos - file[i].buffer; | 1141 if (file[i].flush) { |
1143 | 1142 file[i].flush(&file[i], cycle->log); |
1144 if (file[i].buffer && len != 0) { | |
1145 | |
1146 n = ngx_write_fd(file[i].fd, file[i].buffer, len); | |
1147 | |
1148 if (n == -1) { | |
1149 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, | |
1150 ngx_write_fd_n " to \"%s\" failed", | |
1151 file[i].name.data); | |
1152 | |
1153 } else if (n != len) { | |
1154 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, | |
1155 ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz", | |
1156 file[i].name.data, n, len); | |
1157 } | |
1158 | |
1159 file[i].pos = file[i].buffer; | |
1160 } | 1143 } |
1161 | 1144 |
1162 fd = ngx_open_file(file[i].name.data, NGX_FILE_APPEND, | 1145 fd = ngx_open_file(file[i].name.data, NGX_FILE_APPEND, |
1163 NGX_FILE_CREATE_OR_OPEN, NGX_FILE_DEFAULT_ACCESS); | 1146 NGX_FILE_CREATE_OR_OPEN, NGX_FILE_DEFAULT_ACCESS); |
1164 | 1147 |