nginx: src/http/ngx_http_core_module.c comparison

comparison src/http/ngx_http_core_module.c @ 9021:8d0753760546 quic

Merged with the default branch.

author	Sergey Kandaurov <pluknet@nginx.com>
date	Wed, 22 Jun 2022 18:34:58 +0400
parents	eaf356a35f5d 711737177b77
children	6cf8ed15fd00

comparison

equal deleted inserted replaced

-:efbcdb9b37dc
+:8d0753760546
 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
 return NGX_OK;
 }
 r->headers_out.location->hash = 1;
+r->headers_out.location->next = NULL;
 ngx_str_set(&r->headers_out.location->key, "Location");
 if (r->args.len == 0) {
 r->headers_out.location->value = clcf->escaped_name;
 ngx_int_t
 ngx_http_core_access_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph)
 {
 ngx_int_t                  rc;
+ngx_table_elt_t           *h;
 ngx_http_core_loc_conf_t  *clcf;
 if (r != r->main) {
 r->phase_handler = ph->next;
 return NGX_AGAIN;
 } else {
 if (rc == NGX_OK) {
 r->access_code = 0;
-if (r->headers_out.www_authenticate) {
+for (h = r->headers_out.www_authenticate; h; h = h->next) {
-r->headers_out.www_authenticate->hash = 0;
+h->hash = 0;
 }
 r->phase_handler = ph->next;
 return NGX_AGAIN;
 }
 if (etag == NULL) {
 return NGX_ERROR;
 }
 etag->hash = 1;
+etag->next = NULL;
 ngx_str_set(&etag->key, "ETag");
 etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3);
 if (etag->value.data == NULL) {
 etag->hash = 0;
 if (r->headers_out.location == NULL) {
 return NGX_HTTP_INTERNAL_SERVER_ERROR;
 }
 r->headers_out.location->hash = 1;
+r->headers_out.location->next = NULL;
 ngx_str_set(&r->headers_out.location->key, "Location");
 r->headers_out.location->value = val;
 return status;
 }
 ngx_int_t
 ngx_http_gzip_ok(ngx_http_request_t *r)
 {
 time_t                     date, expires;
 ngx_uint_t                 p;
-ngx_array_t               *cc;
+ngx_table_elt_t           *e, *d, *ae, *cc;
-ngx_table_elt_t           *e, *d, *ae;
 ngx_http_core_loc_conf_t  *clcf;
 r->gzip_tested = 1;
 if (r != r->main) {
 }
 return NGX_DECLINED;
 }
-cc = &r->headers_out.cache_control;
+cc = r->headers_out.cache_control;
-if (cc->elts) {
+if (cc) {
 if ((p & NGX_HTTP_GZIP_PROXIED_NO_CACHE)
-&& ngx_http_parse_multi_header_lines(cc, &ngx_http_gzip_no_cache,
+&& ngx_http_parse_multi_header_lines(r, cc, &ngx_http_gzip_no_cache,
 NULL)
->= 0)
+!= NULL)
 {
 goto ok;
 }
 if ((p & NGX_HTTP_GZIP_PROXIED_NO_STORE)
-&& ngx_http_parse_multi_header_lines(cc, &ngx_http_gzip_no_store,
+&& ngx_http_parse_multi_header_lines(r, cc, &ngx_http_gzip_no_store,
 NULL)
->= 0)
+!= NULL)
 {
 goto ok;
 }
 if ((p & NGX_HTTP_GZIP_PROXIED_PRIVATE)
-&& ngx_http_parse_multi_header_lines(cc, &ngx_http_gzip_private,
+&& ngx_http_parse_multi_header_lines(r, cc, &ngx_http_gzip_private,
 NULL)
->= 0)
+!= NULL)
 {
 goto ok;
 }
 return NGX_DECLINED;
 }
 ngx_int_t
 ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr,
-ngx_array_t *headers, ngx_str_t *value, ngx_array_t *proxies,
+ngx_table_elt_t *headers, ngx_str_t *value, ngx_array_t *proxies,
 int recursive)
 {
-ngx_int_t          rc;
+ngx_int_t         rc;
-ngx_uint_t         i, found;
+ngx_uint_t        found;
-ngx_table_elt_t  **h;
+ngx_table_elt_t  *h, *next;
 if (headers == NULL) {
 return ngx_http_get_forwarded_addr_internal(r, addr, value->data,
 value->len, proxies,
 recursive);
 }
-i = headers->nelts;
+/* revert headers order */
-h = headers->elts;
+for (h = headers, headers = NULL; h; h = next) {
+next = h->next;
+h->next = headers;
+headers = h;
+}
+/* iterate over all headers in reverse order */
 rc = NGX_DECLINED;
 found = 0;
-while (i-- > 0) {
+for (h = headers; h; h = h->next) {
-rc = ngx_http_get_forwarded_addr_internal(r, addr, h[i]->value.data,
+rc = ngx_http_get_forwarded_addr_internal(r, addr, h->value.data,
-h[i]->value.len, proxies,
+h->value.len, proxies,
 recursive);
 if (!recursive) {
 break;
 }
 if (rc != NGX_OK) {
 break;
 }
 found = 1;
+}
+/* restore headers order */
+for (h = headers, headers = NULL; h; h = next) {
+next = h->next;
+h->next = headers;
+headers = h;
 }
 return rc;
 }
 *addr = paddr;
 found = 1;
 xfflen = p - 1 - xff;
 } while (recursive && p > xff);
+return NGX_OK;
+}
+ngx_int_t
+ngx_http_link_multi_headers(ngx_http_request_t *r)
+{
+ngx_uint_t        i, j;
+ngx_list_part_t  *part, *ppart;
+ngx_table_elt_t  *header, *pheader, **ph;
+if (r->headers_in.multi_linked) {
+return NGX_OK;
+}
+r->headers_in.multi_linked = 1;
+part = &r->headers_in.headers.part;
+header = part->elts;
+for (i = 0; /* void */; i++) {
+if (i >= part->nelts) {
+if (part->next == NULL) {
+break;
+}
+part = part->next;
+header = part->elts;
+i = 0;
+}
+header[i].next = NULL;
+/*
+* search for previous headers with the same name;
+* if there are any, link to them
+*/
+ppart = &r->headers_in.headers.part;
+pheader = ppart->elts;
+for (j = 0; /* void */; j++) {
+if (j >= ppart->nelts) {
+if (ppart->next == NULL) {
+break;
+}
+ppart = ppart->next;
+pheader = ppart->elts;
+j = 0;
+}
+if (part == ppart && i == j) {
+break;
+}
+if (header[i].key.len == pheader[j].key.len
+&& ngx_strncasecmp(header[i].key.data, pheader[j].key.data,
+header[i].key.len)
+== 0)
+{
+ph = &pheader[j].next;
+while (*ph) { ph = &(*ph)->next; }
+*ph = &header[i];
+r->headers_in.multi = 1;
+break;
+}
+}
+}
 return NGX_OK;
 }

Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 9021:8d0753760546 quic