nginx-0.0.1-2002-12-24-20:30:59 import

3 files changed, 5 insertions, 1 deletions

diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 97bd00964..aa4bcb422 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -34,6 +34,7 @@ int ngx_http_init(ngx_pool_t *pool, ngx_log_t *log)
     ngx_http_server.doc_root = "/home/is/dox/";
     ngx_http_server.doc_root = "/home/is/work/xml/site-1.0.0/html";
     ngx_http_server.doc_root = "/spool/test/lperltk";
+    ngx_http_server.doc_root = "/home/is/dox/ora/lperltk";
 #endif
     ngx_http_server.doc_root_len = strlen(ngx_http_server.doc_root) + 1;
 
diff --git a/src/http/ngx_http_core.c b/src/http/ngx_http_core.c
index 62e6eea50..e20d4683a 100644
--- a/src/http/ngx_http_core.c
+++ b/src/http/ngx_http_core.c
@@ -350,7 +350,10 @@ static void *ngx_http_core_create_loc_conf(ngx_pool_t *pool)
                   ngx_pcalloc(pool, sizeof(ngx_http_core_loc_conf_t)),
                   NULL);
 
+    conf->send_timeout = 10;
+/*
     conf->send_timeout = NGX_CONF_UNSET;
+*/
 
     return conf;
 }
diff --git a/src/http/ngx_http_event.c b/src/http/ngx_http_event.c
index ff06ec1c2..158767014 100644
--- a/src/http/ngx_http_event.c
+++ b/src/http/ngx_http_event.c
@@ -549,7 +549,7 @@ static int ngx_http_writer(ngx_event_t *ev)
 
     if (!r->keepalive) {
         if (r->lingering_close) {
-            ngx_http_set_lingering_close(r);
+            return ngx_http_set_lingering_close(r);
 
         } else {
             return ngx_http_close_request(r);