nginx-0.3.6-RELEASE import

*) Change: now the IMAP/POP3 proxy do not send the empty login to authorization server. *) Feature: the "log_format" supports the variables in the $name form. *) Bugfix: if at least in one server was no the "listen" directive, then nginx did not listen on the 80 port; the bug had appeared in 0.3.3. *) Bugfix: if the URI part is omitted in "proxy_pass" directive, the the 80 port was always used.
npenin · Oct 24, 2005 · 9ac946b · 9ac946b
1 parent 51d8bcc
commit 9ac946b
Show file tree

Hide file tree

Showing 22 changed files with 360 additions and 206 deletions.
diff --git a/auto/sources b/auto/sources
@@ -262,7 +262,7 @@ HTTP_DEPS="src/http/ngx_http.h \
            src/http/ngx_http_script.h \
            src/http/ngx_http_upstream.h \
            src/http/ngx_http_busy_lock.h \
-           src/http/ngx_http_log_module.h"
+           src/http/modules/ngx_http_log_module.h"
 
 HTTP_SRCS="src/http/ngx_http.c \
            src/http/ngx_http_core_module.c \
@@ -272,7 +272,7 @@ HTTP_SRCS="src/http/ngx_http.c \
            src/http/ngx_http_header_filter_module.c \
            src/http/ngx_http_write_filter_module.c \
            src/http/ngx_http_copy_filter_module.c \
-           src/http/ngx_http_log_module.c \
+           src/http/modules/ngx_http_log_module.c \
            src/http/ngx_http_request_body.c \
            src/http/ngx_http_variables.c \
            src/http/ngx_http_script.c \

diff --git a/auto/threads b/auto/threads
@@ -50,7 +50,7 @@ case $USE_THREADS in
                 CORE_LIBS="$CORE_LIBS -pthread"
             ;;
 
-            FreeBSD:5*)
+            FreeBSD:[567]*)
                 have=NGX_THREADS . auto/have
                 CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS"
                 CORE_LIBS="$CORE_LIBS -lc_r"

diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -34,6 +34,12 @@ http {
             index  index.html index.htm;
         }
 
+        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+        #
+        #location ~ \.php$ {
+        #    proxy_pass   http://127.0.0.1;
+        #}
+
         # deny access to .htaccess files
         #
         #location ~ /\.ht {

diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
@@ -9,6 +9,52 @@
 <title lang="en">nginx changelog</title>
 
 
+<changes ver="0.3.6" date="24.10.2005">
+
+<change type="change">
+<para lang="ru">
+IMAP/POP3 ÐÒÏËÓÉ ÔÅÐÅÒØ ÎÅ ÐÅÒÅÄÁ£Ô ÓÅÒ×ÅÒÕ Á×ÔÏÒÉÚÁÃÉÉ ÐÕÓÔÏÊ ÌÏÇÉÎ.
+</para>
+<para lang="en">
+now the IMAP/POP3 proxy do not send the empty login to authorization server.
+</para>
+</change>
+
+<change type="feature">
+<para lang="ru">
+ÄÉÒÅËÔÉ×Á log_format ÐÏÄÄÅÒÖÉ×ÁÅÔ ÐÅÒÅÍÅÎÎÙÅ × ×ÉÄÅ $name.
+</para>
+<para lang="en">
+the "log_format" supports the variables in the $name form.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+ÅÓÌÉ ÈÏÔÑ ÂÙ × ÏÄÎÏÍ ÓÅÒ×ÅÒÅ ÎÅ ÂÙÌÏ ÏÐÉÓÁÎÏ ÎÉ ÏÄÎÏÊ ÄÉÒÅËÔÉ×Ù listen, ÔÏ
+nginx ÎÅ ÓÌÕÛÁÌ ÎÁ 80 ÐÏÒÔÕ;
+ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 0.3.3.
+</para>
+<para lang="en">
+if at least in one server was no the "listen" directive, then nginx did not
+listen on the 80 port;
+bug appeared in 0.3.3.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+ÅÓÌÉ × ÄÉÒÅËÔÉ×Å proxy_pass ÏÔÓÕÔÓÔ×Ï×ÁÌ URI, ÔÏ ×ÓÅÇÄÁ ÉÓÐÏÌØÚÏ×ÁÌÓÑ ÐÏÒÔ 80.
+</para>
+<para lang="en">
+if the URI part is omitted in "proxy_pass" directive, the the 80 port was
+always used.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="0.3.5" date="21.10.2005">
 
 <change type="bugfix">
@@ -449,7 +495,7 @@ bug appeared in 0.2.2.
 
 <change type="feature">
 <para lang="ru">
-ËÏÍÁÎÄÁ config errmsg × ÍÏÄÕÌÅ ngx_http_sssi_module.
+ËÏÍÁÎÄÁ config errmsg × ÍÏÄÕÌÅ ngx_http_ssi_module.
 </para>
 <para lang="en">
 the "config errmsg" command of the ngx_http_ssi_module.

diff --git a/src/core/nginx.h b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.3.5"
+#define NGINX_VER          "nginx/0.3.6"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_OLDPID_EXT     ".oldbin"

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
@@ -367,9 +367,8 @@ ngx_configure_listening_socket(ngx_cycle_t *cycle)
                 == -1)
             {
                 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
-                              "setsockopt(SO_RCVBUF) %V failed, ignored",
-                              &ls[i].addr_text);
-                return;
+                              "setsockopt(SO_RCVBUF, %d) %V failed, ignored",
+                              ls[i].rcvbuf, &ls[i].addr_text);
             }
         }
 
@@ -379,9 +378,8 @@ ngx_configure_listening_socket(ngx_cycle_t *cycle)
                 == -1)
             {
                 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
-                              "setsockopt(SO_SNDBUF) %V failed, ignored",
-                              &ls[i].addr_text);
-                return;
+                              "setsockopt(SO_SNDBUF, %d) %V failed, ignored",
+                              ls[i].sndbuf, &ls[i].addr_text);
             }
         }
 

diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
@@ -452,7 +452,23 @@ ngx_inet_parse_host_port(ngx_inet_upstream_t *u)
         }
     }
 
-    if (u->port_text.data == NULL) {
+    if (u->port_text.data) {
+
+        if (u->port_text.len == 0) {
+            u->port_text.len = &url->data[i] - u->port_text.data;
+
+            if (u->port_text.len == 0) {
+                return "invalid port";
+            }
+        }
+
+        port = ngx_atoi(u->port_text.data, u->port_text.len);
+
+        if (port == NGX_ERROR || port < 1 || port > 65536) {
+            return "invalid port";
+        }
+
+    } else {
         port = ngx_atoi(url->data, url->len);
 
         if (port == NGX_ERROR) {
@@ -464,18 +480,6 @@ ngx_inet_parse_host_port(ngx_inet_upstream_t *u)
 
         u->port_text = *url;
         u->wildcard = 1;
-
-    } else {
-        if (u->port_text.len == 0) {
-            u->default_port = 1;
-            return NULL;
-        }
-
-        port = ngx_atoi(u->port_text.data, u->port_text.len);
-
-        if (port == NGX_ERROR || port < 1 || port > 65536) {
-            return "invalid port";
-        }
     }
 
     u->port = (in_port_t) port;

diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
@@ -212,12 +212,12 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
 
         last = ctx->output_filter(ctx->filter_ctx, out);
 
-        ngx_chain_update_chains(&ctx->free, &ctx->busy, &out, ctx->tag);
-        last_out = &out;
-
-        if (last == NGX_ERROR) {
+        if (last == NGX_ERROR || last == NGX_DONE) {
             return last;
         }
+
+        ngx_chain_update_chains(&ctx->free, &ctx->busy, &out, ctx->tag);
+        last_out = &out;
     }
 }