Mercurial > hg > nginx

changeset 3371:102fdc22de4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
chmod unix listen domain socket to 0666
author Igor Sysoev <igor@sysoev.ru>
date Mon, 30 Nov 2009 11:26:24 +0000
parents bfe37ab335b5
children 6b8e5c882e47
files src/core/ngx_connection.c
diffstat 1 files changed, 16 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -374,12 +374,23 @@ ngx_open_listening_sockets(ngx_cycle_t *
 
 #if (NGX_HAVE_UNIX_DOMAIN)
 
-            if (ngx_test_config && ls[i].sockaddr->sa_family == AF_UNIX) {
-                u_char *name = ls[i].addr_text.data + sizeof("unix:") - 1;
+            if (ls[i].sockaddr->sa_family == AF_UNIX) {
+                mode_t   mode;
+                u_char  *name;
+
+                name = ls[i].addr_text.data + sizeof("unix:") - 1;
+                mode = (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
 
-                if (ngx_delete_file(name) == -1) {
-                    ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
-                                  ngx_delete_file_n " %s failed", name);
+                if (chmod((char *) name, mode) == -1) {
+                    ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                                  "chmod() \"%s\" failed", name);
+                }
+
+                if (ngx_test_config) {
+                    if (ngx_delete_file(name) == -1) {
+                        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                                      ngx_delete_file_n " %s failed", name);
+                    }
                 }
             }
 #endif