nginx-0.0.1-2003-10-29-11:30:44 import
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index e3a4952..87a0799 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -44,7 +44,7 @@
-static ngx_http_header_t headers_in[] = {
+ngx_http_header_t ngx_http_headers_in[] = {
{ ngx_string("Host"), offsetof(ngx_http_headers_in_t, host) },
{ ngx_string("Connection"), offsetof(ngx_http_headers_in_t, connection) },
{ ngx_string("If-Modified-Since"),
@@ -66,6 +66,27 @@
};
+ngx_http_header_t ngx_http_headers_out[] = {
+ { ngx_string("Server"), offsetof(ngx_http_headers_out_t, server) },
+ { ngx_string("Date"), offsetof(ngx_http_headers_out_t, date) },
+ { ngx_string("Content-Type"),
+ offsetof(ngx_http_headers_out_t, content_type) },
+ { ngx_string("Content-Length"),
+ offsetof(ngx_http_headers_out_t, content_length) },
+ { ngx_string("Content-Encoding"),
+ offsetof(ngx_http_headers_out_t, content_encoding) },
+
+ /* Location */
+
+ { ngx_string("Last-Modified"),
+ offsetof(ngx_http_headers_out_t, last_modified) },
+ { ngx_string("Accept-Ranges"),
+ offsetof(ngx_http_headers_out_t, accept_ranges) },
+
+ { ngx_null_string, 0 }
+};
+
+
static void ngx_http_dummy(ngx_event_t *wev)
{
return;
@@ -106,20 +127,14 @@
rev->event_handler = ngx_http_init_request;
if (rev->ready) {
- /* deferred accept */
+ /* deferred accept, aio, iocp, epoll */
ngx_http_init_request(rev);
return;
}
ngx_add_timer(rev, c->listening->post_accept_timeout);
- if (ngx_event_flags & (NGX_USE_AIO_EVENT|NGX_USE_EDGE_EVENT)) {
- /* aio, iocp, epoll */
- ngx_http_init_request(rev);
- return;
- }
-
- if (ngx_handle_read_event(rev) == NGX_ERROR) {
+ if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
ngx_http_close_connection(c);
return;
}
@@ -256,7 +271,7 @@
return;
}
- r->headers_out.headers = ngx_create_table(r->pool, 10);
+ r->headers_out.headers = ngx_create_table(r->pool, 1);
if (r->headers_out.headers == NULL) {
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
ngx_http_close_connection(c);
@@ -451,7 +466,7 @@
lctx = c->log->data;
lctx->action = "reading client request headers";
lctx->url = r->unparsed_uri.data;
- r->headers_in.headers = ngx_create_table(r->pool, 10);
+ r->headers_in.headers = ngx_create_table(r->pool, 1);
if (cscf->large_client_header
&& r->header_in->pos == r->header_in->last)
@@ -560,8 +575,8 @@
/* a header line has been parsed successfully */
- h = ngx_push_table(r->headers_in.headers);
- if (h == NULL) {
+ if (!(h = ngx_http_add_header(&r->headers_in, ngx_http_headers_in)))
+ {
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
ngx_http_close_connection(c);
return;
@@ -593,14 +608,16 @@
h->value.data[h->value.len] = '\0';
}
- for (i = 0; headers_in[i].name.len != 0; i++) {
- if (headers_in[i].name.len != h->key.len) {
+ for (i = 0; ngx_http_headers_in[i].name.len != 0; i++) {
+ if (ngx_http_headers_in[i].name.len != h->key.len) {
continue;
}
- if (ngx_strcasecmp(headers_in[i].name.data, h->key.data) == 0) {
- *((ngx_table_elt_t **)
- ((char *) &r->headers_in + headers_in[i].offset)) = h;
+ if (ngx_strcasecmp(ngx_http_headers_in[i].name.data,
+ h->key.data) == 0)
+ {
+ *((ngx_table_elt_t **) ((char *) &r->headers_in
+ + ngx_http_headers_in[i].offset)) = h;
break;
}
}
@@ -692,10 +709,6 @@
n = r->header_in->last - r->header_in->pos;
if (n > 0) {
-#if 0
- /* TODO: THINK - AIO ??? */
- rev->ready = 0;
-#endif
return n;
}
@@ -709,7 +722,7 @@
r->header_timeout_set = 1;
}
- if (ngx_handle_read_event(rev) == NGX_ERROR) {
+ if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
ngx_http_close_connection(r->connection);
return NGX_ERROR;
@@ -1157,7 +1170,7 @@
c->tcp_nopush = 0;
}
- if (rev->ready || (ngx_event_flags & NGX_USE_AIO_EVENT)) {
+ if (rev->ready) {
ngx_http_keepalive_handler(rev);
}
}
@@ -1256,7 +1269,7 @@
return;
}
- if (rev->ready || (ngx_event_flags & NGX_USE_AIO_EVENT)) {
+ if (rev->ready) {
ngx_http_lingering_close_handler(rev);
}
}
