nginx: src/http/ngx_http_request.c comparison

comparison src/http/ngx_http_request.c @ 5105:4d67b696388f

Refactored ngx_http_init_request(). Now it can be used as the request object factory with minimal impact on the connection object. Therefore it was renamed to ngx_http_create_request().

author	Valentin Bartenev <vbart@nginx.com>
date	Thu, 07 Mar 2013 18:14:27 +0000
parents	93713d4b99c3
children	44bd04fbbb4f

comparison

equal deleted inserted replaced

-:93713d4b99c3
+:4d67b696388f
 #include <ngx_core.h>
 #include <ngx_http.h>
 static void ngx_http_wait_request_handler(ngx_event_t *ev);
-static void ngx_http_init_request(ngx_event_t *ev);
+static ngx_http_request_t *ngx_http_create_request(ngx_connection_t *c);
 static void ngx_http_process_request_line(ngx_event_t *rev);
 static void ngx_http_process_request_headers(ngx_event_t *rev);
 static ssize_t ngx_http_read_request_header(ngx_http_request_t *r);
 static ngx_int_t ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
 ngx_uint_t request_line);
 b->last += n;
 c->log->action = "reading client request line";
-ngx_http_init_request(rev);
+c->data = ngx_http_create_request(c);
-}
+if (c->data == NULL) {
+ngx_http_close_connection(c);
+return;
-static void
+}
-ngx_http_init_request(ngx_event_t *rev)
+rev->handler = ngx_http_process_request_line;
+ngx_http_process_request_line(rev);
+}
+static ngx_http_request_t *
+ngx_http_create_request(ngx_connection_t *c)
 {
 ngx_pool_t                 *pool;
 ngx_time_t                 *tp;
-ngx_connection_t           *c;
 ngx_http_request_t         *r;
 ngx_http_log_ctx_t         *ctx;
 ngx_http_connection_t      *hc;
 ngx_http_core_srv_conf_t   *cscf;
 ngx_http_core_loc_conf_t   *clcf;
 ngx_http_core_main_conf_t  *cmcf;
-c = rev->data;
 c->requests++;
 hc = c->data;
 cscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_core_module);
 pool = ngx_create_pool(cscf->request_pool_size, c->log);
 if (pool == NULL) {
-ngx_http_close_connection(c);
+return NULL;
-return;
 }
 r = ngx_pcalloc(pool, sizeof(ngx_http_request_t));
 if (r == NULL) {
 ngx_destroy_pool(pool);
-ngx_http_close_connection(c);
+return NULL;
-return;
 }
 r->pool = pool;
-r->pipeline = hc->pipeline;
-c->data = r;
 r->http_connection = hc;
-c->sent = 0;
 r->signature = NGX_HTTP_MODULE;
 r->connection = c;
 r->main_conf = hc->conf_ctx->main_conf;
 r->srv_conf = hc->conf_ctx->srv_conf;
 r->loc_conf = hc->conf_ctx->loc_conf;
 if (ngx_list_init(&r->headers_out.headers, r->pool, 20,
 sizeof(ngx_table_elt_t))
 != NGX_OK)
 {
 ngx_destroy_pool(r->pool);
-ngx_http_close_connection(c);
+return NULL;
-return;
 }
 r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
 if (r->ctx == NULL) {
 ngx_destroy_pool(r->pool);
-ngx_http_close_connection(c);
+return NULL;
-return;
 }
 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
 r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts
 * sizeof(ngx_http_variable_value_t));
 if (r->variables == NULL) {
 ngx_destroy_pool(r->pool);
-ngx_http_close_connection(c);
+return NULL;
-return;
+}
-}
-c->destroyed = 0;
 #if (NGX_HTTP_SSL)
 if (c->ssl) {
 r->main_filter_need_in_memory = 1;
 }
 (void) ngx_atomic_fetch_add(ngx_stat_reading, 1);
 r->stat_reading = 1;
 (void) ngx_atomic_fetch_add(ngx_stat_requests, 1);
 #endif
-rev->handler = ngx_http_process_request_line;
+return r;
-ngx_http_process_request_line(rev);
 }
 #if (NGX_HTTP_SSL)
 if (b != c->buffer) {
 /*
 * If the large header buffers were allocated while the previous
 * request processing then we do not use c->buffer for
-* the pipelined request (see ngx_http_init_request()).
+* the pipelined request (see ngx_http_create_request()).
 *
 * Now we would move the large header buffers to the free list.
 */
 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
 if (b->pos < b->last) {
 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "pipelined request");
-hc->pipeline = 1;
 c->log->action = "reading client pipelined request line";
+r = ngx_http_create_request(c);
+if (r == NULL) {
+ngx_http_close_connection(c);
+return;
+}
+r->pipeline = 1;
+c->data = r;
+c->sent = 0;
+c->destroyed = 0;
 if (rev->timer_set) {
 ngx_del_timer(rev);
 }
-rev->handler = ngx_http_init_request;
+rev->handler = ngx_http_process_request_line;
 ngx_post_event(rev, &ngx_posted_events);
 return;
 }
-hc->pipeline = 0;
 /*
 * To keep a memory footprint as small as possible for an idle keepalive
 * connection we try to free c->buffer's memory if it was allocated outside
 * the c->pool.  The large header buffers are always allocated outside the
 c->log->action = "reading client request line";
 c->idle = 0;
 ngx_reusable_connection(c, 0);
+c->data = ngx_http_create_request(c);
+if (c->data == NULL) {
+ngx_http_close_connection(c);
+return;
+}
+c->sent = 0;
+c->destroyed = 0;
 ngx_del_timer(rev);
-ngx_http_init_request(rev);
+rev->handler = ngx_http_process_request_line;
+ngx_http_process_request_line(rev);
 }
 static void
 ngx_http_set_lingering_close(ngx_http_request_t *r)

Mercurial > hg > nginx

comparison src/http/ngx_http_request.c @ 5105:4d67b696388f