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

comparison src/http/ngx_http_upstream.c @ 332:2eea67ed0bc2 NGINX_0_5_36

nginx 0.5.36 *) Bugfix: the "sub_filter" directive might set text to change into output. *) Bugfix: a segmentation fault occurred in worker process, if empty stub block was used second time in SSI. *) Bugfix: the "proxy_store" and "fastcgi_store" directives did not check a response length. *) Bugfix: nginx issued the bogus error message "SSL_shutdown() failed (SSL: )"; bug appeared in 0.5.35. *) Bugfix: in HTTPS mode requests might fail with the "bad write retry" error; bug appeared in 0.5.35. *) Bugfix: the "fastcgi_catch_stderr" directive did return error code; now it returns 502 code, that can be rerouted to a next server using the "fastcgi_next_upstream invalid_header" directive. *) Bugfix: a segmentation fault occurred in master process if the "fastcgi_catch_stderr" directive was used; bug appeared in 0.5.32. Thanks to Manlio Perillo.

author	Igor Sysoev <http://sysoev.ru>
date	Sun, 04 May 2008 00:00:00 +0400
parents	26ff8d6b618d
children

comparison

equal deleted inserted replaced

-:27fb10cee3fd
+:2eea67ed0bc2
 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_INVALID_HEADER);
 return;
 }
-if (rc == NGX_ERROR || rc == NGX_HTTP_INTERNAL_SERVER_ERROR) {
+if (rc == NGX_ERROR) {
 ngx_http_upstream_finalize_request(r, u,
 NGX_HTTP_INTERNAL_SERVER_ERROR);
 return;
 }
 r->headers_out.date->hash = 0;
 }
 r->headers_out.status = u->headers_in.status_n;
 r->headers_out.status_line = u->headers_in.status_line;
+u->headers_in.content_length_n = r->headers_out.content_length_n;
 if (r->headers_out.content_length_n != -1) {
 u->length = (size_t) r->headers_out.content_length_n;
 } else {
 static void
 ngx_http_upstream_process_body(ngx_event_t *ev)
 {
+ngx_temp_file_t      *tf;
 ngx_event_pipe_t     *p;
 ngx_connection_t     *c, *downstream;
 ngx_http_log_ctx_t   *ctx;
 ngx_http_request_t   *r;
 ngx_http_upstream_t  *u;
 if (u->peer.connection) {
 if (u->store) {
-if (p->upstream_eof && u->headers_in.status_n == NGX_HTTP_OK) {
+tf = u->pipe->temp_file;
+if (p->upstream_eof
+&& u->headers_in.status_n == NGX_HTTP_OK
+&& (u->headers_in.content_length_n == -1
+|| (u->headers_in.content_length_n == tf->offset)))
+{
 ngx_http_upstream_store(r, u);
 } else if ((p->upstream_error
 || (p->upstream_eof
 && u->headers_in.status_n != NGX_HTTP_OK))
-&& u->pipe->temp_file->file.fd != NGX_INVALID_FILE)
+&& tf->file.fd != NGX_INVALID_FILE)
 {
-if (ngx_delete_file(u->pipe->temp_file->file.name.data)
+if (ngx_delete_file(tf->file.name.data) == NGX_FILE_ERROR) {
-== NGX_FILE_ERROR)
-{
 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
 ngx_delete_file_n " \"%s\" failed",
 u->pipe->temp_file->file.name.data);
 }
 }
 }
 last = p;
 while (*++p == ' ') { /* void */ }
+if (*p == '\0') {
+return NGX_OK;
+}
 if (ngx_strncasecmp(p, (u_char *) "charset=", 8) != 0) {
 continue;
 }
 return uscf;
 }
+ngx_int_t
+ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf,
+ngx_http_upstream_conf_t *conf, ngx_http_upstream_conf_t *prev,
+ngx_str_t *default_hide_headers, ngx_hash_init_t *hash)
+{
+ngx_str_t       *h;
+ngx_uint_t       i, j;
+ngx_array_t      hide_headers;
+ngx_hash_key_t  *hk;
+if (conf->hide_headers == NGX_CONF_UNSET_PTR
+&& conf->pass_headers == NGX_CONF_UNSET_PTR)
+{
+conf->hide_headers_hash = prev->hide_headers_hash;
+if (conf->hide_headers_hash.buckets) {
+return NGX_OK;
+}
+conf->hide_headers = prev->hide_headers;
+conf->pass_headers = prev->pass_headers;
+} else {
+if (conf->hide_headers == NGX_CONF_UNSET_PTR) {
+conf->hide_headers = prev->hide_headers;
+}
+if (conf->pass_headers == NGX_CONF_UNSET_PTR) {
+conf->pass_headers = prev->pass_headers;
+}
+}
+if (ngx_array_init(&hide_headers, cf->temp_pool, 4, sizeof(ngx_hash_key_t))
+!= NGX_OK)
+{
+return NGX_ERROR;
+}
+for (h = default_hide_headers; h->len; h++) {
+hk = ngx_array_push(&hide_headers);
+if (hk == NULL) {
+return NGX_ERROR;
+}
+hk->key = *h;
+hk->key_hash = ngx_hash_key_lc(h->data, h->len);
+hk->value = (void *) 1;
+}
+if (conf->hide_headers != NGX_CONF_UNSET_PTR) {
+h = conf->hide_headers->elts;
+for (i = 0; i < conf->hide_headers->nelts; i++) {
+hk = hide_headers.elts;
+for (j = 0; j < hide_headers.nelts; j++) {
+if (ngx_strcasecmp(h[i].data, hk[j].key.data) == 0) {
+goto exist;
+}
+}
+hk = ngx_array_push(&hide_headers);
+if (hk == NULL) {
+return NGX_ERROR;
+}
+hk->key = h[i];
+hk->key_hash = ngx_hash_key_lc(h[i].data, h[i].len);
+hk->value = (void *) 1;
+exist:
+continue;
+}
+}
+if (conf->pass_headers != NGX_CONF_UNSET_PTR) {
+h = conf->pass_headers->elts;
+hk = hide_headers.elts;
+for (i = 0; i < conf->pass_headers->nelts; i++) {
+for (j = 0; j < hide_headers.nelts; j++) {
+if (hk[j].key.data == NULL) {
+continue;
+}
+if (ngx_strcasecmp(h[i].data, hk[j].key.data) == 0) {
+hk[j].key.data = NULL;
+break;
+}
+}
+}
+}
+hash->hash = &conf->hide_headers_hash;
+hash->key = ngx_hash_key_lc;
+hash->pool = cf->pool;
+hash->temp_pool = NULL;
+return ngx_hash_init(hash, hide_headers.elts, hide_headers.nelts);
+}
 static void *
 ngx_http_upstream_create_main_conf(ngx_conf_t *cf)
 {
 ngx_http_upstream_main_conf_t  *umcf;

Mercurial > hg > nginx-vendor-0-5

comparison src/http/ngx_http_upstream.c @ 332:2eea67ed0bc2 NGINX_0_5_36