Mercurial > hg > nginx

changeset 211:fd9fecc4193f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.1-2003-12-15-16:57:13 import
author Igor Sysoev <igor@sysoev.ru>
date Mon, 15 Dec 2003 13:57:13 +0000
parents 00cafae0bdf1
children 679f60139863
files src/core/ngx_config.h src/http/ngx_http_core_module.c src/http/ngx_http_write_filter.c src/os/unix/ngx_errno.c
diffstat 4 files changed, 16 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_config.h
+++ b/src/core/ngx_config.h
@@ -2,6 +2,11 @@
 #define _NGX_CONFIG_H_INCLUDED_
 
 
+/* STUB to allocate a big ngx_connections */
+#undef  FD_SETSIZE
+#define FD_SETSIZE  5000
+
+
 #if defined __FreeBSD__
 #include <ngx_freebsd_config.h>
 
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -346,17 +346,17 @@ static void ngx_http_run_phases(ngx_http
                 continue;
             }
 
-            if (rc == NGX_AGAIN) {
-                return;
-            }
-
             if (rc >= NGX_HTTP_SPECIAL_RESPONSE || rc == NGX_ERROR) {
                 ngx_http_finalize_request(r, rc);
                 return;
             }
 
-            if (rc == NGX_OK && r->phase == NGX_HTTP_CONTENT_PHASE) {
-                ngx_http_finalize_request(r, 0);
+            if (r->phase == NGX_HTTP_CONTENT_PHASE) {
+                ngx_http_finalize_request(r, rc);
+                return;
+            }
+
+            if (rc == NGX_AGAIN) {
                 return;
             }
 
--- a/src/http/ngx_http_write_filter.c
+++ b/src/http/ngx_http_write_filter.c
@@ -24,7 +24,7 @@ static int ngx_http_write_filter_init(ng
 static ngx_command_t  ngx_http_write_filter_commands[] = {
 
     { ngx_string("buffer_output"),
-      NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_size_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_write_filter_conf_t, buffer_output),
--- a/src/os/unix/ngx_errno.c
+++ b/src/os/unix/ngx_errno.c
@@ -2,6 +2,8 @@
 #include <ngx_core.h>
 
 
+#if (HAVE_STRERROR_R)
+
 ngx_int_t ngx_strerror_r(int err, char *errstr, size_t size)
 {
     size_t  len;
@@ -22,3 +24,5 @@ ngx_int_t ngx_strerror_r(int err, char *
 
     return len;
 }
+
+#endif