Mercurial > hg > nginx
changeset 5540:3a8e19528b30
SSI: fixed $date_local and $date_gmt without SSI (ticket #230).
If there is no SSI context in a given request at a given time,
the $date_local and $date_gmt variables used "%s" format, instead
of "%A, %d-%b-%Y %H:%M:%S %Z" documented as the default and used
if there is SSI module context and timefmt wasn't modified using
the "config" SSI command.
While use of these variables outside of the SSI evaluation isn't strictly
valid, previous behaviour is certainly inconsistent, hence the fix.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 28 Jan 2014 15:40:45 +0400 |
parents | c86dd32573c0 |
children | fdb67cfc957d |
files | src/http/modules/ngx_http_ssi_filter_module.c |
diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_ssi_filter_module.c Tue Jan 28 00:31:31 2014 +0400 +++ b/src/http/modules/ngx_http_ssi_filter_module.c Tue Jan 28 15:40:45 2014 +0400 @@ -213,6 +213,7 @@ static u_char ngx_http_ssi_string[] = "<!--"; static ngx_str_t ngx_http_ssi_none = ngx_string("(none)"); +static ngx_str_t ngx_http_ssi_timefmt = ngx_string("%A, %d-%b-%Y %H:%M:%S %Z"); static ngx_str_t ngx_http_ssi_null_string = ngx_null_string; @@ -359,7 +360,7 @@ ctx->params.nalloc = NGX_HTTP_SSI_PARAMS_N; ctx->params.pool = r->pool; - ngx_str_set(&ctx->timefmt, "%A, %d-%b-%Y %H:%M:%S %Z"); + ctx->timefmt = ngx_http_ssi_timefmt; ngx_str_set(&ctx->errmsg, "[an error occurred while processing the directive]"); @@ -2720,6 +2721,7 @@ { ngx_http_ssi_ctx_t *ctx; ngx_time_t *tp; + ngx_str_t *timefmt; struct tm tm; char buf[NGX_HTTP_SSI_DATE_LEN]; @@ -2731,9 +2733,10 @@ ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module); - if (ctx == NULL - || (ctx->timefmt.len == sizeof("%s") - 1 - && ctx->timefmt.data[0] == '%' && ctx->timefmt.data[1] == 's')) + timefmt = ctx ? &ctx->timefmt : &ngx_http_ssi_timefmt; + + if (timefmt->len == sizeof("%s") - 1 + && timefmt->data[0] == '%' && timefmt->data[1] == 's') { v->data = ngx_pnalloc(r->pool, NGX_TIME_T_LEN); if (v->data == NULL) { @@ -2752,7 +2755,7 @@ } v->len = strftime(buf, NGX_HTTP_SSI_DATE_LEN, - (char *) ctx->timefmt.data, &tm); + (char *) timefmt->data, &tm); if (v->len == 0) { return NGX_ERROR; }