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

comparison src/http/ngx_http_upstream.c @ 78:9db7e0b5b27f NGINX_0_1_39

nginx 0.1.39 *) The changes in the ngx_http_charset_module: the "default_charset" directive was canceled; the "charset" directive sets the response charset; the "source_charset" directive sets the source charset only. *) Bugfix: the backend "WWW-Authenticate" header line did not transferred while the 401 response code redirecting. *) Bugfix: the ngx_http_proxy_module and ngx_http_fastcgi_module may close a connection before anything was transferred to a client; bug appeared in 0.1.38. *) Workaround: the Linux glibc crypt_r() initialization bug. *) Bugfix: the ngx_http_ssi_module did not support the relative URI in the "include virtual" command. *) Bugfix: if the backend response had the "Location" header line and nginx should not rewrite this line, then the 500 code response body was transferred; bug appeared in 0.1.29. *) Bugfix: some directives of the ngx_http_proxy_module and ngx_http_fastcgi_module were not inherited from the server to the location level; bug appeared in 0.1.29. *) Bugfix: the ngx_http_ssl_module did not support the certificate chain. *) Bugfix: the ngx_http_autoindex_module did not show correctly the long file names; bug appeared in 0.1.38. *) Bugfixes in IMAP/POP3 proxy in interaction with a backend at the login state.

author	Igor Sysoev <http://sysoev.ru>
date	Thu, 14 Jul 2005 00:00:00 +0400
parents	da9a3b14312d
children	6ae11d59d10e

comparison

equal deleted inserted replaced

-:e6b3de2dc637
+:9db7e0b5b27f
 ngx_http_upstream_process_header_line,
 offsetof(ngx_http_upstream_headers_in_t, server),
 ngx_http_upstream_conditional_copy_header_line,
 offsetof(ngx_http_upstream_conf_t, pass_server), 0 },
+{ ngx_string("WWW-Authenticate"),
+ngx_http_upstream_process_header_line,
+offsetof(ngx_http_upstream_headers_in_t, www_authenticate),
+ngx_http_upstream_copy_header_line, 0, 0 },
 { ngx_string("Location"),
 ngx_http_upstream_ignore_header_line, 0,
 ngx_http_upstream_rewrite_location, 0, 0 },
 { ngx_string("Refresh"),
 ngx_http_upstream_ignore_header_line, 0,
 ngx_http_upstream_rewrite_refresh, 0, 0 },
 { ngx_string("Set-Cookie"),
 ngx_http_upstream_ignore_header_line, 0,
-ngx_http_upstream_copy_header_line, 0, 1 },
+ngx_http_upstream_copy_header_line, 0, 0 },
 { ngx_string("Cache-Control"),
 ngx_http_upstream_process_multi_header_lines,
 offsetof(ngx_http_upstream_headers_in_t, cache_control),
 ngx_http_upstream_copy_multi_header_lines,
 if (n > 0) {
 return;
 }
-ev->eof = 1;
-c->closed = 1;
 if (n == -1) {
 if (err == NGX_EAGAIN) {
 return;
 }
 ev->error = 1;
 } else { /* n == 0 */
 err = 0;
 }
+ev->eof = 1;
+c->closed = 1;
 if (!u->cachable && u->peer.connection) {
 ngx_log_error(NGX_LOG_INFO, ev->log, err,
 "client closed prematurely connection, "
 "so upstream connection is closed too");
 return;
 }
 /* rc == NGX_OK */
-if (r->headers_out.status == NGX_HTTP_INTERNAL_SERVER_ERROR) {
+if (u->headers_in.status_n == NGX_HTTP_INTERNAL_SERVER_ERROR) {
 if (u->peer.tries > 1
 && (u->conf->next_upstream & NGX_HTTP_UPSTREAM_FT_HTTP_500))
 {
 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_HTTP_500);
 if (u->peer.tries == 0
 && u->stale
 && (u->conf->use_stale & NGX_HTTP_UPSTREAM_FT_HTTP_500))
 {
 ngx_http_upstream_finalize_request(r, u,
 ngx_http_send_cached_response(r));
 return;
 }
 #endif
 }
-if (r->headers_out.status == NGX_HTTP_NOT_FOUND
+if (u->headers_in.status_n == NGX_HTTP_NOT_FOUND
 && u->peer.tries > 1
 && u->conf->next_upstream & NGX_HTTP_UPSTREAM_FT_HTTP_404)
 {
 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_HTTP_404);
 return;
 }
-if (r->headers_out.status >= NGX_HTTP_BAD_REQUEST
+if (u->headers_in.status_n >= NGX_HTTP_BAD_REQUEST
 && u->conf->redirect_errors
 && r->err_ctx == NULL)
 {
 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 if (clcf->error_pages) {
 err_page = clcf->error_pages->elts;
 for (i = 0; i < clcf->error_pages->nelts; i++) {
-if (err_page[i].status == (ngx_int_t) r->headers_out.status) {
+if (err_page[i].status == (ngx_int_t) u->headers_in.status_n) {
+if (u->headers_in.status_n == NGX_HTTP_UNAUTHORIZED) {
+r->headers_out.www_authenticate =
+ngx_list_push(&r->headers_out.headers);
+if (r->headers_out.www_authenticate == NULL) {
+ngx_http_upstream_finalize_request(r, u,
+NGX_HTTP_INTERNAL_SERVER_ERROR);
+return;
+}
+*r->headers_out.www_authenticate =
+*u->headers_in.www_authenticate;
+}
 ngx_http_upstream_finalize_request(r, u,
-r->headers_out.status);
+u->headers_in.status_n);
 return;
 }
 }
 }
 }
 }
 }
 }
-r->headers_out.status_line.len = 0;
 ngx_http_internal_redirect(r,
 &r->upstream->headers_in.x_accel_redirect->value,
 NULL);
 return;
 }
 ngx_http_upstream_finalize_request(r, u,
 NGX_HTTP_INTERNAL_SERVER_ERROR);
 return;
 }
 }
+r->headers_out.status = u->headers_in.status_n;
+r->headers_out.status_line = u->headers_in.status_line;
 rc = ngx_http_send_header(r);
 if (rc == NGX_ERROR || rc > NGX_OK) {
 ngx_http_upstream_finalize_request(r, u, rc);
 *ho = *h;
 if (r->upstream->rewrite_redirect) {
 rc = r->upstream->rewrite_redirect(r, ho, 0);
+if (rc == NGX_DECLINED) {
+return NGX_OK;
+}
 if (rc == NGX_OK) {
 r->headers_out.location = ho;
 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "rewritten location: \"%V\"", &ho->value);
 if (p) {
 rc = r->upstream->rewrite_redirect(r, ho, p + 4 - ho->value.data);
 } else {
+return NGX_OK;
+}
+if (rc == NGX_DECLINED) {
 return NGX_OK;
 }
 #if (NGX_DEBUG)
 if (rc == NGX_OK) {

Mercurial > hg > nginx-vendor-0-8

comparison src/http/ngx_http_upstream.c @ 78:9db7e0b5b27f NGINX_0_1_39