Re: r->connection->number

umask umask at yandex.ru
Thu Oct 25 05:24:42 UTC 2012


 ,

  .

,   ģ  mainline?

   ,     request_id,      (    ,       .).

24.10.2012, 19:33, "Maxim Dounin" <mdounin at mdounin.ru>:
> Hello!
>
> On Wed, Oct 24, 2012 at 03:06:15PM +0400, umask wrote:
>
>>    ?
>>
>>    ,      .
>
>  - ,    .  
>       
> , r->variable().
>
>> .
>>
>> 21.10.2012, 13:45, "umask" <umask at yandex.ru>:
>>>  ,
>>>
>>>  ,         r->connection->number?
>>>
>>>      ޣ  nginx    ޣ .
>>>
>>> _______________________________________________
>>> nginx-ru mailing list
>>> nginx-ru at nginx.org
>>> http://mailman.nginx.org/mailman/listinfo/nginx-ru
>> _______________________________________________
>> nginx-ru mailing list
>> nginx-ru at nginx.org
>> http://mailman.nginx.org/mailman/listinfo/nginx-ru
>
> --
> Maxim Dounin
> http://nginx.com/support.html
>
> ,
> # HG changeset patch
> # User Maxim Dounin <mdounin at mdounin.ru>
> # Date 1351092441 -14400
> # Node ID 53b5e562dab09b388ded32c17ffb811fdb03b4a3
> # Parent 0f453c43fe6fb37cd5d50e8850d2043c1873c6ae
> Variables $connection and $connection_requests.
>
> Log module only counterparts are removed as they aren't used often.
>
> diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
> --- a/src/http/modules/ngx_http_log_module.c
> +++ b/src/http/modules/ngx_http_log_module.c
> @@ -78,10 +78,6 @@ static void ngx_http_log_write(ngx_http_
> static ssize_t ngx_http_log_script_write(ngx_http_request_t *r,
> ngx_http_log_script_t *script, u_char **name, u_char *buf, size_t len);
>
> -static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf,
> - ngx_http_log_op_t *op);
> -static u_char *ngx_http_log_connection_requests(ngx_http_request_t *r,
> - u_char *buf, ngx_http_log_op_t *op);
> static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf,
> ngx_http_log_op_t *op);
> static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf,
> @@ -194,9 +190,6 @@ static ngx_str_t ngx_http_combined_fmt
>
> static ngx_http_log_var_t ngx_http_log_vars[] = {
> - { ngx_string("connection"), NGX_ATOMIC_T_LEN, ngx_http_log_connection },
> - { ngx_string("connection_requests"), NGX_INT_T_LEN,
> - ngx_http_log_connection_requests },
> { ngx_string("pipe"), 1, ngx_http_log_pipe },
> { ngx_string("time_local"), sizeof("28/Sep/1970:12:00:00 +0600") - 1,
> ngx_http_log_time },
> @@ -500,22 +493,6 @@ ngx_http_log_copy_long(ngx_http_request_
>
> static u_char *
> -ngx_http_log_connection(ngx_http_request_t *r, u_char *buf,
> - ngx_http_log_op_t *op)
> -{
> - return ngx_sprintf(buf, "%uA", r->connection->number);
> -}
> -
> -
> -static u_char *
> -ngx_http_log_connection_requests(ngx_http_request_t *r, u_char *buf,
> - ngx_http_log_op_t *op)
> -{
> - return ngx_sprintf(buf, "%ui", r->connection->requests);
> -}
> -
> -
> -static u_char *
> ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op)
> {
> if (r->pipeline) {
> diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
> --- a/src/http/ngx_http_variables.c
> +++ b/src/http/ngx_http_variables.c
> @@ -97,6 +97,11 @@ static ngx_int_t ngx_http_variable_sent_
> static ngx_int_t ngx_http_variable_sent_transfer_encoding(ngx_http_request_t *r,
> ngx_http_variable_value_t *v, uintptr_t data);
>
> +static ngx_int_t ngx_http_variable_connection(ngx_http_request_t *r,
> + ngx_http_variable_value_t *v, uintptr_t data);
> +static ngx_int_t ngx_http_variable_connection_requests(ngx_http_request_t *r,
> + ngx_http_variable_value_t *v, uintptr_t data);
> +
> static ngx_int_t ngx_http_variable_nginx_version(ngx_http_request_t *r,
> ngx_http_variable_value_t *v, uintptr_t data);
> static ngx_int_t ngx_http_variable_hostname(ngx_http_request_t *r,
> @@ -265,6 +270,12 @@ static ngx_http_variable_t ngx_http_cor
> offsetof(ngx_http_request_t, limit_rate),
> NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
>
> + { ngx_string("connection"), NULL,
> + ngx_http_variable_connection, 0, 0, 0 },
> +
> + { ngx_string("connection_requests"), NULL,
> + ngx_http_variable_connection_requests, 0, 0, 0 },
> +
> { ngx_string("nginx_version"), NULL, ngx_http_variable_nginx_version,
> 0, 0, 0 },
>
> @@ -1822,6 +1833,48 @@ ngx_http_variable_request_body_file(ngx_
>
> static ngx_int_t
> +ngx_http_variable_connection(ngx_http_request_t *r,
> + ngx_http_variable_value_t *v, uintptr_t data)
> +{
> + u_char *p;
> +
> + p = ngx_pnalloc(r->pool, NGX_ATOMIC_T_LEN);
> + if (p == NULL) {
> + return NGX_ERROR;
> + }
> +
> + v->len = ngx_sprintf(p, "%uA", r->connection->number) - p;
> + v->valid = 1;
> + v->no_cacheable = 0;
> + v->not_found = 0;
> + v->data = p;
> +
> + return NGX_OK;
> +}
> +
> +
> +static ngx_int_t
> +ngx_http_variable_connection_requests(ngx_http_request_t *r,
> + ngx_http_variable_value_t *v, uintptr_t data)
> +{
> + u_char *p;
> +
> + p = ngx_pnalloc(r->pool, NGX_INT_T_LEN);
> + if (p == NULL) {
> + return NGX_ERROR;
> + }
> +
> + v->len = ngx_sprintf(p, "%ui", r->connection->requests) - p;
> + v->valid = 1;
> + v->no_cacheable = 0;
> + v->not_found = 0;
> + v->data = p;
> +
> + return NGX_OK;
> +}
> +
> +
> +static ngx_int_t
> ngx_http_variable_nginx_version(ngx_http_request_t *r,
> ngx_http_variable_value_t *v, uintptr_t data)
> {
>
> ,
> _______________________________________________
> nginx-ru mailing list
> nginx-ru at nginx.org
> http://mailman.nginx.org/mailman/listinfo/nginx-ru



nginx-ru