comparison src/http/modules/ngx_http_headers_filter_module.c @ 1364:b7a8c9fe2337

style fix
author Igor Sysoev <igor@sysoev.ru>
date Wed, 01 Aug 2007 14:22:12 +0000
parents b0e114fb3bdc
children d1dc7ef7c3ce
comparison
equal deleted inserted replaced
1363:b0e114fb3bdc 1364:b7a8c9fe2337
127 127
128 static ngx_int_t 128 static ngx_int_t
129 ngx_http_headers_filter(ngx_http_request_t *r) 129 ngx_http_headers_filter(ngx_http_request_t *r)
130 { 130 {
131 size_t len; 131 size_t len;
132 ngx_str_t value; 132 ngx_str_t value;
133 ngx_uint_t i; 133 ngx_uint_t i;
134 ngx_table_elt_t *expires, *cc, **ccp; 134 ngx_table_elt_t *expires, *cc, **ccp;
135 ngx_http_header_val_t *h; 135 ngx_http_header_val_t *h;
136 ngx_http_headers_conf_t *conf; 136 ngx_http_headers_conf_t *conf;
137 137
333 ngx_str_t *value) 333 ngx_str_t *value)
334 { 334 {
335 ngx_table_elt_t *h, **old; 335 ngx_table_elt_t *h, **old;
336 336
337 if (hv->offset) { 337 if (hv->offset) {
338 old = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset); 338 old = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset);
339 339
340 } else { 340 } else {
341 old = NULL; 341 old = NULL;
342 } 342 }
343 343
344 if (old == NULL || *old == NULL) { 344 if (old == NULL || *old == NULL) {
345 h = ngx_list_push(&r->headers_out.headers); 345 h = ngx_list_push(&r->headers_out.headers);
346 if (h == NULL) { 346 if (h == NULL) {
391 ngx_http_headers_conf_t *prev = parent; 391 ngx_http_headers_conf_t *prev = parent;
392 ngx_http_headers_conf_t *conf = child; 392 ngx_http_headers_conf_t *conf = child;
393 393
394 if (conf->expires == NGX_HTTP_EXPIRES_UNSET) { 394 if (conf->expires == NGX_HTTP_EXPIRES_UNSET) {
395 conf->expires = (prev->expires == NGX_HTTP_EXPIRES_UNSET) ? 395 conf->expires = (prev->expires == NGX_HTTP_EXPIRES_UNSET) ?
396 NGX_HTTP_EXPIRES_OFF : prev->expires; 396 NGX_HTTP_EXPIRES_OFF : prev->expires;
397 } 397 }
398 398
399 if (conf->cache_control.data == NULL) { 399 if (conf->cache_control.data == NULL) {
400 conf->cache_control = prev->cache_control; 400 conf->cache_control = prev->cache_control;
401 } 401 }