Mercurial > hg > nginx
annotate src/core/ngx_string.c @ 5389:72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
This patch fixes incorrect handling of auto redirect in configurations
like:
location /0 { }
location /a- { }
location /a/ { proxy_pass ... }
With previously used sorting, this resulted in the following locations
tree (as "-" is less than "/"):
"/a-"
"/0" "/a/"
and a request to "/a" didn't match "/a/" with auto_redirect, as it
didn't traverse relevant tree node during lookup (it tested "/a-",
then "/0", and then falled back to null location).
To preserve locale use for non-ASCII characters on case-insensetive
systems, libc's tolower() used.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 23 Sep 2013 19:37:13 +0400 |
| parents | 670ceaba03d8 |
| children | a602e1006579 |
| 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:
409
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:
409
diff
changeset
|
2 /* |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
5 */ |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
6 |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 #include <ngx_config.h> |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
9 #include <ngx_core.h> |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 |
| 2293 | 12 static u_char *ngx_sprintf_num(u_char *buf, u_char *last, uint64_t ui64, |
| 13 u_char zero, ngx_uint_t hexadecimal, ngx_uint_t width); | |
|
3756
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
14 static ngx_int_t ngx_decode_base64_internal(ngx_str_t *dst, ngx_str_t *src, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
15 const u_char *basis); |
| 2293 | 16 |
| 17 | |
| 2135 | 18 void |
| 19 ngx_strlow(u_char *dst, u_char *src, size_t n) | |
| 20 { | |
| 3275 | 21 while (n) { |
| 2135 | 22 *dst = ngx_tolower(*src); |
| 23 dst++; | |
| 24 src++; | |
| 3275 | 25 n--; |
| 2135 | 26 } |
| 27 } | |
| 28 | |
| 29 | |
| 493 | 30 u_char * |
| 31 ngx_cpystrn(u_char *dst, u_char *src, size_t n) | |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
32 { |
|
84
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
33 if (n == 0) { |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
34 return dst; |
|
84
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
35 } |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
36 |
|
2919
41e7d9153967
change surplus for() to while()
Igor Sysoev <igor@sysoev.ru>
parents:
2763
diff
changeset
|
37 while (--n) { |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
38 *dst = *src; |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
39 |
|
84
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
40 if (*dst == '\0') { |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
41 return dst; |
|
84
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
42 } |
|
2919
41e7d9153967
change surplus for() to while()
Igor Sysoev <igor@sysoev.ru>
parents:
2763
diff
changeset
|
43 |
|
41e7d9153967
change surplus for() to while()
Igor Sysoev <igor@sysoev.ru>
parents:
2763
diff
changeset
|
44 dst++; |
|
41e7d9153967
change surplus for() to while()
Igor Sysoev <igor@sysoev.ru>
parents:
2763
diff
changeset
|
45 src++; |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
46 } |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
47 |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
48 *dst = '\0'; |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
49 |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
50 return dst; |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
51 } |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
52 |
|
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
53 |
| 493 | 54 u_char * |
| 55 ngx_pstrdup(ngx_pool_t *pool, ngx_str_t *src) | |
| 485 | 56 { |
| 57 u_char *dst; | |
| 58 | |
| 2049 | 59 dst = ngx_pnalloc(pool, src->len); |
| 501 | 60 if (dst == NULL) { |
| 485 | 61 return NULL; |
| 62 } | |
| 63 | |
| 64 ngx_memcpy(dst, src->data, src->len); | |
| 65 | |
| 66 return dst; | |
| 67 } | |
| 68 | |
| 69 | |
| 455 | 70 /* |
| 71 * supported formats: | |
| 473 | 72 * %[0][width][x][X]O off_t |
| 461 | 73 * %[0][width]T time_t |
| 74 * %[0][width][u][x|X]z ssize_t/size_t | |
| 75 * %[0][width][u][x|X]d int/u_int | |
| 76 * %[0][width][u][x|X]l long | |
| 77 * %[0][width|m][u][x|X]i ngx_int_t/ngx_uint_t | |
| 78 * %[0][width][u][x|X]D int32_t/uint32_t | |
| 79 * %[0][width][u][x|X]L int64_t/uint64_t | |
| 495 | 80 * %[0][width|m][u][x|X]A ngx_atomic_int_t/ngx_atomic_uint_t |
|
3506
c3fa65192119
use double in %f format to allow %.15f precision
Igor Sysoev <igor@sysoev.ru>
parents:
3486
diff
changeset
|
81 * %[0][width][.width]f double, max valid number fits to %18.15f |
| 461 | 82 * %P ngx_pid_t |
| 557 | 83 * %M ngx_msec_t |
| 461 | 84 * %r rlim_t |
|
1406
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
85 * %p void * |
|
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
86 * %V ngx_str_t * |
|
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
87 * %v ngx_variable_value_t * |
| 461 | 88 * %s null-terminated string |
| 1773 | 89 * %*s length and string |
| 461 | 90 * %Z '\0' |
| 525 | 91 * %N '\n' |
| 461 | 92 * %c char |
| 93 * %% % | |
| 455 | 94 * |
| 461 | 95 * reserved: |
| 96 * %t ptrdiff_t | |
| 3046 | 97 * %S null-terminated wchar string |
| 461 | 98 * %C wchar |
| 455 | 99 */ |
| 100 | |
| 461 | 101 |
| 503 | 102 u_char * ngx_cdecl |
| 493 | 103 ngx_sprintf(u_char *buf, const char *fmt, ...) |
| 461 | 104 { |
| 105 u_char *p; | |
| 106 va_list args; | |
| 107 | |
| 108 va_start(args, fmt); | |
|
2763
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
109 p = ngx_vslprintf(buf, (void *) -1, fmt, args); |
| 461 | 110 va_end(args); |
| 111 | |
| 112 return p; | |
| 113 } | |
| 114 | |
| 115 | |
| 503 | 116 u_char * ngx_cdecl |
| 493 | 117 ngx_snprintf(u_char *buf, size_t max, const char *fmt, ...) |
| 455 | 118 { |
| 461 | 119 u_char *p; |
| 120 va_list args; | |
| 121 | |
| 122 va_start(args, fmt); | |
|
2763
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
123 p = ngx_vslprintf(buf, buf + max, fmt, args); |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
124 va_end(args); |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
125 |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
126 return p; |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
127 } |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
128 |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
129 |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
130 u_char * ngx_cdecl |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
131 ngx_slprintf(u_char *buf, u_char *last, const char *fmt, ...) |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
132 { |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
133 u_char *p; |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
134 va_list args; |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
135 |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
136 va_start(args, fmt); |
|
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
137 p = ngx_vslprintf(buf, last, fmt, args); |
| 461 | 138 va_end(args); |
| 139 | |
| 140 return p; | |
| 141 } | |
| 142 | |
| 455 | 143 |
| 493 | 144 u_char * |
|
2763
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
145 ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args) |
| 461 | 146 { |
|
2763
819bea4e964e
ngx_vslprintf(), ngx_slprintf()
Igor Sysoev <igor@sysoev.ru>
parents:
2680
diff
changeset
|
147 u_char *p, zero; |
|
1310
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1298
diff
changeset
|
148 int d; |
| 4604 | 149 double f; |
| 1773 | 150 size_t len, slen; |
|
1310
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1298
diff
changeset
|
151 int64_t i64; |
| 4604 | 152 uint64_t ui64, frac; |
|
1310
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1298
diff
changeset
|
153 ngx_msec_t ms; |
| 4604 | 154 ngx_uint_t width, sign, hex, max_width, frac_width, scale, n; |
|
1406
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
155 ngx_str_t *v; |
|
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
156 ngx_variable_value_t *vv; |
| 455 | 157 |
| 461 | 158 while (*fmt && buf < last) { |
| 159 | |
| 160 /* | |
| 161 * "buf < last" means that we could copy at least one character: | |
| 162 * the plain character, "%%", "%c", and minus without the checking | |
| 163 */ | |
| 164 | |
| 455 | 165 if (*fmt == '%') { |
| 166 | |
| 461 | 167 i64 = 0; |
| 168 ui64 = 0; | |
| 169 | |
| 170 zero = (u_char) ((*++fmt == '0') ? '0' : ' '); | |
| 455 | 171 width = 0; |
| 172 sign = 1; | |
| 2293 | 173 hex = 0; |
| 493 | 174 max_width = 0; |
| 2293 | 175 frac_width = 0; |
| 1863 | 176 slen = (size_t) -1; |
| 455 | 177 |
| 178 while (*fmt >= '0' && *fmt <= '9') { | |
| 179 width = width * 10 + *fmt++ - '0'; | |
| 180 } | |
| 181 | |
| 182 | |
| 183 for ( ;; ) { | |
| 184 switch (*fmt) { | |
| 185 | |
| 186 case 'u': | |
| 187 sign = 0; | |
| 188 fmt++; | |
| 189 continue; | |
| 190 | |
| 467 | 191 case 'm': |
| 493 | 192 max_width = 1; |
| 467 | 193 fmt++; |
| 194 continue; | |
| 195 | |
| 461 | 196 case 'X': |
| 2293 | 197 hex = 2; |
| 461 | 198 sign = 0; |
| 199 fmt++; | |
| 200 continue; | |
| 201 | |
| 455 | 202 case 'x': |
| 2293 | 203 hex = 1; |
| 461 | 204 sign = 0; |
| 455 | 205 fmt++; |
| 206 continue; | |
| 207 | |
| 2293 | 208 case '.': |
| 209 fmt++; | |
| 210 | |
| 211 while (*fmt >= '0' && *fmt <= '9') { | |
| 212 frac_width = frac_width * 10 + *fmt++ - '0'; | |
| 213 } | |
| 214 | |
| 215 break; | |
| 216 | |
| 1773 | 217 case '*': |
| 1866 | 218 slen = va_arg(args, size_t); |
| 1773 | 219 fmt++; |
| 220 continue; | |
| 221 | |
| 455 | 222 default: |
| 223 break; | |
| 224 } | |
| 225 | |
| 226 break; | |
| 227 } | |
| 228 | |
| 229 | |
| 230 switch (*fmt) { | |
| 231 | |
| 461 | 232 case 'V': |
|
1406
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
233 v = va_arg(args, ngx_str_t *); |
| 455 | 234 |
| 3515 | 235 len = ngx_min(((size_t) (last - buf)), v->len); |
|
1310
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1298
diff
changeset
|
236 buf = ngx_cpymem(buf, v->data, len); |
| 461 | 237 fmt++; |
| 455 | 238 |
| 461 | 239 continue; |
| 455 | 240 |
|
1406
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
241 case 'v': |
|
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
242 vv = va_arg(args, ngx_variable_value_t *); |
|
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
243 |
| 3515 | 244 len = ngx_min(((size_t) (last - buf)), vv->len); |
|
1406
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
245 buf = ngx_cpymem(buf, vv->data, len); |
|
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
246 fmt++; |
|
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
247 |
|
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
248 continue; |
|
03341711f9a2
use %v for ngx_variable_value_t in ngx_sprintf(),
Igor Sysoev <igor@sysoev.ru>
parents:
1405
diff
changeset
|
249 |
| 455 | 250 case 's': |
| 461 | 251 p = va_arg(args, u_char *); |
| 455 | 252 |
| 1863 | 253 if (slen == (size_t) -1) { |
| 1773 | 254 while (*p && buf < last) { |
| 255 *buf++ = *p++; | |
| 256 } | |
| 257 | |
| 258 } else { | |
| 3515 | 259 len = ngx_min(((size_t) (last - buf)), slen); |
| 1867 | 260 buf = ngx_cpymem(buf, p, len); |
| 455 | 261 } |
| 1773 | 262 |
| 455 | 263 fmt++; |
| 264 | |
| 265 continue; | |
| 266 | |
| 461 | 267 case 'O': |
| 268 i64 = (int64_t) va_arg(args, off_t); | |
| 269 sign = 1; | |
| 270 break; | |
| 271 | |
| 272 case 'P': | |
| 273 i64 = (int64_t) va_arg(args, ngx_pid_t); | |
| 274 sign = 1; | |
| 275 break; | |
| 276 | |
| 277 case 'T': | |
| 278 i64 = (int64_t) va_arg(args, time_t); | |
| 279 sign = 1; | |
| 280 break; | |
| 281 | |
| 557 | 282 case 'M': |
| 561 | 283 ms = (ngx_msec_t) va_arg(args, ngx_msec_t); |
| 284 if ((ngx_msec_int_t) ms == -1) { | |
| 285 sign = 1; | |
| 286 i64 = -1; | |
| 287 } else { | |
| 288 sign = 0; | |
| 289 ui64 = (uint64_t) ms; | |
| 290 } | |
| 557 | 291 break; |
| 292 | |
| 461 | 293 case 'z': |
| 294 if (sign) { | |
| 295 i64 = (int64_t) va_arg(args, ssize_t); | |
| 296 } else { | |
| 297 ui64 = (uint64_t) va_arg(args, size_t); | |
| 298 } | |
| 299 break; | |
| 300 | |
| 301 case 'i': | |
| 302 if (sign) { | |
| 303 i64 = (int64_t) va_arg(args, ngx_int_t); | |
| 304 } else { | |
| 305 ui64 = (uint64_t) va_arg(args, ngx_uint_t); | |
| 306 } | |
| 493 | 307 |
| 308 if (max_width) { | |
| 309 width = NGX_INT_T_LEN; | |
| 310 } | |
| 311 | |
| 461 | 312 break; |
| 313 | |
| 314 case 'd': | |
| 315 if (sign) { | |
| 316 i64 = (int64_t) va_arg(args, int); | |
| 317 } else { | |
| 318 ui64 = (uint64_t) va_arg(args, u_int); | |
| 319 } | |
| 320 break; | |
| 321 | |
| 322 case 'l': | |
| 323 if (sign) { | |
| 324 i64 = (int64_t) va_arg(args, long); | |
| 325 } else { | |
| 326 ui64 = (uint64_t) va_arg(args, u_long); | |
| 327 } | |
| 328 break; | |
| 329 | |
| 330 case 'D': | |
| 331 if (sign) { | |
| 332 i64 = (int64_t) va_arg(args, int32_t); | |
| 333 } else { | |
| 334 ui64 = (uint64_t) va_arg(args, uint32_t); | |
| 335 } | |
| 336 break; | |
| 337 | |
| 338 case 'L': | |
| 339 if (sign) { | |
| 340 i64 = va_arg(args, int64_t); | |
| 341 } else { | |
| 342 ui64 = va_arg(args, uint64_t); | |
| 343 } | |
| 344 break; | |
| 345 | |
| 493 | 346 case 'A': |
| 347 if (sign) { | |
| 348 i64 = (int64_t) va_arg(args, ngx_atomic_int_t); | |
| 349 } else { | |
| 495 | 350 ui64 = (uint64_t) va_arg(args, ngx_atomic_uint_t); |
| 493 | 351 } |
| 352 | |
| 353 if (max_width) { | |
| 354 width = NGX_ATOMIC_T_LEN; | |
| 355 } | |
| 356 | |
| 357 break; | |
| 358 | |
| 2293 | 359 case 'f': |
|
3506
c3fa65192119
use double in %f format to allow %.15f precision
Igor Sysoev <igor@sysoev.ru>
parents:
3486
diff
changeset
|
360 f = va_arg(args, double); |
| 2293 | 361 |
| 362 if (f < 0) { | |
| 363 *buf++ = '-'; | |
| 364 f = -f; | |
| 365 } | |
| 366 | |
| 367 ui64 = (int64_t) f; | |
| 4604 | 368 frac = 0; |
| 369 | |
| 370 if (frac_width) { | |
| 371 | |
| 372 scale = 1; | |
| 373 for (n = frac_width; n; n--) { | |
| 374 scale *= 10; | |
| 375 } | |
| 376 | |
| 377 frac = (uint64_t) ((f - (double) ui64) * scale + 0.5); | |
| 378 | |
| 379 if (frac == scale) { | |
| 380 ui64++; | |
| 381 frac = 0; | |
| 382 } | |
| 383 } | |
| 2293 | 384 |
| 385 buf = ngx_sprintf_num(buf, last, ui64, zero, 0, width); | |
| 386 | |
| 387 if (frac_width) { | |
| 388 if (buf < last) { | |
| 389 *buf++ = '.'; | |
| 390 } | |
| 391 | |
| 4604 | 392 buf = ngx_sprintf_num(buf, last, frac, '0', 0, frac_width); |
| 2293 | 393 } |
| 394 | |
| 395 fmt++; | |
| 396 | |
| 397 continue; | |
| 398 | |
| 461 | 399 #if !(NGX_WIN32) |
| 400 case 'r': | |
| 401 i64 = (int64_t) va_arg(args, rlim_t); | |
| 402 sign = 1; | |
| 403 break; | |
| 404 #endif | |
| 405 | |
| 406 case 'p': | |
| 407 ui64 = (uintptr_t) va_arg(args, void *); | |
| 2293 | 408 hex = 2; |
| 461 | 409 sign = 0; |
| 410 zero = '0'; | |
| 613 | 411 width = NGX_PTR_SIZE * 2; |
| 461 | 412 break; |
| 413 | |
| 457 | 414 case 'c': |
| 461 | 415 d = va_arg(args, int); |
| 457 | 416 *buf++ = (u_char) (d & 0xff); |
| 417 fmt++; | |
| 418 | |
| 419 continue; | |
| 420 | |
| 461 | 421 case 'Z': |
| 422 *buf++ = '\0'; | |
| 423 fmt++; | |
| 424 | |
| 425 continue; | |
| 426 | |
| 525 | 427 case 'N': |
| 428 #if (NGX_WIN32) | |
| 429 *buf++ = CR; | |
| 430 #endif | |
| 431 *buf++ = LF; | |
| 432 fmt++; | |
| 433 | |
| 434 continue; | |
| 435 | |
| 455 | 436 case '%': |
| 437 *buf++ = '%'; | |
| 438 fmt++; | |
| 439 | |
| 440 continue; | |
| 441 | |
| 442 default: | |
| 443 *buf++ = *fmt++; | |
| 444 | |
| 445 continue; | |
| 446 } | |
| 447 | |
| 461 | 448 if (sign) { |
| 449 if (i64 < 0) { | |
| 450 *buf++ = '-'; | |
| 451 ui64 = (uint64_t) -i64; | |
| 452 | |
| 453 } else { | |
| 454 ui64 = (uint64_t) i64; | |
| 455 } | |
| 456 } | |
| 457 | |
| 2293 | 458 buf = ngx_sprintf_num(buf, last, ui64, zero, hex, width); |
| 455 | 459 |
| 460 fmt++; | |
| 461 | |
| 462 } else { | |
| 463 *buf++ = *fmt++; | |
| 464 } | |
| 465 } | |
| 466 | |
| 467 return buf; | |
| 468 } | |
| 469 | |
| 470 | |
| 2293 | 471 static u_char * |
| 472 ngx_sprintf_num(u_char *buf, u_char *last, uint64_t ui64, u_char zero, | |
| 473 ngx_uint_t hexadecimal, ngx_uint_t width) | |
| 474 { | |
| 475 u_char *p, temp[NGX_INT64_LEN + 1]; | |
| 476 /* | |
| 477 * we need temp[NGX_INT64_LEN] only, | |
| 478 * but icc issues the warning | |
| 479 */ | |
| 480 size_t len; | |
| 481 uint32_t ui32; | |
| 482 static u_char hex[] = "0123456789abcdef"; | |
| 483 static u_char HEX[] = "0123456789ABCDEF"; | |
| 484 | |
| 485 p = temp + NGX_INT64_LEN; | |
| 486 | |
| 487 if (hexadecimal == 0) { | |
| 488 | |
|
5358
670ceaba03d8
Win32: Open Watcom C compatibility fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4781
diff
changeset
|
489 if (ui64 <= (uint64_t) NGX_MAX_UINT32_VALUE) { |
| 2293 | 490 |
| 491 /* | |
| 492 * To divide 64-bit numbers and to find remainders | |
| 493 * on the x86 platform gcc and icc call the libc functions | |
| 494 * [u]divdi3() and [u]moddi3(), they call another function | |
| 495 * in its turn. On FreeBSD it is the qdivrem() function, | |
| 496 * its source code is about 170 lines of the code. | |
| 497 * The glibc counterpart is about 150 lines of the code. | |
| 498 * | |
| 499 * For 32-bit numbers and some divisors gcc and icc use | |
| 500 * a inlined multiplication and shifts. For example, | |
| 501 * unsigned "i32 / 10" is compiled to | |
| 502 * | |
| 503 * (i32 * 0xCCCCCCCD) >> 35 | |
| 504 */ | |
| 505 | |
| 506 ui32 = (uint32_t) ui64; | |
| 507 | |
| 508 do { | |
| 509 *--p = (u_char) (ui32 % 10 + '0'); | |
| 510 } while (ui32 /= 10); | |
| 511 | |
| 512 } else { | |
| 513 do { | |
| 514 *--p = (u_char) (ui64 % 10 + '0'); | |
| 515 } while (ui64 /= 10); | |
| 516 } | |
| 517 | |
| 518 } else if (hexadecimal == 1) { | |
| 519 | |
| 520 do { | |
| 521 | |
| 522 /* the "(uint32_t)" cast disables the BCC's warning */ | |
| 523 *--p = hex[(uint32_t) (ui64 & 0xf)]; | |
| 524 | |
| 525 } while (ui64 >>= 4); | |
| 526 | |
| 527 } else { /* hexadecimal == 2 */ | |
| 528 | |
| 529 do { | |
| 530 | |
| 531 /* the "(uint32_t)" cast disables the BCC's warning */ | |
| 532 *--p = HEX[(uint32_t) (ui64 & 0xf)]; | |
| 533 | |
| 534 } while (ui64 >>= 4); | |
| 535 } | |
| 536 | |
| 537 /* zero or space padding */ | |
| 538 | |
| 539 len = (temp + NGX_INT64_LEN) - p; | |
| 540 | |
| 541 while (len++ < width && buf < last) { | |
| 542 *buf++ = zero; | |
| 543 } | |
| 544 | |
| 545 /* number safe copy */ | |
| 546 | |
| 547 len = (temp + NGX_INT64_LEN) - p; | |
| 548 | |
| 549 if (buf + len > last) { | |
| 550 len = last - buf; | |
| 551 } | |
| 552 | |
| 553 return ngx_cpymem(buf, p, len); | |
| 554 } | |
| 555 | |
| 556 | |
|
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
557 /* |
| 1541 | 558 * We use ngx_strcasecmp()/ngx_strncasecmp() for 7-bit ASCII strings only, |
|
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
559 * and implement our own ngx_strcasecmp()/ngx_strncasecmp() |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
560 * to avoid libc locale overhead. Besides, we use the ngx_uint_t's |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
561 * instead of the u_char's, because they are slightly faster. |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
562 */ |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
563 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
564 ngx_int_t |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
565 ngx_strcasecmp(u_char *s1, u_char *s2) |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
566 { |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
567 ngx_uint_t c1, c2; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
568 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
569 for ( ;; ) { |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
570 c1 = (ngx_uint_t) *s1++; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
571 c2 = (ngx_uint_t) *s2++; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
572 |
| 3115 | 573 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1; |
| 574 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2; | |
|
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
575 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
576 if (c1 == c2) { |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
577 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
578 if (c1) { |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
579 continue; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
580 } |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
581 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
582 return 0; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
583 } |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
584 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
585 return c1 - c2; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
586 } |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
587 } |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
588 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
589 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
590 ngx_int_t |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
591 ngx_strncasecmp(u_char *s1, u_char *s2, size_t n) |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
592 { |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
593 ngx_uint_t c1, c2; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
594 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
595 while (n) { |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
596 c1 = (ngx_uint_t) *s1++; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
597 c2 = (ngx_uint_t) *s2++; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
598 |
| 3115 | 599 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1; |
| 600 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2; | |
|
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
601 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
602 if (c1 == c2) { |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
603 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
604 if (c1) { |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
605 n--; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
606 continue; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
607 } |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
608 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
609 return 0; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
610 } |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
611 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
612 return c1 - c2; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
613 } |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
614 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
615 return 0; |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
616 } |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
617 |
|
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1029
diff
changeset
|
618 |
| 1552 | 619 u_char * |
| 620 ngx_strnstr(u_char *s1, char *s2, size_t len) | |
| 621 { | |
| 622 u_char c1, c2; | |
| 623 size_t n; | |
| 624 | |
| 625 c2 = *(u_char *) s2++; | |
| 626 | |
| 627 n = ngx_strlen(s2); | |
| 628 | |
| 629 do { | |
| 630 do { | |
| 631 if (len-- == 0) { | |
| 632 return NULL; | |
| 633 } | |
| 634 | |
| 635 c1 = *s1++; | |
| 636 | |
| 637 if (c1 == 0) { | |
| 638 return NULL; | |
| 639 } | |
| 640 | |
| 641 } while (c1 != c2); | |
| 642 | |
| 643 if (n > len) { | |
| 644 return NULL; | |
| 645 } | |
| 646 | |
| 647 } while (ngx_strncmp(s1, (u_char *) s2, n) != 0); | |
| 648 | |
| 649 return --s1; | |
| 650 } | |
| 651 | |
| 652 | |
| 1550 | 653 /* |
| 654 * ngx_strstrn() and ngx_strcasestrn() are intended to search for static | |
| 655 * substring with known length in null-terminated string. The argument n | |
| 656 * must be length of the second substring - 1. | |
| 657 */ | |
| 658 | |
|
1542
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
659 u_char * |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
660 ngx_strstrn(u_char *s1, char *s2, size_t n) |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
661 { |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
662 u_char c1, c2; |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
663 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
664 c2 = *(u_char *) s2++; |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
665 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
666 do { |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
667 do { |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
668 c1 = *s1++; |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
669 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
670 if (c1 == 0) { |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
671 return NULL; |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
672 } |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
673 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
674 } while (c1 != c2); |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
675 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
676 } while (ngx_strncmp(s1, (u_char *) s2, n) != 0); |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
677 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
678 return --s1; |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
679 } |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
680 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
681 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
682 u_char * |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
683 ngx_strcasestrn(u_char *s1, char *s2, size_t n) |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
684 { |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
685 ngx_uint_t c1, c2; |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
686 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
687 c2 = (ngx_uint_t) *s2++; |
| 3115 | 688 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2; |
|
1542
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
689 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
690 do { |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
691 do { |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
692 c1 = (ngx_uint_t) *s1++; |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
693 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
694 if (c1 == 0) { |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
695 return NULL; |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
696 } |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
697 |
| 3115 | 698 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1; |
|
1542
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
699 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
700 } while (c1 != c2); |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
701 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
702 } while (ngx_strncasecmp(s1, (u_char *) s2, n) != 0); |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
703 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
704 return --s1; |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
705 } |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
706 |
|
f5bd1a7ed2cd
ngx_strstrn() and ngx_strcasestrn()
Igor Sysoev <igor@sysoev.ru>
parents:
1541
diff
changeset
|
707 |
| 2668 | 708 /* |
| 709 * ngx_strlcasestrn() is intended to search for static substring | |
| 710 * with known length in string until the argument last. The argument n | |
| 711 * must be length of the second substring - 1. | |
| 712 */ | |
| 713 | |
| 714 u_char * | |
| 715 ngx_strlcasestrn(u_char *s1, u_char *last, u_char *s2, size_t n) | |
| 716 { | |
| 717 ngx_uint_t c1, c2; | |
| 718 | |
| 719 c2 = (ngx_uint_t) *s2++; | |
| 3115 | 720 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2; |
| 2668 | 721 last -= n; |
| 722 | |
| 723 do { | |
| 724 do { | |
|
2680
82e3946062be
backout r2677 and fix ngx_strlcasestrn() again
Igor Sysoev <igor@sysoev.ru>
parents:
2676
diff
changeset
|
725 if (s1 >= last) { |
| 2668 | 726 return NULL; |
| 727 } | |
| 728 | |
| 729 c1 = (ngx_uint_t) *s1++; | |
| 730 | |
| 3115 | 731 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1; |
| 2668 | 732 |
| 733 } while (c1 != c2); | |
| 734 | |
| 735 } while (ngx_strncasecmp(s1, s2, n) != 0); | |
| 736 | |
| 737 return --s1; | |
| 738 } | |
| 739 | |
| 740 | |
| 493 | 741 ngx_int_t |
| 742 ngx_rstrncmp(u_char *s1, u_char *s2, size_t n) | |
|
84
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
743 { |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
744 if (n == 0) { |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
745 return 0; |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
746 } |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
747 |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
748 n--; |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
749 |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
750 for ( ;; ) { |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
751 if (s1[n] != s2[n]) { |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
176
diff
changeset
|
752 return s1[n] - s2[n]; |
|
84
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
753 } |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
754 |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
755 if (n == 0) { |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
756 return 0; |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
757 } |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
758 |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
759 n--; |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
760 } |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
761 } |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
762 |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
763 |
| 493 | 764 ngx_int_t |
| 765 ngx_rstrncasecmp(u_char *s1, u_char *s2, size_t n) | |
| 455 | 766 { |
| 767 u_char c1, c2; | |
| 768 | |
| 769 if (n == 0) { | |
| 770 return 0; | |
| 771 } | |
| 772 | |
| 773 n--; | |
| 774 | |
| 775 for ( ;; ) { | |
| 776 c1 = s1[n]; | |
| 777 if (c1 >= 'a' && c1 <= 'z') { | |
| 778 c1 -= 'a' - 'A'; | |
| 779 } | |
| 780 | |
| 781 c2 = s2[n]; | |
| 782 if (c2 >= 'a' && c2 <= 'z') { | |
| 783 c2 -= 'a' - 'A'; | |
| 784 } | |
| 785 | |
| 786 if (c1 != c2) { | |
| 787 return c1 - c2; | |
| 788 } | |
| 789 | |
| 790 if (n == 0) { | |
| 791 return 0; | |
| 792 } | |
| 793 | |
| 794 n--; | |
| 795 } | |
| 796 } | |
| 797 | |
| 798 | |
| 493 | 799 ngx_int_t |
|
1029
ce08bc4cb97b
ngx_strn2cmp() > ngx_memn2cmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1024
diff
changeset
|
800 ngx_memn2cmp(u_char *s1, u_char *s2, size_t n1, size_t n2) |
| 1024 | 801 { |
| 802 size_t n; | |
| 803 ngx_int_t m, z; | |
| 804 | |
| 805 if (n1 <= n2) { | |
| 806 n = n1; | |
| 807 z = -1; | |
| 808 | |
| 809 } else { | |
| 810 n = n2; | |
| 811 z = 1; | |
| 812 } | |
| 813 | |
|
1029
ce08bc4cb97b
ngx_strn2cmp() > ngx_memn2cmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1024
diff
changeset
|
814 m = ngx_memcmp(s1, s2, n); |
| 1024 | 815 |
| 816 if (m || n1 == n2) { | |
| 817 return m; | |
| 818 } | |
| 819 | |
| 820 return z; | |
| 821 } | |
| 822 | |
| 823 | |
| 824 ngx_int_t | |
|
3116
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
825 ngx_dns_strcmp(u_char *s1, u_char *s2) |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
826 { |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
827 ngx_uint_t c1, c2; |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
828 |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
829 for ( ;; ) { |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
830 c1 = (ngx_uint_t) *s1++; |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
831 c2 = (ngx_uint_t) *s2++; |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
832 |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
833 c1 = (c1 >= 'A' && c1 <= 'Z') ? (c1 | 0x20) : c1; |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
834 c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2; |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
835 |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
836 if (c1 == c2) { |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
837 |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
838 if (c1) { |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
839 continue; |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
840 } |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
841 |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
842 return 0; |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
843 } |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
844 |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
845 /* in ASCII '.' > '-', but we need '.' to be the lowest character */ |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
846 |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
847 c1 = (c1 == '.') ? ' ' : c1; |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
848 c2 = (c2 == '.') ? ' ' : c2; |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
849 |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
850 return c1 - c2; |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
851 } |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
852 } |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
853 |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
854 |
|
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
855 ngx_int_t |
|
5389
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
856 ngx_filename_cmp(u_char *s1, u_char *s2, size_t n) |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
857 { |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
858 ngx_uint_t c1, c2; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
859 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
860 while (n) { |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
861 c1 = (ngx_uint_t) *s1++; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
862 c2 = (ngx_uint_t) *s2++; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
863 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
864 #if (NGX_HAVE_CASELESS_FILESYSTEM) |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
865 c1 = tolower(c1); |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
866 c2 = tolower(c2); |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
867 #endif |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
868 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
869 if (c1 == c2) { |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
870 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
871 if (c1) { |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
872 n--; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
873 continue; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
874 } |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
875 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
876 return 0; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
877 } |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
878 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
879 /* we need '/' to be the lowest character */ |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
880 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
881 if (c1 == 0 || c2 == 0) { |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
882 return c1 - c2; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
883 } |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
884 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
885 c1 = (c1 == '/') ? 0 : c1; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
886 c2 = (c2 == '/') ? 0 : c2; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
887 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
888 return c1 - c2; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
889 } |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
890 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
891 return 0; |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
892 } |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
893 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
894 |
|
72e31d88defa
Added ngx_filename_cmp() with "/" sorted to the left.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
895 ngx_int_t |
| 493 | 896 ngx_atoi(u_char *line, size_t n) |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
897 { |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
176
diff
changeset
|
898 ngx_int_t value; |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
899 |
|
84
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
900 if (n == 0) { |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
901 return NGX_ERROR; |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
902 } |
|
fab4cb00fe5b
nginx-0.0.1-2003-05-06-21:03:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
903 |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
904 for (value = 0; n--; line++) { |
|
83
a7e45c45a95c
nginx-0.0.1-2003-04-28-19:06:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
905 if (*line < '0' || *line > '9') { |
|
a7e45c45a95c
nginx-0.0.1-2003-04-28-19:06:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
906 return NGX_ERROR; |
|
a7e45c45a95c
nginx-0.0.1-2003-04-28-19:06:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
907 } |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
908 |
|
83
a7e45c45a95c
nginx-0.0.1-2003-04-28-19:06:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
909 value = value * 10 + (*line - '0'); |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
910 } |
|
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
911 |
|
83
a7e45c45a95c
nginx-0.0.1-2003-04-28-19:06:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
912 if (value < 0) { |
|
a7e45c45a95c
nginx-0.0.1-2003-04-28-19:06:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
913 return NGX_ERROR; |
|
338
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
914 |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
915 } else { |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
916 return value; |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
917 } |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
918 } |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
919 |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
920 |
| 3512 | 921 /* parse a fixed point number, e.g., ngx_atofp("10.5", 4, 2) returns 1050 */ |
| 922 | |
| 923 ngx_int_t | |
| 924 ngx_atofp(u_char *line, size_t n, size_t point) | |
| 925 { | |
| 926 ngx_int_t value; | |
| 927 ngx_uint_t dot; | |
| 928 | |
| 929 if (n == 0) { | |
| 930 return NGX_ERROR; | |
| 931 } | |
| 932 | |
| 933 dot = 0; | |
| 934 | |
| 935 for (value = 0; n--; line++) { | |
| 936 | |
| 937 if (point == 0) { | |
| 938 return NGX_ERROR; | |
| 939 } | |
| 940 | |
| 941 if (*line == '.') { | |
| 942 if (dot) { | |
| 943 return NGX_ERROR; | |
| 944 } | |
| 945 | |
| 946 dot = 1; | |
| 947 continue; | |
| 948 } | |
| 949 | |
| 950 if (*line < '0' || *line > '9') { | |
| 951 return NGX_ERROR; | |
| 952 } | |
| 953 | |
| 954 value = value * 10 + (*line - '0'); | |
| 955 point -= dot; | |
| 956 } | |
| 957 | |
| 958 while (point--) { | |
| 959 value = value * 10; | |
| 960 } | |
| 961 | |
| 962 if (value < 0) { | |
| 963 return NGX_ERROR; | |
| 964 | |
| 965 } else { | |
| 966 return value; | |
| 967 } | |
| 968 } | |
| 969 | |
| 970 | |
| 501 | 971 ssize_t |
| 972 ngx_atosz(u_char *line, size_t n) | |
| 973 { | |
| 974 ssize_t value; | |
| 975 | |
| 976 if (n == 0) { | |
| 977 return NGX_ERROR; | |
| 978 } | |
| 979 | |
| 980 for (value = 0; n--; line++) { | |
| 981 if (*line < '0' || *line > '9') { | |
| 982 return NGX_ERROR; | |
| 983 } | |
| 984 | |
| 985 value = value * 10 + (*line - '0'); | |
| 986 } | |
| 987 | |
| 988 if (value < 0) { | |
| 989 return NGX_ERROR; | |
| 990 | |
| 991 } else { | |
| 992 return value; | |
| 993 } | |
| 994 } | |
| 995 | |
| 996 | |
| 997 off_t | |
| 998 ngx_atoof(u_char *line, size_t n) | |
| 999 { | |
| 1000 off_t value; | |
| 1001 | |
| 1002 if (n == 0) { | |
| 1003 return NGX_ERROR; | |
| 1004 } | |
| 1005 | |
| 1006 for (value = 0; n--; line++) { | |
| 1007 if (*line < '0' || *line > '9') { | |
| 1008 return NGX_ERROR; | |
| 1009 } | |
| 1010 | |
| 1011 value = value * 10 + (*line - '0'); | |
| 1012 } | |
| 1013 | |
| 1014 if (value < 0) { | |
| 1015 return NGX_ERROR; | |
| 1016 | |
| 1017 } else { | |
| 1018 return value; | |
| 1019 } | |
| 1020 } | |
| 1021 | |
| 1022 | |
| 1023 time_t | |
| 1024 ngx_atotm(u_char *line, size_t n) | |
| 1025 { | |
| 1026 time_t value; | |
| 1027 | |
| 1028 if (n == 0) { | |
| 1029 return NGX_ERROR; | |
| 1030 } | |
| 1031 | |
| 1032 for (value = 0; n--; line++) { | |
| 1033 if (*line < '0' || *line > '9') { | |
| 1034 return NGX_ERROR; | |
| 1035 } | |
| 1036 | |
| 1037 value = value * 10 + (*line - '0'); | |
| 1038 } | |
| 1039 | |
| 1040 if (value < 0) { | |
| 1041 return NGX_ERROR; | |
| 1042 | |
| 1043 } else { | |
| 1044 return value; | |
| 1045 } | |
| 1046 } | |
| 1047 | |
| 1048 | |
| 493 | 1049 ngx_int_t |
| 1050 ngx_hextoi(u_char *line, size_t n) | |
|
338
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1051 { |
| 783 | 1052 u_char c, ch; |
|
338
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1053 ngx_int_t value; |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1054 |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1055 if (n == 0) { |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1056 return NGX_ERROR; |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1057 } |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1058 |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1059 for (value = 0; n--; line++) { |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1060 ch = *line; |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1061 |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1062 if (ch >= '0' && ch <= '9') { |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1063 value = value * 16 + (ch - '0'); |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1064 continue; |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1065 } |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1066 |
| 783 | 1067 c = (u_char) (ch | 0x20); |
|
338
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1068 |
| 783 | 1069 if (c >= 'a' && c <= 'f') { |
| 1070 value = value * 16 + (c - 'a' + 10); | |
|
338
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1071 continue; |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1072 } |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1073 |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1074 return NGX_ERROR; |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1075 } |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1076 |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1077 if (value < 0) { |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1078 return NGX_ERROR; |
|
0376cffa29e6
nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
1079 |
|
83
a7e45c45a95c
nginx-0.0.1-2003-04-28-19:06:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
1080 } else { |
|
a7e45c45a95c
nginx-0.0.1-2003-04-28-19:06:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
1081 return value; |
|
a7e45c45a95c
nginx-0.0.1-2003-04-28-19:06:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
1082 } |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1083 } |
|
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1084 |
|
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1085 |
|
1745
ec63069aeb78
replace ngx_md5_text() with ngx_hex_dump()
Igor Sysoev <igor@sysoev.ru>
parents:
1629
diff
changeset
|
1086 u_char * |
|
ec63069aeb78
replace ngx_md5_text() with ngx_hex_dump()
Igor Sysoev <igor@sysoev.ru>
parents:
1629
diff
changeset
|
1087 ngx_hex_dump(u_char *dst, u_char *src, size_t len) |
|
174
ea464a6c0581
nginx-0.0.1-2003-11-05-01:12:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
100
diff
changeset
|
1088 { |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
176
diff
changeset
|
1089 static u_char hex[] = "0123456789abcdef"; |
|
175
e92c2c647c57
nginx-0.0.1-2003-11-05-20:03:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
174
diff
changeset
|
1090 |
|
1745
ec63069aeb78
replace ngx_md5_text() with ngx_hex_dump()
Igor Sysoev <igor@sysoev.ru>
parents:
1629
diff
changeset
|
1091 while (len--) { |
|
ec63069aeb78
replace ngx_md5_text() with ngx_hex_dump()
Igor Sysoev <igor@sysoev.ru>
parents:
1629
diff
changeset
|
1092 *dst++ = hex[*src >> 4]; |
|
ec63069aeb78
replace ngx_md5_text() with ngx_hex_dump()
Igor Sysoev <igor@sysoev.ru>
parents:
1629
diff
changeset
|
1093 *dst++ = hex[*src++ & 0xf]; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
175
diff
changeset
|
1094 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
175
diff
changeset
|
1095 |
|
1745
ec63069aeb78
replace ngx_md5_text() with ngx_hex_dump()
Igor Sysoev <igor@sysoev.ru>
parents:
1629
diff
changeset
|
1096 return dst; |
|
174
ea464a6c0581
nginx-0.0.1-2003-11-05-01:12:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
100
diff
changeset
|
1097 } |
|
ea464a6c0581
nginx-0.0.1-2003-11-05-01:12:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
100
diff
changeset
|
1098 |
|
ea464a6c0581
nginx-0.0.1-2003-11-05-01:12:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
100
diff
changeset
|
1099 |
| 493 | 1100 void |
| 1101 ngx_encode_base64(ngx_str_t *dst, ngx_str_t *src) | |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1102 { |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1103 u_char *d, *s; |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1104 size_t len; |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1105 static u_char basis64[] = |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1106 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1107 |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
408
diff
changeset
|
1108 len = src->len; |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1109 s = src->data; |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
408
diff
changeset
|
1110 d = dst->data; |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1111 |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1112 while (len > 2) { |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1113 *d++ = basis64[(s[0] >> 2) & 0x3f]; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1114 *d++ = basis64[((s[0] & 3) << 4) | (s[1] >> 4)]; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1115 *d++ = basis64[((s[1] & 0x0f) << 2) | (s[2] >> 6)]; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1116 *d++ = basis64[s[2] & 0x3f]; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1117 |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1118 s += 3; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1119 len -= 3; |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1120 } |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1121 |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1122 if (len) { |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1123 *d++ = basis64[(s[0] >> 2) & 0x3f]; |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1124 |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1125 if (len == 1) { |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1126 *d++ = basis64[(s[0] & 3) << 4]; |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1127 *d++ = '='; |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1128 |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1129 } else { |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1130 *d++ = basis64[((s[0] & 3) << 4) | (s[1] >> 4)]; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1131 *d++ = basis64[(s[1] & 0x0f) << 2]; |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1132 } |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1133 |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1134 *d++ = '='; |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1135 } |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1136 |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1137 dst->len = d - dst->data; |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1138 } |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1139 |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1140 |
| 493 | 1141 ngx_int_t |
| 1142 ngx_decode_base64(ngx_str_t *dst, ngx_str_t *src) | |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1143 { |
| 827 | 1144 static u_char basis64[] = { |
| 1145 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, | |
| 1146 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, | |
| 1147 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 62, 77, 77, 77, 63, | |
| 1148 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 77, 77, 77, 77, 77, 77, | |
| 1149 77, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, | |
| 1150 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 77, 77, 77, 77, 77, | |
| 1151 77, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, | |
| 1152 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 77, 77, 77, 77, 77, | |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1153 |
| 827 | 1154 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, |
| 1155 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, | |
| 1156 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, | |
| 1157 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, | |
| 1158 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, | |
| 1159 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, | |
| 1160 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, | |
| 1161 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77 | |
| 1162 }; | |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1163 |
|
3756
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1164 return ngx_decode_base64_internal(dst, src, basis64); |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1165 } |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1166 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1167 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1168 ngx_int_t |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1169 ngx_decode_base64url(ngx_str_t *dst, ngx_str_t *src) |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1170 { |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1171 static u_char basis64[] = { |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1172 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1173 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1174 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 62, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1175 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 77, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1176 77, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1177 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 77, 77, 77, 77, 63, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1178 77, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1179 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1180 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1181 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1182 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1183 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1184 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1185 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1186 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1187 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1188 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1189 }; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1190 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1191 return ngx_decode_base64_internal(dst, src, basis64); |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1192 } |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1193 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1194 |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1195 static ngx_int_t |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1196 ngx_decode_base64_internal(ngx_str_t *dst, ngx_str_t *src, const u_char *basis) |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1197 { |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1198 size_t len; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1199 u_char *d, *s; |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1200 |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1201 for (len = 0; len < src->len; len++) { |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1202 if (src->data[len] == '=') { |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1203 break; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1204 } |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1205 |
|
3756
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1206 if (basis[src->data[len]] == 77) { |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1207 return NGX_ERROR; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1208 } |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1209 } |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1210 |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1211 if (len % 4 == 1) { |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1212 return NGX_ERROR; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1213 } |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1214 |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1215 s = src->data; |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
408
diff
changeset
|
1216 d = dst->data; |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1217 |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1218 while (len > 3) { |
|
3756
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1219 *d++ = (u_char) (basis[s[0]] << 2 | basis[s[1]] >> 4); |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1220 *d++ = (u_char) (basis[s[1]] << 4 | basis[s[2]] >> 2); |
|
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1221 *d++ = (u_char) (basis[s[2]] << 6 | basis[s[3]]); |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1222 |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1223 s += 4; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1224 len -= 4; |
|
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1225 } |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1226 |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1227 if (len > 1) { |
|
3756
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1228 *d++ = (u_char) (basis[s[0]] << 2 | basis[s[1]] >> 4); |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1229 } |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1230 |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1231 if (len > 2) { |
|
3756
7224d008faaf
new ngx_http_secure_link_module with secure_link, secure_link_md5, and
Igor Sysoev <igor@sysoev.ru>
parents:
3725
diff
changeset
|
1232 *d++ = (u_char) (basis[s[1]] << 4 | basis[s[2]] >> 2); |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1233 } |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1234 |
|
408
d6e2b445c1b8
nginx-0.0.10-2004-08-27-19:40:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
404
diff
changeset
|
1235 dst->len = d - dst->data; |
|
404
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1236 |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1237 return NGX_OK; |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1238 } |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1239 |
|
37b5381fb6d8
nginx-0.0.9-2004-07-30-21:05:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
339
diff
changeset
|
1240 |
| 657 | 1241 /* |
|
2125
8e4b9d2acde8
rename ngx_utf_...() to ngx_utf8_...()
Igor Sysoev <igor@sysoev.ru>
parents:
2120
diff
changeset
|
1242 * ngx_utf8_decode() decodes two and more bytes UTF sequences only |
| 657 | 1243 * the return values: |
| 1244 * 0x80 - 0x10ffff valid character | |
| 2120 | 1245 * 0x110000 - 0xfffffffd invalid sequence |
| 657 | 1246 * 0xfffffffe incomplete sequence |
| 1247 * 0xffffffff error | |
| 1248 */ | |
| 1249 | |
| 1250 uint32_t | |
|
2125
8e4b9d2acde8
rename ngx_utf_...() to ngx_utf8_...()
Igor Sysoev <igor@sysoev.ru>
parents:
2120
diff
changeset
|
1251 ngx_utf8_decode(u_char **p, size_t n) |
| 657 | 1252 { |
| 1253 size_t len; | |
| 1254 uint32_t u, i, valid; | |
| 1255 | |
| 1256 u = **p; | |
| 1257 | |
|
4209
9679fc14c063
Fixed utf8 decode (ticket #25).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4192
diff
changeset
|
1258 if (u >= 0xf0) { |
| 657 | 1259 |
| 1260 u &= 0x07; | |
| 1261 valid = 0xffff; | |
| 1262 len = 3; | |
| 1263 | |
|
4209
9679fc14c063
Fixed utf8 decode (ticket #25).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4192
diff
changeset
|
1264 } else if (u >= 0xe0) { |
| 657 | 1265 |
| 1266 u &= 0x0f; | |
| 1267 valid = 0x7ff; | |
| 1268 len = 2; | |
| 1269 | |
|
4209
9679fc14c063
Fixed utf8 decode (ticket #25).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4192
diff
changeset
|
1270 } else if (u >= 0xc2) { |
| 657 | 1271 |
| 1272 u &= 0x1f; | |
| 1273 valid = 0x7f; | |
| 1274 len = 1; | |
| 1275 | |
| 1276 } else { | |
| 1277 (*p)++; | |
| 1278 return 0xffffffff; | |
| 1279 } | |
| 1280 | |
| 1281 if (n - 1 < len) { | |
| 1282 return 0xfffffffe; | |
| 1283 } | |
| 1284 | |
| 1285 (*p)++; | |
| 1286 | |
| 1287 while (len) { | |
| 1288 i = *(*p)++; | |
| 1289 | |
| 1290 if (i < 0x80) { | |
| 1291 return 0xffffffff; | |
| 1292 } | |
| 1293 | |
| 1294 u = (u << 6) | (i & 0x3f); | |
| 1295 | |
| 1296 len--; | |
| 1297 } | |
| 1298 | |
| 1299 if (u > valid) { | |
| 1300 return u; | |
| 1301 } | |
| 1302 | |
| 1303 return 0xffffffff; | |
| 1304 } | |
| 1305 | |
| 1306 | |
| 523 | 1307 size_t |
|
2125
8e4b9d2acde8
rename ngx_utf_...() to ngx_utf8_...()
Igor Sysoev <igor@sysoev.ru>
parents:
2120
diff
changeset
|
1308 ngx_utf8_length(u_char *p, size_t n) |
| 523 | 1309 { |
| 2120 | 1310 u_char c, *last; |
| 1311 size_t len; | |
| 523 | 1312 |
| 2120 | 1313 last = p + n; |
| 523 | 1314 |
| 2120 | 1315 for (len = 0; p < last; len++) { |
| 1316 | |
| 1317 c = *p; | |
| 523 | 1318 |
| 1319 if (c < 0x80) { | |
| 2120 | 1320 p++; |
| 523 | 1321 continue; |
| 1322 } | |
| 1323 | |
|
2125
8e4b9d2acde8
rename ngx_utf_...() to ngx_utf8_...()
Igor Sysoev <igor@sysoev.ru>
parents:
2120
diff
changeset
|
1324 if (ngx_utf8_decode(&p, n) > 0x10ffff) { |
|
8e4b9d2acde8
rename ngx_utf_...() to ngx_utf8_...()
Igor Sysoev <igor@sysoev.ru>
parents:
2120
diff
changeset
|
1325 /* invalid UTF-8 */ |
| 2120 | 1326 return n; |
| 523 | 1327 } |
| 1328 } | |
| 1329 | |
| 1330 return len; | |
| 1331 } | |
| 1332 | |
| 1333 | |
| 527 | 1334 u_char * |
|
2125
8e4b9d2acde8
rename ngx_utf_...() to ngx_utf8_...()
Igor Sysoev <igor@sysoev.ru>
parents:
2120
diff
changeset
|
1335 ngx_utf8_cpystrn(u_char *dst, u_char *src, size_t n, size_t len) |
| 527 | 1336 { |
| 2120 | 1337 u_char c, *next; |
| 527 | 1338 |
| 1339 if (n == 0) { | |
| 1340 return dst; | |
| 1341 } | |
| 1342 | |
| 2120 | 1343 while (--n) { |
| 527 | 1344 |
| 1345 c = *src; | |
| 1346 *dst = c; | |
| 1347 | |
| 1348 if (c < 0x80) { | |
| 2120 | 1349 |
| 1350 if (c != '\0') { | |
| 1351 dst++; | |
| 1352 src++; | |
| 1353 len--; | |
| 1354 | |
| 527 | 1355 continue; |
| 1356 } | |
| 1357 | |
| 1358 return dst; | |
| 1359 } | |
| 1360 | |
| 2120 | 1361 next = src; |
| 527 | 1362 |
|
2125
8e4b9d2acde8
rename ngx_utf_...() to ngx_utf8_...()
Igor Sysoev <igor@sysoev.ru>
parents:
2120
diff
changeset
|
1363 if (ngx_utf8_decode(&next, len) > 0x10ffff) { |
|
8e4b9d2acde8
rename ngx_utf_...() to ngx_utf8_...()
Igor Sysoev <igor@sysoev.ru>
parents:
2120
diff
changeset
|
1364 /* invalid UTF-8 */ |
| 2120 | 1365 break; |
| 527 | 1366 } |
| 1367 | |
| 2120 | 1368 while (src < next) { |
|
3410
bfcc9be4f1c9
fix ngx_utf8_cpystrn(): it did not fully copy utf-8 string
Igor Sysoev <igor@sysoev.ru>
parents:
3275
diff
changeset
|
1369 *dst++ = *src++; |
| 2120 | 1370 len--; |
| 1371 } | |
| 527 | 1372 } |
| 1373 | |
| 1374 *dst = '\0'; | |
| 1375 | |
| 1376 return dst; | |
| 1377 } | |
| 1378 | |
| 1379 | |
| 493 | 1380 uintptr_t |
| 1381 ngx_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type) | |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1382 { |
| 3275 | 1383 ngx_uint_t n; |
| 827 | 1384 uint32_t *escape; |
| 1385 static u_char hex[] = "0123456789abcdef"; | |
| 461 | 1386 |
| 827 | 1387 /* " ", "#", "%", "?", %00-%1F, %7F-%FF */ |
| 485 | 1388 |
| 827 | 1389 static uint32_t uri[] = { |
| 1390 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1391 |
| 827 | 1392 /* ?>=< ;:98 7654 3210 /.-, +*)( '&%$ #"! */ |
| 1393 0x80000029, /* 1000 0000 0000 0000 0000 0000 0010 1001 */ | |
| 1394 | |
| 1395 /* _^]\ [ZYX WVUT SRQP ONML KJIH GFED CBA@ */ | |
| 1396 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ | |
| 452 | 1397 |
| 827 | 1398 /* ~}| {zyx wvut srqp onml kjih gfed cba` */ |
| 1399 0x80000000, /* 1000 0000 0000 0000 0000 0000 0000 0000 */ | |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1400 |
| 827 | 1401 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
| 1402 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 1403 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 1404 0xffffffff /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 1405 }; | |
| 452 | 1406 |
|
3486
5d28d30ba1b1
escape ampersand in argument while rewrite
Igor Sysoev <igor@sysoev.ru>
parents:
3410
diff
changeset
|
1407 /* " ", "#", "%", "&", "+", "?", %00-%1F, %7F-%FF */ |
| 485 | 1408 |
| 827 | 1409 static uint32_t args[] = { |
| 1410 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 1411 | |
| 1412 /* ?>=< ;:98 7654 3210 /.-, +*)( '&%$ #"! */ | |
| 3725 | 1413 0x88000869, /* 1000 1000 0000 0000 0000 1000 0110 1001 */ |
| 485 | 1414 |
| 827 | 1415 /* _^]\ [ZYX WVUT SRQP ONML KJIH GFED CBA@ */ |
| 1416 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ | |
| 485 | 1417 |
| 827 | 1418 /* ~}| {zyx wvut srqp onml kjih gfed cba` */ |
| 1419 0x80000000, /* 1000 0000 0000 0000 0000 0000 0000 0000 */ | |
| 485 | 1420 |
| 827 | 1421 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
| 1422 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 1423 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 1424 0xffffffff /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 1425 }; | |
| 485 | 1426 |
|
4192
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1427 /* not ALPHA, DIGIT, "-", ".", "_", "~" */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1428 |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1429 static uint32_t uri_component[] = { |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1430 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1431 |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1432 /* ?>=< ;:98 7654 3210 /.-, +*)( '&%$ #"! */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1433 0xfc009fff, /* 1111 1100 0000 0000 1001 1111 1111 1111 */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1434 |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1435 /* _^]\ [ZYX WVUT SRQP ONML KJIH GFED CBA@ */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1436 0x78000001, /* 0111 1000 0000 0000 0000 0000 0000 0001 */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1437 |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1438 /* ~}| {zyx wvut srqp onml kjih gfed cba` */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1439 0xb8000001, /* 1011 1000 0000 0000 0000 0000 0000 0001 */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1440 |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1441 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1442 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1443 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1444 0xffffffff /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1445 }; |
|
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1446 |
|
1405
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1333
diff
changeset
|
1447 /* " ", "#", """, "%", "'", %00-%1F, %7F-%FF */ |
| 485 | 1448 |
| 827 | 1449 static uint32_t html[] = { |
| 1450 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 461 | 1451 |
| 827 | 1452 /* ?>=< ;:98 7654 3210 /.-, +*)( '&%$ #"! */ |
| 1297 | 1453 0x000000ad, /* 0000 0000 0000 0000 0000 0000 1010 1101 */ |
| 827 | 1454 |
| 1455 /* _^]\ [ZYX WVUT SRQP ONML KJIH GFED CBA@ */ | |
| 1456 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ | |
| 461 | 1457 |
| 827 | 1458 /* ~}| {zyx wvut srqp onml kjih gfed cba` */ |
| 1459 0x80000000, /* 1000 0000 0000 0000 0000 0000 0000 0000 */ | |
| 461 | 1460 |
| 827 | 1461 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
| 1462 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 1463 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 1464 0xffffffff /* 1111 1111 1111 1111 1111 1111 1111 1111 */ | |
| 1465 }; | |
| 461 | 1466 |
|
1405
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1333
diff
changeset
|
1467 /* " ", """, "%", "'", %00-%1F, %7F-%FF */ |
| 461 | 1468 |
|
1298
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1469 static uint32_t refresh[] = { |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1470 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1471 |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1472 /* ?>=< ;:98 7654 3210 /.-, +*)( '&%$ #"! */ |
|
1629
12a656452ad1
do not encode already encoded characters in msie_refresh
Igor Sysoev <igor@sysoev.ru>
parents:
1593
diff
changeset
|
1473 0x00000085, /* 0000 0000 0000 0000 0000 0000 1000 0101 */ |
|
1298
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1474 |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1475 /* _^]\ [ZYX WVUT SRQP ONML KJIH GFED CBA@ */ |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1476 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1477 |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1478 /* ~}| {zyx wvut srqp onml kjih gfed cba` */ |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1479 0x80000000, /* 1000 0000 0000 0000 0000 0000 0000 0000 */ |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1480 |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1481 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1482 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1483 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1484 0xffffffff /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1485 }; |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1486 |
|
1405
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1333
diff
changeset
|
1487 /* " ", "%", %00-%1F */ |
|
1333
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1488 |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1489 static uint32_t memcached[] = { |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1490 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1491 |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1492 /* ?>=< ;:98 7654 3210 /.-, +*)( '&%$ #"! */ |
|
1405
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1333
diff
changeset
|
1493 0x00000021, /* 0000 0000 0000 0000 0000 0000 0010 0001 */ |
|
1333
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1494 |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1495 /* _^]\ [ZYX WVUT SRQP ONML KJIH GFED CBA@ */ |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1496 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1497 |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1498 /* ~}| {zyx wvut srqp onml kjih gfed cba` */ |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1499 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1500 |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1501 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1502 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1503 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1504 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1505 }; |
|
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1310
diff
changeset
|
1506 |
|
1405
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1333
diff
changeset
|
1507 /* mail_auth is the same as memcached */ |
|
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1333
diff
changeset
|
1508 |
|
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1333
diff
changeset
|
1509 static uint32_t *map[] = |
|
4192
61e4af19df9f
Autoindex: escape '?' in file names.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
1510 { uri, args, uri_component, html, refresh, memcached, memcached }; |
|
1298
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1511 |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1512 |
|
458e041fc902
msie_refresh should escape at least '"' to prevent XSS
Igor Sysoev <igor@sysoev.ru>
parents:
1297
diff
changeset
|
1513 escape = map[type]; |
| 461 | 1514 |
| 452 | 1515 if (dst == NULL) { |
| 1516 | |
| 1517 /* find the number of the characters to be escaped */ | |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1518 |
| 3115 | 1519 n = 0; |
| 452 | 1520 |
| 3275 | 1521 while (size) { |
| 452 | 1522 if (escape[*src >> 5] & (1 << (*src & 0x1f))) { |
| 1523 n++; | |
| 1524 } | |
| 1525 src++; | |
| 3275 | 1526 size--; |
| 452 | 1527 } |
| 1528 | |
| 485 | 1529 return (uintptr_t) n; |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1530 } |
|
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1531 |
| 3275 | 1532 while (size) { |
| 452 | 1533 if (escape[*src >> 5] & (1 << (*src & 0x1f))) { |
| 1534 *dst++ = '%'; | |
| 1535 *dst++ = hex[*src >> 4]; | |
| 1536 *dst++ = hex[*src & 0xf]; | |
| 1537 src++; | |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1538 |
| 452 | 1539 } else { |
| 1540 *dst++ = *src++; | |
| 1541 } | |
| 3275 | 1542 size--; |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1543 } |
|
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1544 |
| 485 | 1545 return (uintptr_t) dst; |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
0
diff
changeset
|
1546 } |
| 577 | 1547 |
| 1548 | |
| 1549 void | |
| 601 | 1550 ngx_unescape_uri(u_char **dst, u_char **src, size_t size, ngx_uint_t type) |
| 577 | 1551 { |
| 1552 u_char *d, *s, ch, c, decoded; | |
| 1553 enum { | |
| 1554 sw_usual = 0, | |
| 1555 sw_quoted, | |
| 1556 sw_quoted_second | |
| 1557 } state; | |
| 1558 | |
| 1559 d = *dst; | |
| 1560 s = *src; | |
| 1561 | |
| 1562 state = 0; | |
| 1563 decoded = 0; | |
| 1564 | |
| 1565 while (size--) { | |
| 1566 | |
| 1567 ch = *s++; | |
| 1568 | |
| 1569 switch (state) { | |
| 1570 case sw_usual: | |
| 1593 | 1571 if (ch == '?' |
| 1572 && (type & (NGX_UNESCAPE_URI|NGX_UNESCAPE_REDIRECT))) | |
| 1573 { | |
| 577 | 1574 *d++ = ch; |
| 1575 goto done; | |
| 1576 } | |
| 1577 | |
| 1578 if (ch == '%') { | |
| 1579 state = sw_quoted; | |
| 1580 break; | |
| 1581 } | |
| 1582 | |
| 1583 *d++ = ch; | |
| 1584 break; | |
| 1585 | |
| 1586 case sw_quoted: | |
| 1587 | |
| 1588 if (ch >= '0' && ch <= '9') { | |
| 1589 decoded = (u_char) (ch - '0'); | |
| 1590 state = sw_quoted_second; | |
| 1591 break; | |
| 1592 } | |
| 1593 | |
| 1594 c = (u_char) (ch | 0x20); | |
| 1595 if (c >= 'a' && c <= 'f') { | |
| 1596 decoded = (u_char) (c - 'a' + 10); | |
| 1597 state = sw_quoted_second; | |
| 1598 break; | |
| 1599 } | |
| 1600 | |
| 589 | 1601 /* the invalid quoted character */ |
| 577 | 1602 |
| 589 | 1603 state = sw_usual; |
| 1604 | |
| 1605 *d++ = ch; | |
| 577 | 1606 |
| 1607 break; | |
| 1608 | |
| 1609 case sw_quoted_second: | |
| 1610 | |
| 589 | 1611 state = sw_usual; |
| 1612 | |
| 577 | 1613 if (ch >= '0' && ch <= '9') { |
| 1614 ch = (u_char) ((decoded << 4) + ch - '0'); | |
| 1615 | |
| 1593 | 1616 if (type & NGX_UNESCAPE_REDIRECT) { |
| 601 | 1617 if (ch > '%' && ch < 0x7f) { |
| 1618 *d++ = ch; | |
| 1619 break; | |
| 1620 } | |
| 1621 | |
| 1622 *d++ = '%'; *d++ = *(s - 2); *d++ = *(s - 1); | |
| 1623 | |
| 577 | 1624 break; |
| 1625 } | |
| 1626 | |
| 601 | 1627 *d++ = ch; |
| 577 | 1628 |
| 1629 break; | |
| 1630 } | |
| 1631 | |
| 1632 c = (u_char) (ch | 0x20); | |
| 1633 if (c >= 'a' && c <= 'f') { | |
| 1634 ch = (u_char) ((decoded << 4) + c - 'a' + 10); | |
| 1635 | |
| 1593 | 1636 if (type & NGX_UNESCAPE_URI) { |
| 1637 if (ch == '?') { | |
| 1638 *d++ = ch; | |
| 1639 goto done; | |
| 1640 } | |
| 1641 | |
| 1642 *d++ = ch; | |
| 1643 break; | |
| 1644 } | |
| 1645 | |
| 1646 if (type & NGX_UNESCAPE_REDIRECT) { | |
| 601 | 1647 if (ch == '?') { |
| 1648 *d++ = ch; | |
| 1649 goto done; | |
| 1650 } | |
| 577 | 1651 |
| 601 | 1652 if (ch > '%' && ch < 0x7f) { |
| 1653 *d++ = ch; | |
| 1654 break; | |
| 1655 } | |
| 1656 | |
| 1657 *d++ = '%'; *d++ = *(s - 2); *d++ = *(s - 1); | |
| 577 | 1658 break; |
| 1659 } | |
| 1660 | |
| 601 | 1661 *d++ = ch; |
| 577 | 1662 |
| 1663 break; | |
| 1664 } | |
| 1665 | |
| 589 | 1666 /* the invalid quoted character */ |
| 577 | 1667 |
| 1668 break; | |
| 1669 } | |
| 1670 } | |
| 1671 | |
| 1672 done: | |
| 1673 | |
| 1674 *dst = d; | |
| 1675 *src = s; | |
| 1676 } | |
| 583 | 1677 |
| 1678 | |
| 1544 | 1679 uintptr_t |
| 1680 ngx_escape_html(u_char *dst, u_char *src, size_t size) | |
| 1681 { | |
| 1682 u_char ch; | |
| 3275 | 1683 ngx_uint_t len; |
| 1544 | 1684 |
| 1685 if (dst == NULL) { | |
| 1686 | |
| 1687 len = 0; | |
| 1688 | |
| 3275 | 1689 while (size) { |
| 1544 | 1690 switch (*src++) { |
| 1691 | |
| 1692 case '<': | |
| 1693 len += sizeof("<") - 2; | |
|
1560
25ee6eee7573
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1552
diff
changeset
|
1694 break; |
| 1544 | 1695 |
| 1696 case '>': | |
| 1697 len += sizeof(">") - 2; | |
|
1560
25ee6eee7573
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1552
diff
changeset
|
1698 break; |
| 1544 | 1699 |
| 1700 case '&': | |
| 1701 len += sizeof("&") - 2; | |
|
1560
25ee6eee7573
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1552
diff
changeset
|
1702 break; |
| 1544 | 1703 |
|
4312
0a8e51a16484
Added escaping of double quotes in ngx_escape_html().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4209
diff
changeset
|
1704 case '"': |
|
0a8e51a16484
Added escaping of double quotes in ngx_escape_html().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4209
diff
changeset
|
1705 len += sizeof(""") - 2; |
|
0a8e51a16484
Added escaping of double quotes in ngx_escape_html().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4209
diff
changeset
|
1706 break; |
|
0a8e51a16484
Added escaping of double quotes in ngx_escape_html().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4209
diff
changeset
|
1707 |
| 1544 | 1708 default: |
| 1709 break; | |
| 1710 } | |
| 3275 | 1711 size--; |
| 1544 | 1712 } |
| 1713 | |
| 1714 return (uintptr_t) len; | |
| 1715 } | |
| 1716 | |
| 3275 | 1717 while (size) { |
| 1544 | 1718 ch = *src++; |
| 1719 | |
| 1720 switch (ch) { | |
| 1721 | |
| 1722 case '<': | |
| 1723 *dst++ = '&'; *dst++ = 'l'; *dst++ = 't'; *dst++ = ';'; | |
| 1724 break; | |
| 1725 | |
| 1726 case '>': | |
| 1727 *dst++ = '&'; *dst++ = 'g'; *dst++ = 't'; *dst++ = ';'; | |
| 1728 break; | |
| 1729 | |
| 1730 case '&': | |
| 1731 *dst++ = '&'; *dst++ = 'a'; *dst++ = 'm'; *dst++ = 'p'; | |
| 1732 *dst++ = ';'; | |
| 1733 break; | |
| 1734 | |
|
4312
0a8e51a16484
Added escaping of double quotes in ngx_escape_html().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4209
diff
changeset
|
1735 case '"': |
|
0a8e51a16484
Added escaping of double quotes in ngx_escape_html().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4209
diff
changeset
|
1736 *dst++ = '&'; *dst++ = 'q'; *dst++ = 'u'; *dst++ = 'o'; |
|
0a8e51a16484
Added escaping of double quotes in ngx_escape_html().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4209
diff
changeset
|
1737 *dst++ = 't'; *dst++ = ';'; |
|
0a8e51a16484
Added escaping of double quotes in ngx_escape_html().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4209
diff
changeset
|
1738 break; |
|
0a8e51a16484
Added escaping of double quotes in ngx_escape_html().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4209
diff
changeset
|
1739 |
| 1544 | 1740 default: |
| 1741 *dst++ = ch; | |
| 1742 break; | |
| 1743 } | |
| 3275 | 1744 size--; |
| 1544 | 1745 } |
| 1746 | |
| 1747 return (uintptr_t) dst; | |
| 1748 } | |
| 1749 | |
| 1750 | |
|
3641
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1751 void |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1752 ngx_str_rbtree_insert_value(ngx_rbtree_node_t *temp, |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1753 ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1754 { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1755 ngx_str_node_t *n, *t; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1756 ngx_rbtree_node_t **p; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1757 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1758 for ( ;; ) { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1759 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1760 n = (ngx_str_node_t *) node; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1761 t = (ngx_str_node_t *) temp; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1762 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1763 if (node->key != temp->key) { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1764 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1765 p = (node->key < temp->key) ? &temp->left : &temp->right; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1766 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1767 } else if (n->str.len != t->str.len) { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1768 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1769 p = (n->str.len < t->str.len) ? &temp->left : &temp->right; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1770 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1771 } else { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1772 p = (ngx_memcmp(n->str.data, t->str.data, n->str.len) < 0) |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1773 ? &temp->left : &temp->right; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1774 } |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1775 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1776 if (*p == sentinel) { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1777 break; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1778 } |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1779 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1780 temp = *p; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1781 } |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1782 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1783 *p = node; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1784 node->parent = temp; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1785 node->left = sentinel; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1786 node->right = sentinel; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1787 ngx_rbt_red(node); |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1788 } |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1789 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1790 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1791 ngx_str_node_t * |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1792 ngx_str_rbtree_lookup(ngx_rbtree_t *rbtree, ngx_str_t *val, uint32_t hash) |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1793 { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1794 ngx_int_t rc; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1795 ngx_str_node_t *n; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1796 ngx_rbtree_node_t *node, *sentinel; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1797 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1798 node = rbtree->root; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1799 sentinel = rbtree->sentinel; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1800 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1801 while (node != sentinel) { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1802 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1803 n = (ngx_str_node_t *) node; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1804 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1805 if (hash != node->key) { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1806 node = (hash < node->key) ? node->left : node->right; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1807 continue; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1808 } |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1809 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1810 if (val->len != n->str.len) { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1811 node = (val->len < n->str.len) ? node->left : node->right; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1812 continue; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1813 } |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1814 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1815 rc = ngx_memcmp(val->data, n->str.data, val->len); |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1816 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1817 if (rc < 0) { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1818 node = node->left; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1819 continue; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1820 } |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1821 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1822 if (rc > 0) { |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1823 node = node->right; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1824 continue; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1825 } |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1826 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1827 return n; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1828 } |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1829 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1830 return NULL; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1831 } |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1832 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1833 |
| 1208 | 1834 /* ngx_sort() is implemented as insertion sort because we need stable sort */ |
| 1835 | |
| 1836 void | |
| 1837 ngx_sort(void *base, size_t n, size_t size, | |
|
1956
cb8c0c8e0c27
use ngx_int_t in ngx_sort() callback
Igor Sysoev <igor@sysoev.ru>
parents:
1955
diff
changeset
|
1838 ngx_int_t (*cmp)(const void *, const void *)) |
| 1208 | 1839 { |
|
1955
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1840 u_char *p1, *p2, *p; |
|
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1841 |
|
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1842 p = ngx_alloc(size, ngx_cycle->log); |
|
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1843 if (p == NULL) { |
|
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1844 return; |
|
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1845 } |
| 1208 | 1846 |
| 1847 for (p1 = (u_char *) base + size; | |
| 1848 p1 < (u_char *) base + n * size; | |
| 1849 p1 += size) | |
| 1850 { | |
|
1955
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1851 ngx_memcpy(p, p1, size); |
| 1208 | 1852 |
| 1853 for (p2 = p1; | |
|
1955
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1854 p2 > (u_char *) base && cmp(p2 - size, p) > 0; |
| 1208 | 1855 p2 -= size) |
| 1856 { | |
| 1857 ngx_memcpy(p2, p2 - size, size); | |
| 1858 } | |
| 1859 | |
|
1955
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1860 ngx_memcpy(p2, p, size); |
| 1208 | 1861 } |
|
1955
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1862 |
|
466fdc84c82d
use dynamically allocated buffer in ngx_sort()
Igor Sysoev <igor@sysoev.ru>
parents:
1867
diff
changeset
|
1863 ngx_free(p); |
| 1208 | 1864 } |
| 1865 | |
| 1866 | |
| 583 | 1867 #if (NGX_MEMCPY_LIMIT) |
| 1868 | |
| 1869 void * | |
|
4781
814541b2ec23
Added "const" to ngx_memcpy() with NGX_MEMCPY_LIMIT defined.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4604
diff
changeset
|
1870 ngx_memcpy(void *dst, const void *src, size_t n) |
| 583 | 1871 { |
| 1872 if (n > NGX_MEMCPY_LIMIT) { | |
| 1873 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "memcpy %uz bytes", n); | |
| 1874 ngx_debug_point(); | |
| 1875 } | |
| 1876 | |
| 1877 return memcpy(dst, src, n); | |
| 1878 } | |
| 1879 | |
| 1880 #endif |