commit b0869056bb4385a6b30fc58c653716c45ed33916
author Igor Sysoev <igor@sysoev.ru> Tue Dec 10 18:05:12 2002 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Dec 10 18:05:12 2002 +0000
tree 8522c66320ee59e4671f23058a971d9556d1a6a0
parent ef259d140f378be8d7936d04038354a93cccb461

nginx-0.0.1-2002-12-10-21:05:12 import

src/core/nginx.c

diff --git a/src/core/nginx.c b/src/core/nginx.c
index b2f3f5f..b33ce29 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -18,6 +18,7 @@
 /* */
 
 
+static void ngx_set_signals(ngx_log_t *log);
 static void ngx_open_listening_sockets(ngx_log_t *log);
 
 
@@ -42,6 +43,8 @@
     ngx_pool = ngx_create_pool(16 * 1024, &ngx_log);
     /* */
 
+    ngx_set_signals(&ngx_log);
+
     ngx_init_sockets(&ngx_log);
 
     /* TODO: read config */
@@ -70,6 +73,20 @@
     return 0;
 }
 
+static void ngx_set_signals(ngx_log_t *log)
+{
+    struct sigaction sa;
+
+    ngx_memzero(&sa, sizeof(struct sigaction));
+    sa.sa_handler = SIG_IGN;
+    sigemptyset(&sa.sa_mask);
+    if (sigaction(SIGPIPE, &sa, NULL) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                      "sigaction(SIGPIPE, SIG_IGN) failed");
+        exit(1);
+    }
+}
+
 static void ngx_open_listening_sockets(ngx_log_t *log)
 {
     int           times, failed, reuseaddr, i;

src/core/ngx_connection.h

diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 2450ea3..b486f4b 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -5,6 +5,7 @@
 #include <ngx_log.h>
 #include <ngx_hunk.h>
 #include <ngx_alloc.h>
+#include <ngx_string.h>
 #include <ngx_server.h>
 
 typedef struct ngx_connection_s  ngx_connection_t;
@@ -38,8 +39,7 @@
     struct sockaddr  *sockaddr;
     socklen_t         socklen;
     size_t            addr;
-    char             *addr_text;
-    size_t            addr_textlen;
+    ngx_str_t         addr_text;
 
     ngx_hunk_t       *buffer;
     unsigned int      post_accept_timeout;

src/core/ngx_listen.h

diff --git a/src/core/ngx_listen.h b/src/core/ngx_listen.h
index 8108d83..cf4a2ad 100644
--- a/src/core/ngx_listen.h
+++ b/src/core/ngx_listen.h
@@ -14,8 +14,7 @@
     struct sockaddr  *sockaddr;
     socklen_t         socklen;
     size_t            addr;
-    char             *addr_text;
-    size_t            addr_textlen;
+    ngx_str_t         addr_text;
 
     int           family;
     int           type;