nginx-vendor-0-7: src/http/ngx_http

comparison src/http/ngx_http_upstream.c @ 472:09f0ef15d544 NGINX_0_7_48

nginx 0.7.48 *) Feature: the "proxy_cache_key" directive. *) Bugfix: now nginx takes into account the "X-Accel-Expires", "Expires", and "Cache-Control" header lines in a backend response. *) Bugfix: now nginx caches responses for the GET requests only. *) Bugfix: the "fastcgi_cache_key" directive was not inherited. *) Bugfix: the $arg_... variables did not work with SSI subrequests. Thanks to Maxim Dounin. *) Bugfix: nginx could not be built with uclibc library. Thanks to Timothy Redaelli. *) Bugfix: nginx could not be built on OpenBSD; the bug had appeared in 0.7.46.

author	Igor Sysoev <http://sysoev.ru>
date	Mon, 06 Apr 2009 00:00:00 +0400
parents	c8cfb6c462ef
children	f2c6a7373274

comparison

equal deleted inserted replaced

-:0cc33540f2e0
+:09f0ef15d544
 ngx_http_upstream_t *u, ngx_int_t rc);
 static ngx_int_t ngx_http_upstream_process_header_line(ngx_http_request_t *r,
 ngx_table_elt_t *h, ngx_uint_t offset);
 static ngx_int_t
-ngx_http_upstream_process_multi_header_lines(ngx_http_request_t *r,
+ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
 ngx_table_elt_t *h, ngx_uint_t offset);
 static ngx_int_t ngx_http_upstream_ignore_header_line(ngx_http_request_t *r,
+ngx_table_elt_t *h, ngx_uint_t offset);
+static ngx_int_t ngx_http_upstream_process_expires(ngx_http_request_t *r,
+ngx_table_elt_t *h, ngx_uint_t offset);
+static ngx_int_t ngx_http_upstream_process_accel_expires(ngx_http_request_t *r,
 ngx_table_elt_t *h, ngx_uint_t offset);
 static ngx_int_t ngx_http_upstream_process_limit_rate(ngx_http_request_t *r,
 ngx_table_elt_t *h, ngx_uint_t offset);
 static ngx_int_t ngx_http_upstream_process_buffering(ngx_http_request_t *r,
 ngx_table_elt_t *h, ngx_uint_t offset);
 { ngx_string("Content-Disposition"),
 ngx_http_upstream_ignore_header_line, 0,
 ngx_http_upstream_copy_header_line, 0, 1 },
 { ngx_string("Cache-Control"),
-ngx_http_upstream_process_multi_header_lines,
+ngx_http_upstream_process_cache_control, 0,
-offsetof(ngx_http_upstream_headers_in_t, cache_control),
 ngx_http_upstream_copy_multi_header_lines,
 offsetof(ngx_http_headers_out_t, cache_control), 1 },
 { ngx_string("Expires"),
-ngx_http_upstream_process_header_line,
+ngx_http_upstream_process_expires, 0,
-offsetof(ngx_http_upstream_headers_in_t, expires),
 ngx_http_upstream_copy_header_line,
 offsetof(ngx_http_headers_out_t, expires), 1 },
 { ngx_string("Accept-Ranges"),
 ngx_http_upstream_process_header_line,
 { ngx_string("X-Powered-By"),
 ngx_http_upstream_ignore_header_line, 0,
 ngx_http_upstream_copy_header_line, 0, 0 },
 { ngx_string("X-Accel-Expires"),
-ngx_http_upstream_process_header_line,
+ngx_http_upstream_process_accel_expires, 0,
-offsetof(ngx_http_upstream_headers_in_t, x_accel_expires),
 ngx_http_upstream_copy_header_line, 0, 0 },
 { ngx_string("X-Accel-Redirect"),
 ngx_http_upstream_process_header_line,
 offsetof(ngx_http_upstream_headers_in_t, x_accel_redirect),
 ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
 {
 ngx_int_t          rc;
 ngx_http_cache_t  *c;
+if (!(r->method & NGX_HTTP_GET)) {
+return NGX_DECLINED;
+}
 c = ngx_pcalloc(r->pool, sizeof(ngx_http_cache_t));
 if (c == NULL) {
 return NGX_ERROR;
 }
 return NGX_ERROR;
 } else if (rc == NGX_HTTP_CACHE_STALE) {
+c->valid_sec = 0;
 u->stale_cache = 1;
 u->buffer.start = NULL;
 } else if (rc == NGX_DECLINED) {
 }
 if (u->cacheable) {
 time_t  now, valid;
-valid = ngx_http_file_cache_valid(u->conf->cache_valid,
+now = ngx_time();
-u->headers_in.status_n);
+valid = r->cache->valid_sec;
+if (valid == 0) {
+valid = ngx_http_file_cache_valid(u->conf->cache_valid,
+u->headers_in.status_n);
+if (valid) {
+r->cache->valid_sec = now + valid;
+}
+}
 if (valid) {
-now = ngx_time();
-r->cache->valid_sec = now + valid;
 r->cache->last_modified = r->headers_out.last_modified_time;
 r->cache->date = now;
 r->cache->body_start = (u_short) (u->buffer.pos - u->buffer.start);
 if (r->headers_out.content_length_n != -1) {
 return NGX_OK;
 }
 static ngx_int_t
-ngx_http_upstream_process_multi_header_lines(ngx_http_request_t *r,
+ngx_http_upstream_ignore_header_line(ngx_http_request_t *r, ngx_table_elt_t *h,
+ngx_uint_t offset)
+{
+return NGX_OK;
+}
+static ngx_int_t
+ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
 ngx_table_elt_t *h, ngx_uint_t offset)
 {
+u_char            *p, *last;
+ngx_int_t          n;
 ngx_array_t       *pa;
 ngx_table_elt_t  **ph;
-pa = (ngx_array_t *) ((char *) &r->upstream->headers_in + offset);
+pa = &r->upstream->headers_in.cache_control;
 if (pa->elts == NULL) {
 if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
 {
 return NGX_ERROR;
 return NGX_ERROR;
 }
 *ph = h;
+if (r->cache == NULL) {
+return NGX_OK;
+}
+if (r->cache->valid_sec != 0) {
+return NGX_OK;
+}
+last = h->value.data + h->value.len;
+if (ngx_strlcasestrn(h->value.data, last, (u_char *) "no-cache", 8 - 1)
+!= NULL)
+{
+r->upstream->cacheable = 0;
+return NGX_OK;
+}
+p = ngx_strlcasestrn(h->value.data, last, (u_char *) "max-age=", 8 - 1);
+if (p == NULL) {
+return NGX_OK;
+}
+n = 0;
+for (p += 8; p < last; p++) {
+if (*p == ';' || *p == ' ') {
+break;
+}
+if (*p >= '0' && *p <= '9') {
+n = n * 10 + *p - '0';
+continue;
+}
+r->upstream->cacheable = 0;
+return NGX_OK;
+}
+if (n == 0) {
+r->upstream->cacheable = 0;
+return NGX_OK;
+}
+r->cache->valid_sec = ngx_time() + n;
 return NGX_OK;
 }
 static ngx_int_t
-ngx_http_upstream_ignore_header_line(ngx_http_request_t *r, ngx_table_elt_t *h,
+ngx_http_upstream_process_expires(ngx_http_request_t *r, ngx_table_elt_t *h,
 ngx_uint_t offset)
 {
+time_t  expires;
+r->upstream->headers_in.expires = h;
+if (r->cache == NULL) {
+return NGX_OK;
+}
+if (r->cache->valid_sec != 0) {
+return NGX_OK;
+}
+expires = ngx_http_parse_time(h->value.data, h->value.len);
+if (expires == NGX_ERROR || expires < ngx_time()) {
+r->upstream->cacheable = 0;
+return NGX_OK;
+}
+r->cache->valid_sec = expires;
+return NGX_OK;
+}
+static ngx_int_t
+ngx_http_upstream_process_accel_expires(ngx_http_request_t *r,
+ngx_table_elt_t *h, ngx_uint_t offset)
+{
+u_char     *p;
+size_t      len;
+ngx_int_t   n;
+r->upstream->headers_in.x_accel_expires = h;
+if (r->cache == NULL) {
+return NGX_OK;
+}
+len = h->value.len;
+p = h->value.data;
+if (p[0] != '@') {
+n = ngx_atoi(p, len);
+switch (n) {
+case 0:
+r->upstream->cacheable = 0;
+case NGX_ERROR:
+return NGX_OK;
+default:
+r->cache->valid_sec = ngx_time() + n;
+return NGX_OK;
+}
+}
+p++;
+len--;
+n = ngx_atoi(p, len);
+if (n != NGX_ERROR) {
+r->cache->valid_sec = n;
+}
 return NGX_OK;
 }
 static ngx_int_t

Mercurial > hg > nginx-vendor-0-7

comparison src/http/ngx_http_upstream.c @ 472:09f0ef15d544 NGINX_0_7_48