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