Mercurial > hg > nginx
comparison src/http/modules/ngx_http_userid_filter_module.c @ 3581:17995396463d stable-0.7
merge r3454, r3455, r3486, r3496, r3519, r3523:
SSI fixes:
*) use content type of the parent request in SSI stub block output
instead of default one
*) SSI %s timefmt has no timezone offset
*) change ngx_http_ssi_filter and ngx_http_charset_filter order
*) do not store an encoded variable value as a new cached variable value
*) fix SSI include stub for valid empty responses
*) allow to use $uid_got in SSI and perl module
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 07 Jun 2010 09:54:19 +0000 |
| parents | 2efa8d2fcde1 |
| children |
comparison
equal
deleted
inserted
replaced
| 3580:667c22171519 | 3581:17995396463d |
|---|---|
| 543 static ngx_int_t | 543 static ngx_int_t |
| 544 ngx_http_userid_add_variables(ngx_conf_t *cf) | 544 ngx_http_userid_add_variables(ngx_conf_t *cf) |
| 545 { | 545 { |
| 546 ngx_http_variable_t *var; | 546 ngx_http_variable_t *var; |
| 547 | 547 |
| 548 var = ngx_http_add_variable(cf, &ngx_http_userid_got, NGX_HTTP_VAR_NOHASH); | 548 var = ngx_http_add_variable(cf, &ngx_http_userid_got, 0); |
| 549 if (var == NULL) { | 549 if (var == NULL) { |
| 550 return NGX_ERROR; | 550 return NGX_ERROR; |
| 551 } | 551 } |
| 552 | 552 |
| 553 var->get_handler = ngx_http_userid_got_variable; | 553 var->get_handler = ngx_http_userid_got_variable; |