Changeset dcc916

Timestamp:

03/03/09 16:26:42 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

master-v0.7, nginx-v0.7, nginx-v0.8

Children:

49bd83

Parents:

814513

git-author:

George Potapov <nephrite@…> (03/03/09 16:26:42)

git-committer:

George Potapov <nephrite@…> (03/03/09 16:26:42)

Message:

vendor drop nginx v0.7.38

Location:

server

Files:

• CHANGES (modified) (1 diff)
• CHANGES.ru (modified) (1 diff)
• src/core/nginx.h (modified) (1 diff)
• src/core/ngx_inet.h (modified) (1 diff)
• src/http/modules/ngx_http_auth_basic_module.c (modified) (5 diffs)
• src/http/modules/perl/nginx.pm (modified) (1 diff)
• src/os/unix/ngx_process_cycle.c (modified) (1 diff)

server/CHANGES

@@ +1 @@
+
+Changes with nginx 0.7.38                                        23 Feb 2009
+
+    *) Feature: authentication failures logging.
+
+    *) Bugfix: name/password in auth_basic_user_file were ignored after odd 
+       number of empty lines.
+       Thanks to Alexander Zagrebin.
+
+    *) Bugfix: a segmentation fault occurred in a master process, if long 
+       path was used in unix domain socket; the bug had appeared in 0.7.36.
+
 
 Changes with nginx 0.7.37                                        21 Feb 2009
 
-    *) Bugfix: directive using upstreams did not work; the bug had appeared 
-       in 0.7.36.
+    *) Bugfix: directives using upstreams did not work; the bug had 
+       appeared in 0.7.36.
 
 

server/CHANGES.ru

@@ +1 @@
+
+éÚÍÅÎÅÎÉÑ × nginx 0.7.38                                          23.02.2009
+
+    *) äÏÂÁ×ÌÅÎÉÅ: ÌÏÇÇÉÒÏ×ÁÎÉÅ ÏÛÉÂÏË ÁÕÔÅÎÔÉÆÉËÁÃÉÉ.
+
+    *) éÓÐÒÁ×ÌÅÎÉÅ: ÉÍÑ/ÐÁÒÏÌØ, ÚÁÄÁÎÎÙÅ × auth_basic_user_file, 
+       ÉÇÎÏÒÉÒÏ×ÁÌÉÓØ ÐÏÓÌÅ ÎÅÞ£ÔÎÏÇÏ ÞÉÓÌÁ ÐÕÓÔÙÈ ÓÔÒÏË.
+       óÐÁÓÉÂÏ áÌÅËÓÁÎÄÒÕ úÁÇÒÅÂÉÎÕ.
+
+    *) éÓÐÒÁ×ÌÅÎÉÅ: ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÄÌÉÎÎÏÇÏ ÐÕÔÉ × unix domain ÓÏËÅÔÅ × 
+       ÇÌÁ×ÎÏÍ ÐÒÏÃÅÓÓÅ ÐÒÏÉÓÈÏÄÉÌ segmentation fault; ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 
+       0.7.36.
+
 
 éÚÍÅÎÅÎÉÑ × nginx 0.7.37                                          21.02.2009

server/src/core/nginx.h

@@ -9 +9 @@
 
 
-#define NGINX_VERSION      "0.7.37"
+#define NGINX_VERSION      "0.7.38"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 

server/src/core/ngx_inet.h

@@ -23 +23 @@
  * TODO: autoconfigure NGX_SOCKADDRLEN as
  *       sizeof(struct sockaddr_storage)
+ *       sizeof(struct sockaddr_un)
  *       sizeof(struct sockaddr_in6)
  *       sizeof(struct sockaddr_in)
  */
 
-#if (NGX_HAVE_INET6)
-#define NGX_SOCKADDRLEN       sizeof(struct sockaddr_in6)
+#if (NGX_HAVE_UNIX_DOMAIN)
+#define NGX_SOCKADDRLEN       sizeof(struct sockaddr_un)
 #else
-#define NGX_SOCKADDRLEN       sizeof(struct sockaddr_in)
+#define NGX_SOCKADDRLEN       512
 #endif
 

server/src/http/modules/ngx_http_auth_basic_module.c

@@ -127 +127 @@
 
     if (rc == NGX_DECLINED) {
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "no user/password was provided for basic authentication");
+
         return ngx_http_auth_basic_set_realm(r, &alcf->realm);
     }
@@ -173 +177 @@
 
             case sw_login:
-                if (login == 0 && buf[i] == '#') {
-                    state = sw_skip;
-                    break;
+                if (login == 0) {
+
+                    if (buf[i] == '#' || buf[i] == CR) {
+                        state = sw_skip;
+                        break;
+                    }
+
+                    if (buf[i] == LF) {
+                        break;
+                    }
                 }
 
@@ -243 +254 @@
     }
 
+    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                  "user \"%V\" was not found in \"%V\"",
+                  &r->headers_in.user, &alcf->user_file);
+
     return ngx_http_auth_basic_set_realm(r, &alcf->realm);
 }
@@ -258 +273 @@
 
     ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                  "rc: %d user: \"%V\" salt: \"%s\"",
-                  rc, &r->headers_in.user, passwd->data);
+                   "rc: %d user: \"%V\" salt: \"%s\"",
+                   rc, &r->headers_in.user, passwd->data);
 
     if (rc == NGX_OK) {
@@ -268 +283 @@
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "encrypted: \"%s\"", encrypted);
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "user \"%V\": password mismatch",
+                      &r->headers_in.user);
 
         return ngx_http_auth_basic_set_realm(r, realm);

server/src/http/modules/perl/nginx.pm

@@ -48 +48 @@
 );
 
-our $VERSION = '0.7.37';
+our $VERSION = '0.7.38';
 
 require XSLoader;

server/src/os/unix/ngx_process_cycle.c

@@ -1005 +1005 @@
             {
                 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
-                              "open socket #%d left in %ui connection %s",
+                              "open socket #%d left in connection %ui%s",
                               c[i].fd, i, ngx_debug_quit ? ", aborting" : "");
                 ngx_debug_point();