Mercurial > hg > nginx
annotate src/http/ngx_http_variables.h @ 6075:7fcfe113827d stable-1.6
Fixed possible buffer overrun in "too long header line" logging.
Additionally, ellipsis now always added to make it clear that
the header logged is incomplete.
Reported by Daniil Bondarev.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Wed, 08 Oct 2014 17:16:04 +0400 |
| parents | a33b8c3aa975 |
| children | d2b2ff157da5 |
| rev | line source |
|---|---|
| 499 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 499 | 5 */ |
| 6 | |
| 7 | |
| 8 #ifndef _NGX_HTTP_VARIABLES_H_INCLUDED_ | |
| 9 #define _NGX_HTTP_VARIABLES_H_INCLUDED_ | |
| 10 | |
| 11 | |
| 12 #include <ngx_config.h> | |
| 13 #include <ngx_core.h> | |
| 14 #include <ngx_http.h> | |
| 15 | |
| 16 | |
|
1310
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1162
diff
changeset
|
17 typedef ngx_variable_value_t ngx_http_variable_value_t; |
| 499 | 18 |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
19 #define ngx_http_variable(v) { sizeof(v) - 1, 1, 0, 0, 0, (u_char *) v } |
| 573 | 20 |
| 499 | 21 typedef struct ngx_http_variable_s ngx_http_variable_t; |
| 22 | |
| 637 | 23 typedef void (*ngx_http_set_variable_pt) (ngx_http_request_t *r, |
| 24 ngx_http_variable_value_t *v, uintptr_t data); | |
| 573 | 25 typedef ngx_int_t (*ngx_http_get_variable_pt) (ngx_http_request_t *r, |
| 26 ngx_http_variable_value_t *v, uintptr_t data); | |
| 499 | 27 |
| 28 | |
| 1565 | 29 #define NGX_HTTP_VAR_CHANGEABLE 1 |
| 30 #define NGX_HTTP_VAR_NOCACHEABLE 2 | |
| 31 #define NGX_HTTP_VAR_INDEXED 4 | |
| 32 #define NGX_HTTP_VAR_NOHASH 8 | |
| 509 | 33 |
| 34 | |
| 499 | 35 struct ngx_http_variable_s { |
| 573 | 36 ngx_str_t name; /* must be first to build the hash */ |
| 637 | 37 ngx_http_set_variable_pt set_handler; |
| 38 ngx_http_get_variable_pt get_handler; | |
| 573 | 39 uintptr_t data; |
| 40 ngx_uint_t flags; | |
| 41 ngx_uint_t index; | |
| 499 | 42 }; |
| 43 | |
| 44 | |
| 501 | 45 ngx_http_variable_t *ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, |
| 509 | 46 ngx_uint_t flags); |
| 47 ngx_int_t ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name); | |
| 499 | 48 ngx_http_variable_value_t *ngx_http_get_indexed_variable(ngx_http_request_t *r, |
| 49 ngx_uint_t index); | |
| 573 | 50 ngx_http_variable_value_t *ngx_http_get_flushed_variable(ngx_http_request_t *r, |
| 51 ngx_uint_t index); | |
| 52 | |
| 499 | 53 ngx_http_variable_value_t *ngx_http_get_variable(ngx_http_request_t *r, |
|
3500
0eb46e3c5c02
change processing variables accessed by SSI and perl module:
Igor Sysoev <igor@sysoev.ru>
parents:
3356
diff
changeset
|
54 ngx_str_t *name, ngx_uint_t key); |
| 509 | 55 |
| 1162 | 56 ngx_int_t ngx_http_variable_unknown_header(ngx_http_variable_value_t *v, |
| 57 ngx_str_t *var, ngx_list_part_t *part, size_t prefix); | |
| 58 | |
| 59 | |
|
3356
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
60 #if (NGX_PCRE) |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
61 |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
62 typedef struct { |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
63 ngx_uint_t capture; |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
64 ngx_int_t index; |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
65 } ngx_http_regex_variable_t; |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
66 |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
67 |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
68 typedef struct { |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
69 ngx_regex_t *regex; |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
70 ngx_uint_t ncaptures; |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
71 ngx_http_regex_variable_t *variables; |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
72 ngx_uint_t nvariables; |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
73 ngx_str_t name; |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
74 } ngx_http_regex_t; |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
75 |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
76 |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
77 typedef struct { |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
78 ngx_http_regex_t *regex; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
79 void *value; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
80 } ngx_http_map_regex_t; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
81 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
82 |
| 3325 | 83 ngx_http_regex_t *ngx_http_regex_compile(ngx_conf_t *cf, |
| 84 ngx_regex_compile_t *rc); | |
| 85 ngx_int_t ngx_http_regex_exec(ngx_http_request_t *r, ngx_http_regex_t *re, | |
| 86 ngx_str_t *s); | |
| 87 | |
|
3356
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
88 #endif |
|
fe08c14530e9
fix building without PCRE, the bug had been introduced in r3326
Igor Sysoev <igor@sysoev.ru>
parents:
3325
diff
changeset
|
89 |
| 3325 | 90 |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
91 typedef struct { |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
92 ngx_hash_combined_t hash; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
93 #if (NGX_PCRE) |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
94 ngx_http_map_regex_t *regex; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
95 ngx_uint_t nregex; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
96 #endif |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
97 } ngx_http_map_t; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
98 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
99 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
100 void *ngx_http_map_find(ngx_http_request_t *r, ngx_http_map_t *map, |
|
3929
fa4612bfb9fa
change ngx_http_map_find(): use case sensitive regexes
Igor Sysoev <igor@sysoev.ru>
parents:
3872
diff
changeset
|
101 ngx_str_t *match); |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
102 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3641
diff
changeset
|
103 |
| 509 | 104 ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf); |
| 105 ngx_int_t ngx_http_variables_init_vars(ngx_conf_t *cf); | |
| 499 | 106 |
| 107 | |
| 577 | 108 extern ngx_http_variable_value_t ngx_http_variable_null_value; |
| 109 extern ngx_http_variable_value_t ngx_http_variable_true_value; | |
| 110 | |
| 111 | |
| 499 | 112 #endif /* _NGX_HTTP_VARIABLES_H_INCLUDED_ */ |