Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add request_start_time variable #1867

Merged
merged 4 commits into from
Nov 9, 2023
Merged

add request_start_time variable #1867

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95c719f
add request_start_time variable
drawing Sep 20, 2023
a071640
Merge branch 'alibaba:master' into branch_add_request_start_time
drawing Nov 8, 2023
e2be2f9
request_start_time: format alignment
drawing Nov 9, 2023
c562d36
request_start_time: add testcase
drawing Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions auto/modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1484,3 +1484,4 @@ have=T_NGX_HTTP_IMAGE_FILTER . auto/have
have=T_HTTP_HEADER . auto/have
have=T_HTTP_UPSTREAM_TIMEOUT_VAR . auto/have
have=T_NGX_HTTPS_ALLOW_HTTP . auto/have
have=T_NGX_REQUEST_START_TIME . auto/have
47 changes: 47 additions & 0 deletions src/http/ngx_http_variables.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ static ngx_int_t ngx_http_variable_tcpinfo(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data);
#endif

#if (T_NGX_REQUEST_START_TIME)
static ngx_int_t
ngx_http_variable_request_start_time(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data);
#endif

static ngx_int_t ngx_http_variable_content_length(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data);
static ngx_int_t ngx_http_variable_host(ngx_http_request_t *r,
Expand Down Expand Up @@ -552,6 +558,11 @@ static ngx_http_variable_t ngx_http_core_variables[] = {

#endif

#if (T_NGX_REQUEST_START_TIME)
{ ngx_string("request_start_time"), NULL, ngx_http_variable_request_start_time,
0, NGX_HTTP_VAR_NOCACHEABLE, 0 },
#endif

ngx_http_null_variable
};

Expand Down Expand Up @@ -1381,6 +1392,42 @@ ngx_http_variable_tcpinfo(ngx_http_request_t *r, ngx_http_variable_value_t *v,

#endif

#if (T_NGX_REQUEST_START_TIME)
static char *months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };

static ngx_int_t
ngx_http_variable_request_start_time(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data)
{
u_char *p;
ngx_time_t *tp;
ngx_tm_t tm;
drawing marked this conversation as resolved.
Show resolved Hide resolved
p = ngx_pnalloc(r->pool, sizeof("28/Sep/1970:12:00:00 +0600") - 1);
if (p == NULL) {
return NGX_ERROR;
}

tp = ngx_timeofday();
ngx_gmtime(r->start_sec + tp->gmtoff * 60, &tm);

/*The time that the first request pass in*/
(void) ngx_sprintf(p, "%02d/%s/%d:%02d:%02d:%02d %c%02i%02i",
tm.ngx_tm_mday, months[tm.ngx_tm_mon - 1],
tm.ngx_tm_year, tm.ngx_tm_hour,
tm.ngx_tm_min, tm.ngx_tm_sec,
tp->gmtoff < 0 ? '-' : '+',
ngx_abs(tp->gmtoff / 60), ngx_abs(tp->gmtoff % 60));

v->len = sizeof("28/Sep/1970:12:00:00 +0600") - 1;
v->valid = 1;
v->no_cacheable = 0;
v->not_found = 0;
v->data = p;

return NGX_OK;
}
#endif

static ngx_int_t
ngx_http_variable_content_length(ngx_http_request_t *r,
Expand Down