Changeset c7670f for server/src/core/ngx_connection.c

Timestamp:

10/30/09 18:13:41 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

nginx-v0.8

Parents:

178a98

git-author:

George Potapov <nephrite@…> (10/30/09 18:13:41)

git-committer:

George Potapov <nephrite@…> (10/30/09 18:13:41)

Message:

Vendor drop nginx v0.8.21

File:

• server/src/core/ngx_connection.c (modified) (5 diffs)

server/src/core/ngx_connection.c

@@ -16 +16 @@
 ngx_create_listening(ngx_conf_t *cf, void *sockaddr, socklen_t socklen)
 {
+    size_t            len;
     ngx_listening_t  *ls;
     struct sockaddr  *sa;
@@ -37 +38 @@
     ls->socklen = socklen;
 
-    ls->addr_text.len = ngx_sock_ntop(sa, text, NGX_SOCKADDR_STRLEN, 1);
-
-    ls->addr_text.data = ngx_pnalloc(cf->pool, ls->addr_text.len);
-    if (ls->addr_text.data == NULL) {
-        return NULL;
-    }
-
-    ngx_memcpy(ls->addr_text.data, text, ls->addr_text.len);
-
-    ls->fd = (ngx_socket_t) -1;
-    ls->type = SOCK_STREAM;
+    len = ngx_sock_ntop(sa, text, NGX_SOCKADDR_STRLEN, 1);
+    ls->addr_text.len = len;
 
     switch (ls->sockaddr->sa_family) {
@@ -53 +45 @@
     case AF_INET6:
          ls->addr_text_max_len = NGX_INET6_ADDRSTRLEN;
+         break;
+#endif
+#if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+         ls->addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
+         len++;
          break;
 #endif
@@ -62 +60 @@
          break;
     }
+
+    ls->addr_text.data = ngx_pnalloc(cf->pool, len);
+    if (ls->addr_text.data == NULL) {
+        return NULL;
+    }
+
+    ngx_memcpy(ls->addr_text.data, text, len);
+
+    ls->fd = (ngx_socket_t) -1;
+    ls->type = SOCK_STREAM;
 
     ls->backlog = NGX_LISTEN_BACKLOG;
@@ -604 +612 @@
                           ngx_close_socket_n " %V failed", &ls[i].addr_text);
         }
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+
+        if (ls[i].sockaddr->sa_family == AF_UNIX
+            && ngx_process != NGX_PROCESS_WORKER)
+        {
+            u_char *name = ls[i].addr_text.data + sizeof("unix:") - 1;
+
+            if (ngx_delete_file(name) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
+                              ngx_delete_file_n " %s failed", name);
+            }
+        }
+
+#endif
 
         ls[i].fd = (ngx_socket_t) -1;