fix bug: crash when notify addr is invalid

pingostack · May 11, 2021 · 03b481d · 03b481d
1 parent 76a1a65
commit 03b481d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,5 @@ openresty/
 .DS_Store
 h5player/
 .vscode/
-nginx/
 source/
 rpmbuild/
diff --git a/modules/nginx-client-module/ngx_client.c b/modules/nginx-client-module/ngx_client.c
@@ -616,7 +616,7 @@ ngx_client_write_handler(ngx_event_t *ev)
             "nginx client write handler");
 
     if (!s->connected) {
-        ngx_client_connected(s);
+        ngx_client_close(s);
 
         return;
     }

diff --git a/modules/nginx-multiport-module/ngx_event_multiport_module.c b/modules/nginx-multiport-module/ngx_event_multiport_module.c
@@ -238,7 +238,10 @@ ngx_event_multiport_init_listening(ngx_cycle_t *cycle, ngx_listening_t *ls,
 
     ls->pool_size = cls->pool_size;
     ls->post_accept_buffer_size = cls->post_accept_buffer_size;
+
+#if (nginx_version < 1019007)
     ls->post_accept_timeout = cls->post_accept_timeout;
+#endif
 
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
     ls->ipv6only = cls->ipv6only;

diff --git a/release.sh b/release.sh
@@ -205,7 +205,7 @@ cd nginx
 
 if [ ! -f "Makefile" ]
 then
-    config="./configure"
+    config="./auto/configure"
     for option in ${options[*]}
     do
         config=$config" "$option

diff --git a/resource/conf-template/nginx.conf b/resource/conf-template/nginx.conf
@@ -132,13 +132,13 @@ http {
             sys_stat;
         }
 
-        location /proxy/ {
+        location /sys_stat_proxy/ {
                 rewrite ^/proxy/(.*) /sys_stat break;
                 proxy_pass http://$1:;
         }
 
         location /bs {
-            broadcast unix:/tmp/http /proxy;
+            broadcast unix:/tmp/http /sys_stat_proxy;
             broadcast_rewrite_prefix " " [;
             broadcast_suffix ];
         }