nginx-ranges: src/http/ngx_http_upstream.c comparison

comparison src/http/ngx_http_upstream.c @ 36:a39d1b793287 NGINX_0_1_18

nginx 0.1.18 *) Workaround: the default values of the devpoll_events and the devpoll_changes directives changed from 512 to 32 to be compatible with Solaris 10. *) Bugfix: the proxy_set_x_var and fastcgi_set_var directives were not inherited. *) Bugfix: in the redirect rewrite directive the arguments were concatenated with URI by the "&" rather than the "?". *) Bugfix: the lines without trailing ";" in the file being included by the ngx_http_geo_module were silently ignored. *) Feature: the ngx_http_stub_status_module. *) Bugfix: the unknown log format in the access_log directive caused the segmentation fault. *) Feature: the new "document_root" parameter of the fastcgi_params directive. *) Feature: the fastcgi_redirect_errors directive. *) Feature: the new "break" modifier of the "rewrite" directive allows to stop the rewrite/location cycle and sets the current configuration to the request.

author	Igor Sysoev <http://sysoev.ru>
date	Wed, 09 Feb 2005 00:00:00 +0300
parents	aab2ea7c0458
children	72eb30262aac

comparison

equal deleted inserted replaced

-:ef53675fe4a6
+:a39d1b793287
 #include <ngx_event_connect.h>
 static void ngx_http_upstream_check_broken_connection(ngx_event_t *ev);
 static void ngx_http_upstream_connect(ngx_http_request_t *r,
 ngx_http_upstream_t *u);
 static void ngx_http_upstream_reinit(ngx_http_request_t *r,
 ngx_http_upstream_t *u);
 static void ngx_http_upstream_send_request(ngx_http_request_t *r,
 ngx_http_upstream_t *u);
 static void ngx_http_upstream_send_request_handler(ngx_event_t *wev);
 static void ngx_http_upstream_process_header(ngx_event_t *rev);
 static void ngx_http_upstream_send_response(ngx_http_request_t *r,
 ngx_http_upstream_t *u);
 static void ngx_http_upstream_process_body(ngx_event_t *ev);
 static void ngx_http_upstream_dummy_handler(ngx_event_t *wev);
 static void ngx_http_upstream_next(ngx_http_request_t *r,
-ngx_http_upstream_t *u,
+ngx_http_upstream_t *u, ngx_uint_t ft_type);
-ngx_uint_t ft_type);
 static void ngx_http_upstream_finalize_request(ngx_http_request_t *r,
-ngx_http_upstream_t *u,
+ngx_http_upstream_t *u, ngx_int_t rc);
-ngx_int_t rc);
 static size_t ngx_http_upstream_log_status_getlen(ngx_http_request_t *r,
 uintptr_t data);
-static u_char *ngx_http_upstream_log_status(ngx_http_request_t *r, u_char *buf,
+static u_char *ngx_http_upstream_log_status(ngx_http_request_t *r,
-ngx_http_log_op_t *op);
+u_char *buf, ngx_http_log_op_t *op);
 static ngx_int_t ngx_http_upstream_add_log_formats(ngx_conf_t *cf);
 ngx_http_module_t  ngx_http_upstream_module_ctx = {
 "upstream sent invalid header",
 "upstream sent too long header line"
 };
-void ngx_http_upstream_init(ngx_http_request_t *r)
+void
+ngx_http_upstream_init(ngx_http_request_t *r)
 {
 ngx_connection_t     *c;
 ngx_http_upstream_t  *u;
 c = r->connection;
 ngx_http_upstream_connect(r, u);
 }
-static void ngx_http_upstream_check_broken_connection(ngx_event_t *ev)
+static void
+ngx_http_upstream_check_broken_connection(ngx_event_t *ev)
 {
 int                  n;
 char                 buf[1];
 ngx_err_t            err;
 ngx_connection_t     *c;
 return;
 }
 }
-static void ngx_http_upstream_connect(ngx_http_request_t *r,
+static void
-ngx_http_upstream_t *u)
+ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
 {
 ngx_int_t            rc;
 ngx_connection_t    *c;
 r->connection->log->action = "connecting to upstream";
 ngx_http_upstream_send_request(r, u);
 }
-static void ngx_http_upstream_reinit(ngx_http_request_t *r,
+static void
-ngx_http_upstream_t *u)
+ngx_http_upstream_reinit(ngx_http_request_t *r, ngx_http_upstream_t *u)
 {
 ngx_chain_t  *cl;
 if (u->reinit_request(r) == NGX_ERROR) {
 ngx_http_upstream_finalize_request(r, u,
 NGX_HTTP_INTERNAL_SERVER_ERROR);
 return;
 }
 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t));
+}
-u->status = 0;
-u->status_count = 0;
-}
+static void
+ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u)
-static void ngx_http_upstream_send_request(ngx_http_request_t *r,
-ngx_http_upstream_t *u)
 {
 int                rc;
 ngx_connection_t  *c;
 c = u->peer.connection;
 return;
 }
 }
-static void ngx_http_upstream_send_request_handler(ngx_event_t *wev)
+static void
+ngx_http_upstream_send_request_handler(ngx_event_t *wev)
 {
 ngx_connection_t     *c;
 ngx_http_request_t   *r;
 ngx_http_upstream_t  *u;
 ngx_http_upstream_send_request(r, u);
 }
-static void ngx_http_upstream_process_header(ngx_event_t *rev)
+static void
-{
+ngx_http_upstream_process_header(ngx_event_t *rev)
-ssize_t               n;
+{
-ngx_int_t             rc;
+ssize_t                    n;
-ngx_connection_t     *c;
+ngx_int_t                  rc;
-ngx_http_request_t   *r;
+ngx_uint_t                 i;
-ngx_http_upstream_t  *u;
+ngx_connection_t          *c;
+ngx_http_request_t        *r;
+ngx_http_upstream_t       *u;
+ngx_http_err_page_t       *err_page;
+ngx_http_core_loc_conf_t  *clcf;
 c = rev->data;
 r = c->data;
 u = r->upstream;
 return;
 }
 /* rc == NGX_OK */
+if (r->headers_out.status >= 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) {
+ngx_http_upstream_finalize_request(r, u,
+r->headers_out.status);
+return;
+}
+}
+}
+}
 ngx_http_upstream_send_response(r, u);
 }
-static void ngx_http_upstream_send_response(ngx_http_request_t *r,
+static void
-ngx_http_upstream_t *u)
+ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
 {
 ngx_int_t                  rc;
 ngx_event_pipe_t          *p;
 ngx_http_core_loc_conf_t  *clcf;
 ngx_http_upstream_process_body(u->peer.connection->read);
 }
-static void ngx_http_upstream_process_body(ngx_event_t *ev)
+static void
+ngx_http_upstream_process_body(ngx_event_t *ev)
 {
 ngx_connection_t     *c;
 ngx_http_request_t   *r;
 ngx_http_upstream_t  *u;
 ngx_event_pipe_t     *p;
 }
 }
 }
-static void ngx_http_upstream_dummy_handler(ngx_event_t *wev)
+static void
+ngx_http_upstream_dummy_handler(ngx_event_t *wev)
 {
 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0,
 "http upstream dummy handler");
 }
-static void ngx_http_upstream_next(ngx_http_request_t *r,
+static void
-ngx_http_upstream_t *u,
+ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
 ngx_uint_t ft_type)
 {
 ngx_uint_t  status;
 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "http next upstream, %xD", ft_type);
 ngx_http_upstream_connect(r, u);
 }
-static void ngx_http_upstream_finalize_request(ngx_http_request_t *r,
+static void
-ngx_http_upstream_t *u,
+ngx_http_upstream_finalize_request(ngx_http_request_t *r,
-ngx_int_t rc)
+ngx_http_upstream_t *u, ngx_int_t rc)
 {
 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "finalize http upstream request: %i", rc);
 u->finalize_request(r, rc);
 ngx_http_finalize_request(r, rc);
 }
-static size_t ngx_http_upstream_log_status_getlen(ngx_http_request_t *r,
+static size_t
-uintptr_t data)
+ngx_http_upstream_log_status_getlen(ngx_http_request_t *r, uintptr_t data)
 {
 if (r->upstream) {
 return r->upstream->states.nelts * (3 + 2);
 }
 return 1;
 }
-static u_char *ngx_http_upstream_log_status(ngx_http_request_t *r, u_char *buf,
+static u_char *
-ngx_http_log_op_t *op)
+ngx_http_upstream_log_status(ngx_http_request_t *r, u_char *buf,
+ngx_http_log_op_t *op)
 {
 ngx_uint_t                  i;
 ngx_http_upstream_t        *u;
 ngx_http_upstream_state_t  *state;
 *buf++ = ' ';
 }
 }
-u_char *ngx_http_upstream_log_error(ngx_log_t *log, u_char *buf, size_t len)
+u_char *
+ngx_http_upstream_log_error(ngx_log_t *log, u_char *buf, size_t len)
 {
 u_char                 *p;
 ngx_int_t               escape;
 ngx_str_t               uri;
 ngx_http_log_ctx_t     *ctx;
 return ngx_snprintf(buf, len, "%V%s%V",
 &uri, r->args.len ? "?" : "", &r->args);
 }
-static ngx_int_t ngx_http_upstream_add_log_formats(ngx_conf_t *cf)
+static ngx_int_t
+ngx_http_upstream_add_log_formats(ngx_conf_t *cf)
 {
 ngx_http_log_op_name_t  *op;
 for (op = ngx_http_upstream_log_fmt_ops; op->name.len; op++) { /* void */ }
 op->run = NULL;

Mercurial > hg > nginx-ranges

comparison src/http/ngx_http_upstream.c @ 36:a39d1b793287 NGINX_0_1_18