nginx-0.2.1-RELEASE import

    *) Bugfix: if all backend using in load-balancing failed after one
       error, then nginx may got caught in an endless loop; the bug had
       appeared in 0.2.0.

diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index f0c1753975844ca0f7205d155d6aee8d2f3cd06d..a6acb66ab095dfa9eb9d80eacd43ff638f338e03 100644 (file)
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -9,6 +9,24 @@
 <title lang="en">nginx changelog</title>
 
 
+<changes ver="0.2.1" date="23.09.2005">
+
+<change type="bugfix">
+<para lang="ru">
+ÅÓÌÉ ×ÓÅ ÂÜËÅÎÄÙ, ÉÓÐÏÌØÚÕÅÍÙÅ ÄÌÑ ÂÁÌÁÎÓÉÒÏ×ËÉ ÎÁÇÒÕÚËÉ, ÏËÁÚÙ×ÁÌÉÓØ
+× ÎÅÒÁÂÏÞÅÍ ÓÏÓÔÏÑÎÉÉ ÐÏÓÌÅ ÏÄÎÏÊ ÏÛÉÂËÉ, ÔÏ nginx ÍÏÇ ÚÁÃÉËÌÉÔÓÑ;
+ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 0.2.0.
+</para>
+<para lang="en">
+if all backend using in load-balancing failed after one error, then
+nginx may got caught in an endless loop;
+bug appeared in 0.2.0.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="0.2.0" date="23.09.2005">
 
 <change>
@@ -104,7 +122,6 @@ nginx did not try do connect to them during 60 seconds.
 </para>
 <para lang="en">
 in IMAP/POP3 command argument parsing.
-Thanks to Rob Mueller.
 </para>
 </change>
 

diff --git a/src/core/nginx.h b/src/core/nginx.h
index 22927b3c286c6a966c4c007d671771a5225831e6..6468b947929c654da6bd4c640209a5532784712e 100644 (file)
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.2.0"
+#define NGINX_VER          "nginx/0.2.1"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_OLDPID_EXT     ".oldbin"

diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index 483852fd277a83a459a0a4dd1399153744b89f29..9f344e64c561aff112660125ac058f5bd34ffc33 100644 (file)
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -97,19 +97,20 @@ struct ngx_open_file_s {
 };
 
 
-#define NGX_MODULE_V1          0, 0, 1, 0, 0, 0, 0
+#define NGX_MODULE_V1          0, 0, 0, 0, 0, 0, 1
 #define NGX_MODULE_V1_PADDING  0, 0, 0, 0, 0, 0, 0, 0
 
 struct ngx_module_s {
     ngx_uint_t            ctx_index;
     ngx_uint_t            index;
-    ngx_uint_t            version;
 
     ngx_uint_t            spare0;
     ngx_uint_t            spare1;
     ngx_uint_t            spare2;
     ngx_uint_t            spare3;
 
+    ngx_uint_t            version;
+
     void                 *ctx;
     ngx_command_t        *commands;
     ngx_uint_t            type;

diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index cdcb4c4c63de59128b5ba5df2917ec8b6648b9d6..804226f78ecea8161a121af356b3e7a48ddafa20 100644 (file)
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -360,5 +360,7 @@ ngx_event_connect_peer_failed(ngx_peer_connection_t *pc, ngx_uint_t down)
         pc->cur_peer = 0;
     }
 
-    pc->tries--;
+    if (pc->tries) {
+        pc->tries--;
+    }
 }