Mercurial > hg > nginx
annotate src/http/modules/ngx_http_log_module.c @ 4920:812c4765c954
Request body: fixed "501 Not Implemented" error handling.
It is not about "Method" but a generic message, and is expected to be used
e.g. if specified Transfer-Encoding is not supported. Fixed message to
match RFC 2616.
Additionally, disable keepalive on such errors as we won't be able to read
request body correctly if we don't understand Transfer-Encoding used.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Wed, 21 Nov 2012 00:54:01 +0000 |
| parents | e89bd9896fea |
| children | 7737f0d788c1 |
| rev | line source |
|---|---|
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
1 |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
2 /* |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
5 */ |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
6 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 #include <ngx_config.h> |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 #include <ngx_core.h> |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 #include <ngx_http.h> |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
12 |
| 880 | 13 typedef struct ngx_http_log_op_s ngx_http_log_op_t; |
| 14 | |
| 15 typedef u_char *(*ngx_http_log_op_run_pt) (ngx_http_request_t *r, u_char *buf, | |
| 16 ngx_http_log_op_t *op); | |
| 17 | |
| 18 typedef size_t (*ngx_http_log_op_getlen_pt) (ngx_http_request_t *r, | |
| 19 uintptr_t data); | |
| 20 | |
| 21 | |
| 22 struct ngx_http_log_op_s { | |
| 23 size_t len; | |
| 24 ngx_http_log_op_getlen_pt getlen; | |
| 25 ngx_http_log_op_run_pt run; | |
| 26 uintptr_t data; | |
| 27 }; | |
| 28 | |
| 573 | 29 |
| 30 typedef struct { | |
| 31 ngx_str_t name; | |
| 2261 | 32 ngx_array_t *flushes; |
| 573 | 33 ngx_array_t *ops; /* array of ngx_http_log_op_t */ |
| 34 } ngx_http_log_fmt_t; | |
| 35 | |
| 657 | 36 |
| 573 | 37 typedef struct { |
| 38 ngx_array_t formats; /* array of ngx_http_log_fmt_t */ | |
| 39 ngx_uint_t combined_used; /* unsigned combined_used:1 */ | |
| 40 } ngx_http_log_main_conf_t; | |
| 41 | |
| 657 | 42 |
| 573 | 43 typedef struct { |
| 2072 | 44 ngx_array_t *lengths; |
| 45 ngx_array_t *values; | |
| 46 } ngx_http_log_script_t; | |
| 47 | |
| 48 | |
| 49 typedef struct { | |
| 573 | 50 ngx_open_file_t *file; |
| 2072 | 51 ngx_http_log_script_t *script; |
| 633 | 52 time_t disk_full_time; |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
53 time_t error_log_time; |
| 2261 | 54 ngx_http_log_fmt_t *format; |
| 573 | 55 } ngx_http_log_t; |
| 56 | |
| 657 | 57 |
| 573 | 58 typedef struct { |
| 59 ngx_array_t *logs; /* array of ngx_http_log_t */ | |
| 2072 | 60 |
| 61 ngx_open_file_cache_t *open_file_cache; | |
| 62 time_t open_file_cache_valid; | |
| 63 ngx_uint_t open_file_cache_min_uses; | |
| 64 | |
| 573 | 65 ngx_uint_t off; /* unsigned off:1 */ |
| 66 } ngx_http_log_loc_conf_t; | |
| 67 | |
| 68 | |
| 69 typedef struct { | |
| 70 ngx_str_t name; | |
| 71 size_t len; | |
| 72 ngx_http_log_op_run_pt run; | |
| 73 } ngx_http_log_var_t; | |
| 74 | |
| 75 | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
76 static void ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log, |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
77 u_char *buf, size_t len); |
| 2072 | 78 static ssize_t ngx_http_log_script_write(ngx_http_request_t *r, |
| 79 ngx_http_log_script_t *script, u_char **name, u_char *buf, size_t len); | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
80 |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
81 static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf, |
| 497 | 82 ngx_http_log_op_t *op); |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
83 static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf, |
| 497 | 84 ngx_http_log_op_t *op); |
| 3873 | 85 static u_char *ngx_http_log_iso8601(ngx_http_request_t *r, u_char *buf, |
| 86 ngx_http_log_op_t *op); | |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
87 static u_char *ngx_http_log_msec(ngx_http_request_t *r, u_char *buf, |
| 497 | 88 ngx_http_log_op_t *op); |
| 89 static u_char *ngx_http_log_request_time(ngx_http_request_t *r, u_char *buf, | |
| 90 ngx_http_log_op_t *op); | |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
91 static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf, |
| 497 | 92 ngx_http_log_op_t *op); |
| 573 | 93 static u_char *ngx_http_log_bytes_sent(ngx_http_request_t *r, u_char *buf, |
| 497 | 94 ngx_http_log_op_t *op); |
| 577 | 95 static u_char *ngx_http_log_body_bytes_sent(ngx_http_request_t *r, |
| 573 | 96 u_char *buf, ngx_http_log_op_t *op); |
| 475 | 97 static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf, |
| 497 | 98 ngx_http_log_op_t *op); |
| 479 | 99 |
| 501 | 100 static ngx_int_t ngx_http_log_variable_compile(ngx_conf_t *cf, |
| 101 ngx_http_log_op_t *op, ngx_str_t *value); | |
| 102 static size_t ngx_http_log_variable_getlen(ngx_http_request_t *r, | |
| 103 uintptr_t data); | |
| 104 static u_char *ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, | |
| 105 ngx_http_log_op_t *op); | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
106 static uintptr_t ngx_http_log_escape(u_char *dst, u_char *src, size_t size); |
| 501 | 107 |
| 108 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
109 static void *ngx_http_log_create_main_conf(ngx_conf_t *cf); |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
110 static void *ngx_http_log_create_loc_conf(ngx_conf_t *cf); |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
111 static char *ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, |
| 497 | 112 void *child); |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
113 static char *ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, |
| 497 | 114 void *conf); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
115 static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, |
| 497 | 116 void *conf); |
| 573 | 117 static char *ngx_http_log_compile_format(ngx_conf_t *cf, |
| 2261 | 118 ngx_array_t *flushes, ngx_array_t *ops, ngx_array_t *args, ngx_uint_t s); |
| 2072 | 119 static char *ngx_http_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, |
| 120 void *conf); | |
| 573 | 121 static ngx_int_t ngx_http_log_init(ngx_conf_t *cf); |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
122 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
123 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
124 static ngx_command_t ngx_http_log_commands[] = { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
125 |
| 497 | 126 { ngx_string("log_format"), |
| 127 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE, | |
| 128 ngx_http_log_set_format, | |
| 129 NGX_HTTP_MAIN_CONF_OFFSET, | |
| 130 0, | |
| 131 NULL }, | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
132 |
| 497 | 133 { ngx_string("access_log"), |
| 645 | 134 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF |
|
1562
bb662e047a21
allow access_log inside limit_except
Igor Sysoev <igor@sysoev.ru>
parents:
1271
diff
changeset
|
135 |NGX_HTTP_LMT_CONF|NGX_CONF_TAKE123, |
| 497 | 136 ngx_http_log_set_log, |
| 137 NGX_HTTP_LOC_CONF_OFFSET, | |
| 138 0, | |
| 139 NULL }, | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
140 |
| 2072 | 141 { ngx_string("open_log_file_cache"), |
| 142 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234, | |
| 143 ngx_http_log_open_file_cache, | |
| 144 NGX_HTTP_LOC_CONF_OFFSET, | |
| 145 0, | |
| 146 NULL }, | |
| 147 | |
| 497 | 148 ngx_null_command |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
149 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
150 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
151 |
| 667 | 152 static ngx_http_module_t ngx_http_log_module_ctx = { |
| 880 | 153 NULL, /* preconfiguration */ |
| 573 | 154 ngx_http_log_init, /* postconfiguration */ |
|
177
4db54fdbcbe7
nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents:
176
diff
changeset
|
155 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
156 ngx_http_log_create_main_conf, /* create main configuration */ |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
157 NULL, /* init main configuration */ |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
158 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
159 NULL, /* create server configuration */ |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
160 NULL, /* merge server configuration */ |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
161 |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
162 ngx_http_log_create_loc_conf, /* create location configuration */ |
|
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
163 ngx_http_log_merge_loc_conf /* merge location configuration */ |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
164 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
165 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
166 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
167 ngx_module_t ngx_http_log_module = { |
| 509 | 168 NGX_MODULE_V1, |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
169 &ngx_http_log_module_ctx, /* module context */ |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
170 ngx_http_log_commands, /* module directives */ |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
171 NGX_HTTP_MODULE, /* module type */ |
| 541 | 172 NULL, /* init master */ |
| 573 | 173 NULL, /* init module */ |
| 541 | 174 NULL, /* init process */ |
| 175 NULL, /* init thread */ | |
| 176 NULL, /* exit thread */ | |
| 177 NULL, /* exit process */ | |
| 178 NULL, /* exit master */ | |
| 179 NGX_MODULE_V1_PADDING | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
180 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
181 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
182 |
| 1074 | 183 static ngx_str_t ngx_http_access_log = ngx_string(NGX_HTTP_LOG_PATH); |
| 573 | 184 |
| 185 | |
| 186 static ngx_str_t ngx_http_combined_fmt = | |
| 581 | 187 ngx_string("$remote_addr - $remote_user [$time_local] " |
| 577 | 188 "\"$request\" $status $body_bytes_sent " |
| 573 | 189 "\"$http_referer\" \"$http_user_agent\""); |
|
119
cd54bcbaf3b5
nginx-0.0.1-2003-07-21-01:15:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
116
diff
changeset
|
190 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
191 |
| 573 | 192 static ngx_http_log_var_t ngx_http_log_vars[] = { |
| 193 { ngx_string("pipe"), 1, ngx_http_log_pipe }, | |
| 581 | 194 { ngx_string("time_local"), sizeof("28/Sep/1970:12:00:00 +0600") - 1, |
| 573 | 195 ngx_http_log_time }, |
| 3873 | 196 { ngx_string("time_iso8601"), sizeof("1970-09-28T12:00:00+06:00") - 1, |
| 197 ngx_http_log_iso8601 }, | |
| 573 | 198 { ngx_string("msec"), NGX_TIME_T_LEN + 4, ngx_http_log_msec }, |
|
1179
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
199 { ngx_string("request_time"), NGX_TIME_T_LEN + 4, |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
200 ngx_http_log_request_time }, |
|
4637
668ab1a21327
Zero padded the returned and logged HTTP status code, and fixed possible
Ruslan Ermilov <ru@nginx.com>
parents:
4539
diff
changeset
|
201 { ngx_string("status"), NGX_INT_T_LEN, ngx_http_log_status }, |
| 573 | 202 { ngx_string("bytes_sent"), NGX_OFF_T_LEN, ngx_http_log_bytes_sent }, |
| 577 | 203 { ngx_string("body_bytes_sent"), NGX_OFF_T_LEN, |
| 204 ngx_http_log_body_bytes_sent }, | |
| 573 | 205 { ngx_string("request_length"), NGX_SIZE_T_LEN, |
| 206 ngx_http_log_request_length }, | |
| 207 | |
| 208 { ngx_null_string, 0, NULL } | |
| 209 }; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
210 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
211 |
|
4759
4c36e15651f7
Fixed compilation with -Wmissing-prototypes.
Ruslan Ermilov <ru@nginx.com>
parents:
4685
diff
changeset
|
212 static ngx_int_t |
| 497 | 213 ngx_http_log_handler(ngx_http_request_t *r) |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
214 { |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
215 u_char *line, *p; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
216 size_t len; |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
217 ngx_uint_t i, l; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
218 ngx_http_log_t *log; |
| 571 | 219 ngx_open_file_t *file; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
220 ngx_http_log_op_t *op; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
221 ngx_http_log_loc_conf_t *lcf; |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
222 |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
223 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
224 "http log handler"); |
|
28
a117a7fdf042
nginx-0.0.1-2002-12-16-00:08:04 import
Igor Sysoev <igor@sysoev.ru>
parents:
26
diff
changeset
|
225 |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
226 lcf = ngx_http_get_module_loc_conf(r, ngx_http_log_module); |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
227 |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
228 if (lcf->off) { |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
229 return NGX_OK; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
230 } |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
231 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
232 log = lcf->logs->elts; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
233 for (l = 0; l < lcf->logs->nelts; l++) { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
234 |
| 633 | 235 if (ngx_time() == log[l].disk_full_time) { |
| 236 | |
| 237 /* | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
238 * on FreeBSD writing to a full filesystem with enabled softupdates |
| 633 | 239 * may block process for much longer time than writing to non-full |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
240 * filesystem, so we skip writing to a log for one second |
| 633 | 241 */ |
| 242 | |
| 243 continue; | |
| 244 } | |
| 245 | |
| 2261 | 246 ngx_http_script_flush_no_cacheable_variables(r, log[l].format->flushes); |
| 247 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
248 len = 0; |
| 2261 | 249 op = log[l].format->ops->elts; |
| 250 for (i = 0; i < log[l].format->ops->nelts; i++) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
251 if (op[i].len == 0) { |
| 479 | 252 len += op[i].getlen(r, op[i].data); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
253 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
254 } else { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
255 len += op[i].len; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
256 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
257 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
258 |
| 571 | 259 len += NGX_LINEFEED_SIZE; |
| 260 | |
| 261 file = log[l].file; | |
| 262 | |
| 2072 | 263 if (file && file->buffer) { |
| 571 | 264 |
| 265 if (len > (size_t) (file->last - file->pos)) { | |
| 266 | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
267 ngx_http_log_write(r, &log[l], file->buffer, |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
268 file->pos - file->buffer); |
| 571 | 269 |
| 270 file->pos = file->buffer; | |
| 271 } | |
| 272 | |
| 273 if (len <= (size_t) (file->last - file->pos)) { | |
| 274 | |
| 275 p = file->pos; | |
| 276 | |
| 2261 | 277 for (i = 0; i < log[l].format->ops->nelts; i++) { |
| 571 | 278 p = op[i].run(r, p, &op[i]); |
| 279 } | |
| 280 | |
| 281 ngx_linefeed(p); | |
| 282 | |
| 283 file->pos = p; | |
| 284 | |
| 285 continue; | |
| 286 } | |
| 287 } | |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
288 |
| 2049 | 289 line = ngx_pnalloc(r->pool, len); |
| 501 | 290 if (line == NULL) { |
| 473 | 291 return NGX_ERROR; |
| 292 } | |
| 293 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
294 p = line; |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
295 |
| 2261 | 296 for (i = 0; i < log[l].format->ops->nelts; i++) { |
| 479 | 297 p = op[i].run(r, p, &op[i]); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
298 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
299 |
| 571 | 300 ngx_linefeed(p); |
| 301 | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
302 ngx_http_log_write(r, &log[l], line, p - line); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
303 } |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
304 |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
305 return NGX_OK; |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
306 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
307 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
308 |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
309 static void |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
310 ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log, u_char *buf, |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
311 size_t len) |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
312 { |
| 2072 | 313 u_char *name; |
| 314 time_t now; | |
| 315 ssize_t n; | |
| 316 ngx_err_t err; | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
317 |
| 2072 | 318 if (log->script == NULL) { |
| 319 name = log->file->name.data; | |
| 320 n = ngx_write_fd(log->file->fd, buf, len); | |
| 321 | |
| 322 } else { | |
| 323 name = NULL; | |
| 324 n = ngx_http_log_script_write(r, log->script, &name, buf, len); | |
| 325 } | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
326 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
327 if (n == (ssize_t) len) { |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
328 return; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
329 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
330 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
331 now = ngx_time(); |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
332 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
333 if (n == -1) { |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
334 err = ngx_errno; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
335 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
336 if (err == NGX_ENOSPC) { |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
337 log->disk_full_time = now; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
338 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
339 |
|
1161
6002e0253221
use 60 seconds interval but not 61 seconds
Igor Sysoev <igor@sysoev.ru>
parents:
1074
diff
changeset
|
340 if (now - log->error_log_time > 59) { |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
341 ngx_log_error(NGX_LOG_ALERT, r->connection->log, err, |
| 2072 | 342 ngx_write_fd_n " to \"%s\" failed", name); |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
343 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
344 log->error_log_time = now; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
345 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
346 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
347 return; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
348 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
349 |
|
1161
6002e0253221
use 60 seconds interval but not 61 seconds
Igor Sysoev <igor@sysoev.ru>
parents:
1074
diff
changeset
|
350 if (now - log->error_log_time > 59) { |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
351 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, |
| 2072 | 352 ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz", |
| 353 name, n, len); | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
354 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
355 log->error_log_time = now; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
356 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
357 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
358 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
359 |
| 2072 | 360 static ssize_t |
| 361 ngx_http_log_script_write(ngx_http_request_t *r, ngx_http_log_script_t *script, | |
| 362 u_char **name, u_char *buf, size_t len) | |
| 363 { | |
| 364 size_t root; | |
| 365 ssize_t n; | |
| 366 ngx_str_t log, path; | |
| 367 ngx_open_file_info_t of; | |
| 368 ngx_http_log_loc_conf_t *llcf; | |
| 369 ngx_http_core_loc_conf_t *clcf; | |
| 370 | |
|
4478
08713bac87fc
Support for disable_symlinks in various modules.
Andrey Belov <defan@nginx.com>
parents:
4474
diff
changeset
|
371 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
|
08713bac87fc
Support for disable_symlinks in various modules.
Andrey Belov <defan@nginx.com>
parents:
4474
diff
changeset
|
372 |
|
2087
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
373 if (!r->root_tested) { |
| 2072 | 374 |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
375 /* test root directory existence */ |
| 2072 | 376 |
| 377 if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) { | |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
378 /* simulate successful logging */ |
| 2072 | 379 return len; |
| 380 } | |
| 381 | |
| 382 path.data[root] = '\0'; | |
| 383 | |
| 384 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); | |
| 385 | |
| 386 of.valid = clcf->open_file_cache_valid; | |
| 387 of.min_uses = clcf->open_file_cache_min_uses; | |
|
2756
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
388 of.test_dir = 1; |
|
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
389 of.test_only = 1; |
| 2072 | 390 of.errors = clcf->open_file_cache_errors; |
| 391 of.events = clcf->open_file_cache_events; | |
|
4494
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
392 |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
393 if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) { |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
394 /* simulate successful logging */ |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
395 return len; |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
396 } |
| 2072 | 397 |
| 398 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) | |
|
2087
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
399 != NGX_OK) |
| 2072 | 400 { |
|
2087
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
401 if (of.err == 0) { |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
402 /* simulate successful logging */ |
|
2087
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
403 return len; |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
404 } |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
405 |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
406 ngx_log_error(NGX_LOG_ERR, r->connection->log, of.err, |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
407 "testing \"%s\" existence failed", path.data); |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
408 |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
409 /* simulate successful logging */ |
|
2087
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
410 return len; |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
411 } |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
412 |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
413 if (!of.is_dir) { |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
414 ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_ENOTDIR, |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
415 "testing \"%s\" existence failed", path.data); |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
416 |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
417 /* simulate successful logging */ |
| 2072 | 418 return len; |
| 419 } | |
| 420 } | |
| 421 | |
| 422 if (ngx_http_script_run(r, &log, script->lengths->elts, 1, | |
| 423 script->values->elts) | |
| 424 == NULL) | |
| 425 { | |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
426 /* simulate successful logging */ |
| 2072 | 427 return len; |
| 428 } | |
| 429 | |
| 430 log.data[log.len - 1] = '\0'; | |
| 431 *name = log.data; | |
| 432 | |
| 433 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 434 "http log \"%s\"", log.data); | |
| 435 | |
| 436 llcf = ngx_http_get_module_loc_conf(r, ngx_http_log_module); | |
| 437 | |
| 438 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); | |
| 439 | |
| 440 of.log = 1; | |
| 441 of.valid = llcf->open_file_cache_valid; | |
| 442 of.min_uses = llcf->open_file_cache_min_uses; | |
| 2277 | 443 of.directio = NGX_OPEN_FILE_DIRECTIO_OFF; |
|
4494
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
444 |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
445 if (ngx_http_set_disable_symlinks(r, clcf, &log, &of) != NGX_OK) { |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
446 /* simulate successful logging */ |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
447 return len; |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
448 } |
| 2072 | 449 |
| 450 if (ngx_open_cached_file(llcf->open_file_cache, &log, &of, r->pool) | |
| 451 != NGX_OK) | |
| 452 { | |
| 453 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, | |
|
2756
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
454 "%s \"%s\" failed", of.failed, log.data); |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
455 /* simulate successful logging */ |
| 2077 | 456 return len; |
| 2072 | 457 } |
| 458 | |
| 459 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 460 "http log #%d", of.fd); | |
| 461 | |
| 462 n = ngx_write_fd(of.fd, buf, len); | |
| 463 | |
| 464 return n; | |
| 465 } | |
| 466 | |
| 467 | |
| 497 | 468 static u_char * |
| 469 ngx_http_log_copy_short(ngx_http_request_t *r, u_char *buf, | |
| 470 ngx_http_log_op_t *op) | |
| 479 | 471 { |
| 472 size_t len; | |
| 473 uintptr_t data; | |
| 474 | |
| 475 len = op->len; | |
| 476 data = op->data; | |
| 477 | |
| 478 while (len--) { | |
| 479 *buf++ = (u_char) (data & 0xff); | |
| 480 data >>= 8; | |
| 481 } | |
| 482 | |
| 483 return buf; | |
| 484 } | |
| 485 | |
| 486 | |
| 497 | 487 static u_char * |
| 488 ngx_http_log_copy_long(ngx_http_request_t *r, u_char *buf, | |
| 489 ngx_http_log_op_t *op) | |
| 479 | 490 { |
| 491 return ngx_cpymem(buf, (u_char *) op->data, op->len); | |
| 492 } | |
| 493 | |
| 494 | |
| 497 | 495 static u_char * |
| 496 ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
497 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
498 if (r->pipeline) { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
499 *buf = 'p'; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
500 } else { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
501 *buf = '.'; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
502 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
503 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
504 return buf + 1; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
505 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
506 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
507 |
| 497 | 508 static u_char * |
| 509 ngx_http_log_time(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
510 { |
|
178
a8ff48d26cca
nginx-0.0.1-2003-11-11-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
177
diff
changeset
|
511 return ngx_cpymem(buf, ngx_cached_http_log_time.data, |
|
a8ff48d26cca
nginx-0.0.1-2003-11-11-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
177
diff
changeset
|
512 ngx_cached_http_log_time.len); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
513 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
514 |
| 3873 | 515 static u_char * |
| 516 ngx_http_log_iso8601(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
| 517 { | |
| 518 return ngx_cpymem(buf, ngx_cached_http_log_iso8601.data, | |
| 519 ngx_cached_http_log_iso8601.len); | |
| 520 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
521 |
| 497 | 522 static u_char * |
| 523 ngx_http_log_msec(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
524 { |
| 563 | 525 ngx_time_t *tp; |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
526 |
| 563 | 527 tp = ngx_timeofday(); |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
528 |
| 563 | 529 return ngx_sprintf(buf, "%T.%03M", tp->sec, tp->msec); |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
530 } |
|
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
531 |
|
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
532 |
| 497 | 533 static u_char * |
| 534 ngx_http_log_request_time(ngx_http_request_t *r, u_char *buf, | |
| 535 ngx_http_log_op_t *op) | |
| 536 { | |
|
1179
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
537 ngx_time_t *tp; |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
538 ngx_msec_int_t ms; |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
539 |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
540 tp = ngx_timeofday(); |
| 497 | 541 |
| 1640 | 542 ms = (ngx_msec_int_t) |
| 543 ((tp->sec - r->start_sec) * 1000 + (tp->msec - r->start_msec)); | |
| 3515 | 544 ms = ngx_max(ms, 0); |
| 497 | 545 |
|
1179
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
546 return ngx_sprintf(buf, "%T.%03M", ms / 1000, ms % 1000); |
| 497 | 547 } |
| 548 | |
| 549 | |
| 550 static u_char * | |
| 551 ngx_http_log_status(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
552 { |
|
3370
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
553 ngx_uint_t status; |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
554 |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
555 if (r->err_status) { |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
556 status = r->err_status; |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
557 |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
558 } else if (r->headers_out.status) { |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
559 status = r->headers_out.status; |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
560 |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
561 } else if (r->http_version == NGX_HTTP_VERSION_9) { |
|
4685
956edecaedeb
New core variable: $status.
Andrey Belov <defan@nginx.com>
parents:
4637
diff
changeset
|
562 status = 9; |
|
3370
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
563 |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
564 } else { |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
565 status = 0; |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
566 } |
|
bfe37ab335b5
log proxied HTTP/0.9 responses status as "009"
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
567 |
|
4637
668ab1a21327
Zero padded the returned and logged HTTP status code, and fixed possible
Ruslan Ermilov <ru@nginx.com>
parents:
4539
diff
changeset
|
568 return ngx_sprintf(buf, "%03ui", status); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
569 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
570 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
571 |
| 497 | 572 static u_char * |
| 573 | 573 ngx_http_log_bytes_sent(ngx_http_request_t *r, u_char *buf, |
| 574 ngx_http_log_op_t *op) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
575 { |
| 455 | 576 return ngx_sprintf(buf, "%O", r->connection->sent); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
577 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
578 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
579 |
| 1271 | 580 /* |
| 581 * although there is a real $body_bytes_sent variable, | |
| 582 * this log operation code function is more optimized for logging | |
| 583 */ | |
| 584 | |
| 497 | 585 static u_char * |
| 577 | 586 ngx_http_log_body_bytes_sent(ngx_http_request_t *r, u_char *buf, |
| 497 | 587 ngx_http_log_op_t *op) |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
588 { |
| 497 | 589 off_t length; |
| 590 | |
| 591 length = r->connection->sent - r->header_size; | |
| 592 | |
| 593 if (length > 0) { | |
| 594 return ngx_sprintf(buf, "%O", length); | |
| 595 } | |
| 596 | |
| 597 *buf = '0'; | |
| 598 | |
| 599 return buf + 1; | |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
600 } |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
601 |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
602 |
| 497 | 603 static u_char * |
| 604 ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf, | |
| 605 ngx_http_log_op_t *op) | |
| 475 | 606 { |
| 663 | 607 return ngx_sprintf(buf, "%O", r->request_length); |
| 475 | 608 } |
| 609 | |
| 610 | |
| 497 | 611 static ngx_int_t |
| 501 | 612 ngx_http_log_variable_compile(ngx_conf_t *cf, ngx_http_log_op_t *op, |
| 613 ngx_str_t *value) | |
| 614 { | |
| 509 | 615 ngx_int_t index; |
| 501 | 616 |
| 509 | 617 index = ngx_http_get_variable_index(cf, value); |
| 618 if (index == NGX_ERROR) { | |
| 501 | 619 return NGX_ERROR; |
| 620 } | |
| 621 | |
| 622 op->len = 0; | |
| 623 op->getlen = ngx_http_log_variable_getlen; | |
| 624 op->run = ngx_http_log_variable; | |
| 509 | 625 op->data = index; |
| 501 | 626 |
| 627 return NGX_OK; | |
| 628 } | |
| 629 | |
| 630 | |
| 631 static size_t | |
| 632 ngx_http_log_variable_getlen(ngx_http_request_t *r, uintptr_t data) | |
| 633 { | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
634 uintptr_t len; |
| 501 | 635 ngx_http_variable_value_t *value; |
| 636 | |
| 637 value = ngx_http_get_indexed_variable(r, data); | |
| 638 | |
| 573 | 639 if (value == NULL || value->not_found) { |
| 501 | 640 return 1; |
| 641 } | |
| 642 | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
643 len = ngx_http_log_escape(NULL, value->data, value->len); |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
644 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
645 value->escape = len ? 1 : 0; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
646 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
647 return value->len + len * 3; |
| 501 | 648 } |
| 649 | |
| 650 | |
| 651 static u_char * | |
| 652 ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
| 653 { | |
| 654 ngx_http_variable_value_t *value; | |
| 655 | |
| 656 value = ngx_http_get_indexed_variable(r, op->data); | |
| 657 | |
| 573 | 658 if (value == NULL || value->not_found) { |
| 501 | 659 *buf = '-'; |
| 660 return buf + 1; | |
| 661 } | |
| 662 | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
663 if (value->escape == 0) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
664 return ngx_cpymem(buf, value->data, value->len); |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
665 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
666 } else { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
667 return (u_char *) ngx_http_log_escape(buf, value->data, value->len); |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
668 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
669 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
670 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
671 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
672 static uintptr_t |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
673 ngx_http_log_escape(u_char *dst, u_char *src, size_t size) |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
674 { |
| 3275 | 675 ngx_uint_t n; |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
676 static u_char hex[] = "0123456789ABCDEF"; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
677 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
678 static uint32_t escape[] = { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
679 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
680 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
681 /* ?>=< ;:98 7654 3210 /.-, +*)( '&%$ #"! */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
682 0x00000004, /* 0000 0000 0000 0000 0000 0000 0000 0100 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
683 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
684 /* _^]\ [ZYX WVUT SRQP ONML KJIH GFED CBA@ */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
685 0x10000000, /* 0001 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
686 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
687 /* ~}| {zyx wvut srqp onml kjih gfed cba` */ |
|
4191
08d8af70760c
Improved access log escaping to better protect other software.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
688 0x80000000, /* 1000 0000 0000 0000 0000 0000 0000 0000 */ |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
689 |
|
4191
08d8af70760c
Improved access log escaping to better protect other software.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
690 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
08d8af70760c
Improved access log escaping to better protect other software.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
691 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
08d8af70760c
Improved access log escaping to better protect other software.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
692 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
08d8af70760c
Improved access log escaping to better protect other software.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
693 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
694 }; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
695 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
696 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
697 if (dst == NULL) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
698 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
699 /* find the number of the characters to be escaped */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
700 |
| 3115 | 701 n = 0; |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
702 |
| 3275 | 703 while (size) { |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
704 if (escape[*src >> 5] & (1 << (*src & 0x1f))) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
705 n++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
706 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
707 src++; |
| 3275 | 708 size--; |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
709 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
710 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
711 return (uintptr_t) n; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
712 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
713 |
| 3275 | 714 while (size) { |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
715 if (escape[*src >> 5] & (1 << (*src & 0x1f))) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
716 *dst++ = '\\'; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
717 *dst++ = 'x'; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
718 *dst++ = hex[*src >> 4]; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
719 *dst++ = hex[*src & 0xf]; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
720 src++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
721 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
722 } else { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
723 *dst++ = *src++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
724 } |
| 3275 | 725 size--; |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
726 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
727 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
728 return (uintptr_t) dst; |
| 501 | 729 } |
| 730 | |
| 731 | |
| 497 | 732 static void * |
| 733 ngx_http_log_create_main_conf(ngx_conf_t *cf) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
734 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
735 ngx_http_log_main_conf_t *conf; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
736 |
| 573 | 737 ngx_http_log_fmt_t *fmt; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
738 |
| 501 | 739 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_main_conf_t)); |
| 740 if (conf == NULL) { | |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2756
diff
changeset
|
741 return NULL; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
742 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
743 |
| 497 | 744 if (ngx_array_init(&conf->formats, cf->pool, 4, sizeof(ngx_http_log_fmt_t)) |
| 573 | 745 != NGX_OK) |
| 497 | 746 { |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2756
diff
changeset
|
747 return NULL; |
| 497 | 748 } |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
749 |
| 573 | 750 fmt = ngx_array_push(&conf->formats); |
| 751 if (fmt == NULL) { | |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2756
diff
changeset
|
752 return NULL; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
753 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
754 |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
755 ngx_str_set(&fmt->name, "combined"); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
756 |
| 2261 | 757 fmt->flushes = NULL; |
| 758 | |
| 573 | 759 fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_http_log_op_t)); |
| 760 if (fmt->ops == NULL) { | |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2756
diff
changeset
|
761 return NULL; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
762 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
763 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
764 return conf; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
765 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
766 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
767 |
| 497 | 768 static void * |
| 769 ngx_http_log_create_loc_conf(ngx_conf_t *cf) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
770 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
771 ngx_http_log_loc_conf_t *conf; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
772 |
| 501 | 773 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_loc_conf_t)); |
| 774 if (conf == NULL) { | |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2756
diff
changeset
|
775 return NULL; |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
776 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
777 |
| 2072 | 778 conf->open_file_cache = NGX_CONF_UNSET_PTR; |
| 779 | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
780 return conf; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
781 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
782 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
783 |
| 497 | 784 static char * |
| 785 ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
786 { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
787 ngx_http_log_loc_conf_t *prev = parent; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
788 ngx_http_log_loc_conf_t *conf = child; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
789 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
790 ngx_http_log_t *log; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
791 ngx_http_log_fmt_t *fmt; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
792 ngx_http_log_main_conf_t *lmcf; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
793 |
| 2072 | 794 if (conf->open_file_cache == NGX_CONF_UNSET_PTR) { |
| 795 | |
| 796 conf->open_file_cache = prev->open_file_cache; | |
| 797 conf->open_file_cache_valid = prev->open_file_cache_valid; | |
| 798 conf->open_file_cache_min_uses = prev->open_file_cache_min_uses; | |
| 799 | |
| 800 if (conf->open_file_cache == NGX_CONF_UNSET_PTR) { | |
| 801 conf->open_file_cache = NULL; | |
| 802 } | |
| 803 } | |
| 804 | |
| 1074 | 805 if (conf->logs || conf->off) { |
| 806 return NGX_CONF_OK; | |
| 807 } | |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
808 |
|
2078
9acbc5e7bcbd
fix variable access_log merging
Igor Sysoev <igor@sysoev.ru>
parents:
2077
diff
changeset
|
809 conf->logs = prev->logs; |
|
9acbc5e7bcbd
fix variable access_log merging
Igor Sysoev <igor@sysoev.ru>
parents:
2077
diff
changeset
|
810 conf->off = prev->off; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
811 |
| 1074 | 812 if (conf->logs || conf->off) { |
| 813 return NGX_CONF_OK; | |
| 814 } | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
815 |
| 1074 | 816 conf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_log_t)); |
| 817 if (conf->logs == NULL) { | |
| 818 return NGX_CONF_ERROR; | |
| 819 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
820 |
| 1074 | 821 log = ngx_array_push(conf->logs); |
| 822 if (log == NULL) { | |
| 823 return NGX_CONF_ERROR; | |
| 824 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
825 |
| 1074 | 826 log->file = ngx_conf_open_file(cf->cycle, &ngx_http_access_log); |
| 827 if (log->file == NULL) { | |
| 828 return NGX_CONF_ERROR; | |
| 829 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
830 |
|
2080
a24c7009de0b
NULL script in default access_log
Igor Sysoev <igor@sysoev.ru>
parents:
2078
diff
changeset
|
831 log->script = NULL; |
| 1074 | 832 log->disk_full_time = 0; |
| 833 log->error_log_time = 0; | |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
834 |
| 1074 | 835 lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); |
| 836 fmt = lmcf->formats.elts; | |
| 837 | |
| 838 /* the default "combined" format */ | |
| 2261 | 839 log->format = &fmt[0]; |
| 1074 | 840 lmcf->combined_used = 1; |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
841 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
842 return NGX_CONF_OK; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
843 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
844 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
845 |
| 497 | 846 static char * |
| 847 ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
848 { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
849 ngx_http_log_loc_conf_t *llcf = conf; |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
850 |
| 2072 | 851 ssize_t buf; |
| 852 ngx_uint_t i, n; | |
| 853 ngx_str_t *value, name; | |
| 854 ngx_http_log_t *log; | |
| 855 ngx_http_log_fmt_t *fmt; | |
| 856 ngx_http_log_main_conf_t *lmcf; | |
| 857 ngx_http_script_compile_t sc; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
858 |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
859 value = cf->args->elts; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
860 |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
861 if (ngx_strcmp(value[1].data, "off") == 0) { |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
862 llcf->off = 1; |
|
3038
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
863 if (cf->args->nelts == 2) { |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
864 return NGX_CONF_OK; |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
865 } |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
866 |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
867 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
868 "invalid parameter \"%V\"", &value[2]); |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
869 return NGX_CONF_ERROR; |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
870 } |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
871 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
872 if (llcf->logs == NULL) { |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
873 llcf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_log_t)); |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
874 if (llcf->logs == NULL) { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
875 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
876 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
877 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
878 |
|
393
5659d773cfa8
nginx-0.0.7-2004-07-15-20:35:51 import
Igor Sysoev <igor@sysoev.ru>
parents:
356
diff
changeset
|
879 lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
880 |
| 501 | 881 log = ngx_array_push(llcf->logs); |
| 882 if (log == NULL) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
883 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
884 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
885 |
| 2072 | 886 ngx_memzero(log, sizeof(ngx_http_log_t)); |
| 887 | |
| 888 n = ngx_http_script_variables_count(&value[1]); | |
| 889 | |
| 890 if (n == 0) { | |
| 891 log->file = ngx_conf_open_file(cf->cycle, &value[1]); | |
| 892 if (log->file == NULL) { | |
| 893 return NGX_CONF_ERROR; | |
| 894 } | |
| 895 | |
| 896 } else { | |
|
2536
a6d6d762c554
small optimization: " == NGX_ERROR" > " != NGX_OK"
Igor Sysoev <igor@sysoev.ru>
parents:
2277
diff
changeset
|
897 if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) { |
| 2072 | 898 return NGX_CONF_ERROR; |
| 899 } | |
| 900 | |
| 901 log->script = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_script_t)); | |
| 902 if (log->script == NULL) { | |
| 903 return NGX_CONF_ERROR; | |
| 904 } | |
| 905 | |
| 906 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); | |
| 907 | |
| 908 sc.cf = cf; | |
| 909 sc.source = &value[1]; | |
| 910 sc.lengths = &log->script->lengths; | |
| 911 sc.values = &log->script->values; | |
| 912 sc.variables = n; | |
| 913 sc.complete_lengths = 1; | |
| 914 sc.complete_values = 1; | |
| 915 | |
| 916 if (ngx_http_script_compile(&sc) != NGX_OK) { | |
| 917 return NGX_CONF_ERROR; | |
| 918 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
919 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
920 |
| 571 | 921 if (cf->args->nelts >= 3) { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
922 name = value[2]; |
| 581 | 923 |
| 924 if (ngx_strcmp(name.data, "combined") == 0) { | |
| 925 lmcf->combined_used = 1; | |
| 926 } | |
| 927 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
928 } else { |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
929 ngx_str_set(&name, "combined"); |
| 573 | 930 lmcf->combined_used = 1; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
931 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
932 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
933 fmt = lmcf->formats.elts; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
934 for (i = 0; i < lmcf->formats.nelts; i++) { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
935 if (fmt[i].name.len == name.len |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
936 && ngx_strcasecmp(fmt[i].name.data, name.data) == 0) |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
937 { |
| 2261 | 938 log->format = &fmt[i]; |
| 571 | 939 goto buffer; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
940 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
941 } |
|
100
7ebc8b7fb816
nginx-0.0.1-2003-06-03-19:42:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
99
diff
changeset
|
942 |
| 487 | 943 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 944 "unknown log format \"%V\"", &name); | |
| 571 | 945 return NGX_CONF_ERROR; |
| 487 | 946 |
| 571 | 947 buffer: |
| 948 | |
| 949 if (cf->args->nelts == 4) { | |
| 950 if (ngx_strncmp(value[3].data, "buffer=", 7) != 0) { | |
| 951 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 952 "invalid parameter \"%V\"", &value[3]); | |
| 953 return NGX_CONF_ERROR; | |
| 954 } | |
| 955 | |
| 2072 | 956 if (log->script) { |
| 957 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
|
4133
59b99f217c6d
Replaced "can not" with "cannot" and "could not" in a bunch of places.
Ruslan Ermilov <ru@nginx.com>
parents:
3991
diff
changeset
|
958 "buffered logs cannot have variables in name"); |
| 2072 | 959 return NGX_CONF_ERROR; |
| 960 } | |
| 961 | |
| 571 | 962 name.len = value[3].len - 7; |
| 963 name.data = value[3].data + 7; | |
| 964 | |
| 965 buf = ngx_parse_size(&name); | |
| 966 | |
| 967 if (buf == NGX_ERROR) { | |
| 968 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
|
4327
73d37e1ccb91
- Improved error message when parsing of the "buffer" parameter of the
Ruslan Ermilov <ru@nginx.com>
parents:
4191
diff
changeset
|
969 "invalid buffer value \"%V\"", &name); |
| 571 | 970 return NGX_CONF_ERROR; |
| 971 } | |
| 972 | |
| 973 if (log->file->buffer && log->file->last - log->file->pos != buf) { | |
| 974 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 975 "access_log \"%V\" already defined " | |
| 976 "with different buffer size", &value[1]); | |
| 977 return NGX_CONF_ERROR; | |
| 978 } | |
| 979 | |
| 980 log->file->buffer = ngx_palloc(cf->pool, buf); | |
| 981 if (log->file->buffer == NULL) { | |
| 982 return NGX_CONF_ERROR; | |
| 983 } | |
| 984 | |
| 985 log->file->pos = log->file->buffer; | |
| 986 log->file->last = log->file->buffer + buf; | |
| 987 } | |
| 988 | |
| 989 return NGX_CONF_OK; | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
990 } |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
991 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
992 |
| 497 | 993 static char * |
| 994 ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
995 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
996 ngx_http_log_main_conf_t *lmcf = conf; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
997 |
| 573 | 998 ngx_str_t *value; |
| 999 ngx_uint_t i; | |
| 1000 ngx_http_log_fmt_t *fmt; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1001 |
|
4327
73d37e1ccb91
- Improved error message when parsing of the "buffer" parameter of the
Ruslan Ermilov <ru@nginx.com>
parents:
4191
diff
changeset
|
1002 if (cf->cmd_type != NGX_HTTP_MAIN_CONF) { |
|
73d37e1ccb91
- Improved error message when parsing of the "buffer" parameter of the
Ruslan Ermilov <ru@nginx.com>
parents:
4191
diff
changeset
|
1003 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
|
73d37e1ccb91
- Improved error message when parsing of the "buffer" parameter of the
Ruslan Ermilov <ru@nginx.com>
parents:
4191
diff
changeset
|
1004 "the \"log_format\" directive may be used " |
|
73d37e1ccb91
- Improved error message when parsing of the "buffer" parameter of the
Ruslan Ermilov <ru@nginx.com>
parents:
4191
diff
changeset
|
1005 "only on \"http\" level"); |
|
73d37e1ccb91
- Improved error message when parsing of the "buffer" parameter of the
Ruslan Ermilov <ru@nginx.com>
parents:
4191
diff
changeset
|
1006 } |
|
73d37e1ccb91
- Improved error message when parsing of the "buffer" parameter of the
Ruslan Ermilov <ru@nginx.com>
parents:
4191
diff
changeset
|
1007 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1008 value = cf->args->elts; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1009 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1010 fmt = lmcf->formats.elts; |
| 573 | 1011 for (i = 0; i < lmcf->formats.nelts; i++) { |
| 1012 if (fmt[i].name.len == value[1].len | |
| 1013 && ngx_strcmp(fmt[i].name.data, value[1].data) == 0) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1014 { |
| 2036 | 1015 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 1016 "duplicate \"log_format\" name \"%V\"", | |
| 1017 &value[1]); | |
| 1018 return NGX_CONF_ERROR; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1019 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1020 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1021 |
| 501 | 1022 fmt = ngx_array_push(&lmcf->formats); |
| 1023 if (fmt == NULL) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1024 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1025 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1026 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1027 fmt->name = value[1]; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1028 |
| 2261 | 1029 fmt->flushes = ngx_array_create(cf->pool, 4, sizeof(ngx_int_t)); |
| 1030 if (fmt->flushes == NULL) { | |
| 1031 return NGX_CONF_ERROR; | |
| 1032 } | |
| 1033 | |
| 573 | 1034 fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_http_log_op_t)); |
| 501 | 1035 if (fmt->ops == NULL) { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1036 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1037 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1038 |
| 2261 | 1039 return ngx_http_log_compile_format(cf, fmt->flushes, fmt->ops, cf->args, 2); |
| 573 | 1040 } |
| 1041 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1042 |
| 573 | 1043 static char * |
| 2261 | 1044 ngx_http_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes, |
| 1045 ngx_array_t *ops, ngx_array_t *args, ngx_uint_t s) | |
| 573 | 1046 { |
| 880 | 1047 u_char *data, *p, ch; |
| 1048 size_t i, len; | |
| 1049 ngx_str_t *value, var; | |
| 2261 | 1050 ngx_int_t *flush; |
| 880 | 1051 ngx_uint_t bracket; |
| 1052 ngx_http_log_op_t *op; | |
| 1053 ngx_http_log_var_t *v; | |
| 573 | 1054 |
| 1055 value = args->elts; | |
| 1056 | |
| 1057 for ( /* void */ ; s < args->nelts; s++) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1058 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1059 i = 0; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1060 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1061 while (i < value[s].len) { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1062 |
| 573 | 1063 op = ngx_array_push(ops); |
| 501 | 1064 if (op == NULL) { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1065 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1066 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1067 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1068 data = &value[s].data[i]; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1069 |
| 880 | 1070 if (value[s].data[i] == '$') { |
| 569 | 1071 |
| 1072 if (++i == value[s].len) { | |
| 1073 goto invalid; | |
| 1074 } | |
| 1075 | |
| 1076 if (value[s].data[i] == '{') { | |
| 1077 bracket = 1; | |
| 1078 | |
| 1079 if (++i == value[s].len) { | |
| 1080 goto invalid; | |
| 1081 } | |
| 1082 | |
| 1083 var.data = &value[s].data[i]; | |
| 1084 | |
| 1085 } else { | |
| 1086 bracket = 0; | |
| 1087 var.data = &value[s].data[i]; | |
| 1088 } | |
| 1089 | |
| 1090 for (var.len = 0; i < value[s].len; i++, var.len++) { | |
| 1091 ch = value[s].data[i]; | |
| 1092 | |
| 1093 if (ch == '}' && bracket) { | |
| 1094 i++; | |
| 1095 bracket = 0; | |
| 1096 break; | |
| 1097 } | |
| 1098 | |
| 1099 if ((ch >= 'A' && ch <= 'Z') | |
| 1100 || (ch >= 'a' && ch <= 'z') | |
| 1101 || (ch >= '0' && ch <= '9') | |
| 1102 || ch == '_') | |
| 1103 { | |
| 1104 continue; | |
| 1105 } | |
| 1106 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1107 break; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1108 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1109 |
| 569 | 1110 if (bracket) { |
| 1111 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1112 "the closing bracket in \"%V\" " | |
| 1113 "variable is missing", &var); | |
| 1114 return NGX_CONF_ERROR; | |
| 1115 } | |
| 1116 | |
| 1117 if (var.len == 0) { | |
| 1118 goto invalid; | |
| 1119 } | |
| 1120 | |
| 573 | 1121 for (v = ngx_http_log_vars; v->name.len; v++) { |
| 1122 | |
| 1123 if (v->name.len == var.len | |
| 1124 && ngx_strncmp(v->name.data, var.data, var.len) == 0) | |
| 1125 { | |
| 1126 op->len = v->len; | |
| 1127 op->getlen = NULL; | |
| 1128 op->run = v->run; | |
| 1129 op->data = 0; | |
| 1130 | |
| 1131 goto found; | |
| 1132 } | |
| 1133 } | |
| 1134 | |
| 569 | 1135 if (ngx_http_log_variable_compile(cf, op, &var) != NGX_OK) { |
| 1136 return NGX_CONF_ERROR; | |
| 1137 } | |
| 1138 | |
| 2261 | 1139 if (flushes) { |
| 1140 | |
| 1141 flush = ngx_array_push(flushes); | |
| 1142 if (flush == NULL) { | |
| 1143 return NGX_CONF_ERROR; | |
| 1144 } | |
| 1145 | |
| 1146 *flush = op->data; /* variable index */ | |
| 1147 } | |
| 1148 | |
| 573 | 1149 found: |
| 1150 | |
| 1151 continue; | |
| 1152 } | |
| 1153 | |
| 1154 i++; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1155 |
| 880 | 1156 while (i < value[s].len && value[s].data[i] != '$') { |
| 573 | 1157 i++; |
| 1158 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1159 |
| 573 | 1160 len = &value[s].data[i] - data; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1161 |
| 573 | 1162 if (len) { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1163 |
| 573 | 1164 op->len = len; |
| 1165 op->getlen = NULL; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1166 |
| 573 | 1167 if (len <= sizeof(uintptr_t)) { |
| 1168 op->run = ngx_http_log_copy_short; | |
| 1169 op->data = 0; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1170 |
| 573 | 1171 while (len--) { |
| 1172 op->data <<= 8; | |
| 1173 op->data |= data[len]; | |
| 1174 } | |
| 1175 | |
| 1176 } else { | |
| 1177 op->run = ngx_http_log_copy_long; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1178 |
| 2049 | 1179 p = ngx_pnalloc(cf->pool, len); |
| 573 | 1180 if (p == NULL) { |
| 1181 return NGX_CONF_ERROR; | |
| 1182 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1183 |
| 573 | 1184 ngx_memcpy(p, data, len); |
| 1185 op->data = (uintptr_t) p; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1186 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1187 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1188 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1189 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1190 |
| 569 | 1191 return NGX_CONF_OK; |
| 1192 | |
| 1193 invalid: | |
| 1194 | |
| 1195 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%s\"", data); | |
| 1196 | |
| 1197 return NGX_CONF_ERROR; | |
| 1198 } | |
| 1199 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1200 |
| 2072 | 1201 static char * |
| 1202 ngx_http_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 1203 { | |
| 1204 ngx_http_log_loc_conf_t *llcf = conf; | |
| 1205 | |
| 1206 time_t inactive, valid; | |
| 1207 ngx_str_t *value, s; | |
| 1208 ngx_int_t max, min_uses; | |
| 1209 ngx_uint_t i; | |
| 1210 | |
| 1211 if (llcf->open_file_cache != NGX_CONF_UNSET_PTR) { | |
| 1212 return "is duplicate"; | |
| 1213 } | |
| 1214 | |
| 1215 value = cf->args->elts; | |
| 1216 | |
| 1217 max = 0; | |
| 1218 inactive = 10; | |
| 1219 valid = 60; | |
| 1220 min_uses = 1; | |
| 1221 | |
| 1222 for (i = 1; i < cf->args->nelts; i++) { | |
| 1223 | |
| 1224 if (ngx_strncmp(value[i].data, "max=", 4) == 0) { | |
| 1225 | |
| 1226 max = ngx_atoi(value[i].data + 4, value[i].len - 4); | |
| 1227 if (max == NGX_ERROR) { | |
| 1228 goto failed; | |
| 1229 } | |
| 1230 | |
| 1231 continue; | |
| 1232 } | |
| 1233 | |
| 1234 if (ngx_strncmp(value[i].data, "inactive=", 9) == 0) { | |
| 1235 | |
| 1236 s.len = value[i].len - 9; | |
| 1237 s.data = value[i].data + 9; | |
| 1238 | |
| 1239 inactive = ngx_parse_time(&s, 1); | |
| 4474 | 1240 if (inactive == (time_t) NGX_ERROR) { |
| 2072 | 1241 goto failed; |
| 1242 } | |
| 1243 | |
| 1244 continue; | |
| 1245 } | |
| 1246 | |
| 1247 if (ngx_strncmp(value[i].data, "min_uses=", 9) == 0) { | |
| 1248 | |
| 1249 min_uses = ngx_atoi(value[i].data + 9, value[i].len - 9); | |
| 1250 if (min_uses == NGX_ERROR) { | |
| 1251 goto failed; | |
| 1252 } | |
| 1253 | |
| 1254 continue; | |
| 1255 } | |
| 1256 | |
| 1257 if (ngx_strncmp(value[i].data, "valid=", 6) == 0) { | |
| 1258 | |
| 1259 s.len = value[i].len - 6; | |
| 1260 s.data = value[i].data + 6; | |
| 1261 | |
| 1262 valid = ngx_parse_time(&s, 1); | |
| 4474 | 1263 if (valid == (time_t) NGX_ERROR) { |
| 2072 | 1264 goto failed; |
| 1265 } | |
| 1266 | |
| 1267 continue; | |
| 1268 } | |
| 1269 | |
| 1270 if (ngx_strcmp(value[i].data, "off") == 0) { | |
| 1271 | |
| 1272 llcf->open_file_cache = NULL; | |
| 1273 | |
| 1274 continue; | |
| 1275 } | |
| 1276 | |
| 1277 failed: | |
| 1278 | |
| 1279 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1280 "invalid \"open_log_file_cache\" parameter \"%V\"", | |
| 1281 &value[i]); | |
| 1282 return NGX_CONF_ERROR; | |
| 1283 } | |
| 1284 | |
| 1285 if (llcf->open_file_cache == NULL) { | |
| 1286 return NGX_CONF_OK; | |
| 1287 } | |
| 1288 | |
| 1289 if (max == 0) { | |
| 1290 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1291 "\"open_log_file_cache\" must have \"max\" parameter"); | |
| 1292 return NGX_CONF_ERROR; | |
| 1293 } | |
| 1294 | |
| 1295 llcf->open_file_cache = ngx_open_file_cache_init(cf->pool, max, inactive); | |
| 1296 | |
| 1297 if (llcf->open_file_cache) { | |
| 1298 | |
| 1299 llcf->open_file_cache_valid = valid; | |
| 1300 llcf->open_file_cache_min_uses = min_uses; | |
| 1301 | |
| 1302 return NGX_CONF_OK; | |
| 1303 } | |
| 1304 | |
| 1305 return NGX_CONF_ERROR; | |
| 1306 } | |
| 1307 | |
| 1308 | |
| 569 | 1309 static ngx_int_t |
| 573 | 1310 ngx_http_log_init(ngx_conf_t *cf) |
| 569 | 1311 { |
| 573 | 1312 ngx_str_t *value; |
| 1313 ngx_array_t a; | |
| 581 | 1314 ngx_http_handler_pt *h; |
| 573 | 1315 ngx_http_log_fmt_t *fmt; |
| 1316 ngx_http_log_main_conf_t *lmcf; | |
| 569 | 1317 ngx_http_core_main_conf_t *cmcf; |
| 1318 | |
| 573 | 1319 lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); |
| 1320 | |
| 1321 if (lmcf->combined_used) { | |
| 1322 if (ngx_array_init(&a, cf->pool, 1, sizeof(ngx_str_t)) != NGX_OK) { | |
| 1323 return NGX_ERROR; | |
| 1324 } | |
| 1325 | |
| 1326 value = ngx_array_push(&a); | |
| 1327 if (value == NULL) { | |
| 1328 return NGX_ERROR; | |
| 1329 } | |
| 1330 | |
| 1331 *value = ngx_http_combined_fmt; | |
| 1332 fmt = lmcf->formats.elts; | |
| 1333 | |
| 2261 | 1334 if (ngx_http_log_compile_format(cf, NULL, fmt->ops, &a, 0) |
| 573 | 1335 != NGX_CONF_OK) |
| 1336 { | |
| 1337 return NGX_ERROR; | |
| 1338 } | |
| 1339 } | |
| 1340 | |
| 1341 cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); | |
| 569 | 1342 |
| 581 | 1343 h = ngx_array_push(&cmcf->phases[NGX_HTTP_LOG_PHASE].handlers); |
| 1344 if (h == NULL) { | |
| 1345 return NGX_ERROR; | |
| 1346 } | |
| 1347 | |
| 1348 *h = ngx_http_log_handler; | |
| 569 | 1349 |
| 1350 return NGX_OK; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1351 } |