nginx-0.3.2-RELEASE import
*) Feature: the Sun Studio 10 C compiler support.
*) Feature: the "proxy_upstream_max_fails",
"proxy_upstream_fail_timeout", "fastcgi_upstream_max_fails", and
"fastcgi_upstream_fail_timeout" directives.
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 22c632f..67e8e6b 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
#define _NGINX_H_INCLUDED_
-#define NGINX_VER "nginx/0.3.1"
+#define NGINX_VER "nginx/0.3.2"
#define NGINX_VAR "NGINX"
#define NGX_OLDPID_EXT ".oldbin"
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index 110c9e2..0e671ef 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -660,7 +660,7 @@
name->len = cycle->root.len + old.len;
- if (cycle->connections0) {
+ if (cycle->connections) {
name->data = ngx_palloc(cycle->pool, name->len + 1);
if (name->data == NULL) {
return NGX_ERROR;
diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h
index 4045e7a..7c5687e 100644
--- a/src/core/ngx_config.h
+++ b/src/core/ngx_config.h
@@ -106,7 +106,7 @@
/* TODO: auto_conf: ngx_inline inline __inline __inline__ */
#ifndef ngx_inline
-#define ngx_inline __inline
+#define ngx_inline inline
#endif
#define NGX_ACCEPT_THRESHOLD 100
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index a7371bf..3f36d31 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -372,7 +372,9 @@
ngx_connection_t *
ngx_get_connection(ngx_socket_t s, ngx_log_t *log)
{
- ngx_connection_t *c;
+ ngx_uint_t instance;
+ ngx_event_t *rev, *wev;
+ ngx_connection_t *c;
/* disable warning: Win32 SOCKET is u_int while UNIX socket is int */
@@ -407,6 +409,32 @@
ngx_cycle->files[s] = c;
}
+ rev = c->read;
+ wev = c->write;
+
+ ngx_memzero(c, sizeof(ngx_connection_t));
+
+ c->read = rev;
+ c->write = wev;
+ c->fd = s;
+ c->log = log;
+
+ instance = rev->instance;
+
+ ngx_memzero(rev, sizeof(ngx_event_t));
+ ngx_memzero(wev, sizeof(ngx_event_t));
+
+ rev->instance = !instance;
+ wev->instance = !instance;
+
+ rev->index = NGX_INVALID_INDEX;
+ wev->index = NGX_INVALID_INDEX;
+
+ rev->data = c;
+ wev->data = c;
+
+ wev->write = 1;
+
return c;
}
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 839843f..d8f95fa 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -627,7 +627,7 @@
}
}
- if (old_cycle->connections0 == NULL) {
+ if (old_cycle->connections == NULL) {
/* an old cycle is an init cycle */
ngx_destroy_pool(old_cycle->pool);
return cycle;
@@ -959,7 +959,7 @@
found = 0;
for (n = 0; n < cycle[i]->connection_n; n++) {
- if (cycle[i]->connections0[n].fd != (ngx_socket_t) -1) {
+ if (cycle[i]->connections[n].fd != (ngx_socket_t) -1) {
found = 1;
ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "live fd:%d", n);
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index bf1d430..a94444a 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -39,9 +39,9 @@
ngx_uint_t connection_n;
ngx_uint_t files_n;
- ngx_connection_t *connections0;
- ngx_event_t *read_events0;
- ngx_event_t *write_events0;
+ ngx_connection_t *connections;
+ ngx_event_t *read_events;
+ ngx_event_t *write_events;
ngx_cycle_t *old_cycle;
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index efabd39..76e71c7 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -36,7 +36,7 @@
ngx_int_t
ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
- int persistent)
+ ngx_uint_t persistent)
{
ngx_err_t err;
ngx_atomic_uint_t n;
diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h
index 1efee29..52c1ae2 100644
--- a/src/core/ngx_file.h
+++ b/src/core/ngx_file.h
@@ -55,7 +55,7 @@
ssize_t ngx_write_chain_to_temp_file(ngx_temp_file_t *tf, ngx_chain_t *chain);
ngx_int_t ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path,
- ngx_pool_t *pool, int persistent);
+ ngx_pool_t *pool, ngx_uint_t persistent);
void ngx_create_hashed_filename(ngx_file_t *file, ngx_path_t *path);
ngx_int_t ngx_create_path(ngx_file_t *file, ngx_path_t *path);
ngx_int_t ngx_add_path(ngx_conf_t *cf, ngx_path_t **slot);
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 376aaae..60a40ec 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -343,10 +343,6 @@
peers->peer[i].name.len = len + u->port_text.len;
peers->peer[i].uri_separator = "";
-
- peers->peer[i].weight = 1;
- peers->peer[i].max_fails = 1;
- peers->peer[i].fail_timeout = 10;
}
} else {
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 93449ab..1164cc4 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -115,6 +115,7 @@
uint32_t ui32;
int64_t i64;
uint64_t ui64;
+ ngx_msec_t ms;
ngx_str_t *s;
ngx_uint_t width, sign, hexadecimal, max_width;
static u_char hex[] = "0123456789abcdef";
@@ -221,8 +222,14 @@
break;
case 'M':
- ui64 = (uint64_t) va_arg(args, ngx_msec_t);
- sign = 0;
+ ms = (ngx_msec_t) va_arg(args, ngx_msec_t);
+ if ((ngx_msec_int_t) ms == -1) {
+ sign = 1;
+ i64 = -1;
+ } else {
+ sign = 0;
+ ui64 = (uint64_t) ms;
+ }
break;
case 'z':
