Author: ru
Date: 2013-02-27 13:22:20 +0000 (Wed, 27 Feb 2013)
New Revision: 5084
URL: http://trac.nginx.org/nginx/changeset/5084/nginx

Log:
Fixed separator in $sent_http_cache_control.

In case multiple "Cache-Control" headers are sent to a client,
multiple values in $sent_http_cache_control were incorrectly
split by a semicolon. Now they are split by a comma.


Modified:
trunk/src/http/ngx_http_variables.c

Modified: trunk/src/http/ngx_http_variables.c
===================================================================
--- trunk/src/http/ngx_http_variables.c 2013-02-23 13:23:48 UTC (rev 5083)
+++ trunk/src/http/ngx_http_variables.c 2013-02-27 13:22:20 UTC (rev 5084)
@@ -21,8 +21,13 @@
ngx_http_variable_value_t *v, uintptr_t data);
static ngx_int_t ngx_http_variable_header(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data);
+
+static ngx_int_t ngx_http_variable_cookies(ngx_http_request_t *r,
+ ngx_http_variable_value_t *v, uintptr_t data);
static ngx_int_t ngx_http_variable_headers(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_variable_headers_internal(ngx_http_request_t *r,
+ ngx_http_variable_value_t *v, uintptr_t data, u_char sep);

static ngx_int_t ngx_http_variable_unknown_header_in(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data);
@@ -160,7 +165,7 @@
offsetof(ngx_http_request_t, headers_in.x_forwarded_for), 0, 0 },
#endif

- { ngx_string("http_cookie"), NULL, ngx_http_variable_headers,
+ { ngx_string("http_cookie"), NULL, ngx_http_variable_cookies,
offsetof(ngx_http_request_t, headers_in.cookies), 0, 0 },

{ ngx_string("content_length"), NULL, ngx_http_variable_content_length,
@@ -726,9 +731,25 @@


static ngx_int_t
-ngx_http_variable_headers(ngx_http_request_t *r, ngx_http_variable_value_t *v,
- uintptr_t data)
+ngx_http_variable_cookies(ngx_http_request_t *r,
+ ngx_http_variable_value_t *v, uintptr_t data)
{
+ return ngx_http_variable_headers_internal(r, v, data, ';');
+}
+
+
+static ngx_int_t
+ngx_http_variable_headers(ngx_http_request_t *r,
+ ngx_http_variable_value_t *v, uintptr_t data)
+{
+ return ngx_http_variable_headers_internal(r, v, data, ',');
+}
+
+
+static ngx_int_t
+ngx_http_variable_headers_internal(ngx_http_request_t *r,
+ ngx_http_variable_value_t *v, uintptr_t data, u_char sep)
+{
size_t len;
u_char *p, *end;
ngx_uint_t i, n;
@@ -748,7 +769,7 @@
continue;
}

- len += h[i]->value.len + sizeof("; ") - 1;
+ len += h[i]->value.len + 2;
}

if (len == 0) {
@@ -756,7 +777,7 @@
return NGX_OK;
}

- len -= sizeof("; ") - 1;
+ len -= 2;

v->valid = 1;
v->no_cacheable = 0;
@@ -791,7 +812,7 @@
break;
}

- *p++ = ';'; *p++ = ' ';
+ *p++ = sep; *p++ = ' ';
}

return NGX_OK;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel