From c381151ce713954ad1a9e01e3d52e1276f252b70 Mon Sep 17 00:00:00 2001
From: "agentzh (Yichun Zhang)" <agentzh@gmail.com>
Date: Mon, 17 Sep 2012 11:47:04 -0700
Subject: [PATCH] checked in the new patch channel-uninit-params for nginx
 1.2.3 and 1.3.6.

---
 .../nginx-1.2.3-channel-uninit-params.patch   | 42 +++++++++++++++++++
 .../nginx-1.3.6-channel-uninit-params.patch   | 42 +++++++++++++++++++
 util/mirror-tarballs                          |  3 ++
 3 files changed, 87 insertions(+)
 create mode 100644 patches/nginx-1.2.3-channel-uninit-params.patch
 create mode 100644 patches/nginx-1.3.6-channel-uninit-params.patch

diff --git a/patches/nginx-1.2.3-channel-uninit-params.patch b/patches/nginx-1.2.3-channel-uninit-params.patch
new file mode 100644
index 0000000..cfb9ca2
--- /dev/null
+++ b/patches/nginx-1.2.3-channel-uninit-params.patch
@@ -0,0 +1,42 @@
+diff -urp nginx-1.2.3/src/os/unix/ngx_channel.c nginx-1.2.3-patched/src/os/unix/ngx_channel.c
+--- nginx-1.2.3/src/os/unix/ngx_channel.c	2012-01-18 07:07:43.000000000 -0800
++++ nginx-1.2.3-patched/src/os/unix/ngx_channel.c	2012-09-17 11:33:09.215394217 -0700
+@@ -31,6 +31,8 @@ ngx_write_channel(ngx_socket_t s, ngx_ch
+         msg.msg_controllen = 0;
+ 
+     } else {
++        ngx_memzero(&cmsg, sizeof(cmsg));
++
+         msg.msg_control = (caddr_t) &cmsg;
+         msg.msg_controllen = sizeof(cmsg);
+ 
+diff -urp nginx-1.2.3/src/os/unix/ngx_process_cycle.c nginx-1.2.3-patched/src/os/unix/ngx_process_cycle.c
+--- nginx-1.2.3/src/os/unix/ngx_process_cycle.c	2012-07-02 09:23:14.000000000 -0700
++++ nginx-1.2.3-patched/src/os/unix/ngx_process_cycle.c	2012-09-17 11:33:09.214394215 -0700
+@@ -356,6 +356,8 @@ ngx_start_worker_processes(ngx_cycle_t *
+ 
+     ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "start worker processes");
+ 
++    ngx_memzero(&ch, sizeof(ngx_channel_t));
++
+     ch.command = NGX_CMD_OPEN_CHANNEL;
+ 
+     for (i = 0; i < n; i++) {
+@@ -463,6 +465,8 @@ ngx_signal_worker_processes(ngx_cycle_t
+     ngx_err_t      err;
+     ngx_channel_t  ch;
+ 
++    ngx_memzero(&ch, sizeof(ngx_channel_t));
++
+ #if (NGX_BROKEN_SCM_RIGHTS)
+ 
+     ch.command = 0;
+@@ -564,6 +568,8 @@ ngx_reap_children(ngx_cycle_t *cycle)
+     ngx_channel_t     ch;
+     ngx_core_conf_t  *ccf;
+ 
++    ngx_memzero(&ch, sizeof(ngx_channel_t));
++
+     ch.command = NGX_CMD_CLOSE_CHANNEL;
+     ch.fd = -1;
+ 
diff --git a/patches/nginx-1.3.6-channel-uninit-params.patch b/patches/nginx-1.3.6-channel-uninit-params.patch
new file mode 100644
index 0000000..9c861ca
--- /dev/null
+++ b/patches/nginx-1.3.6-channel-uninit-params.patch
@@ -0,0 +1,42 @@
+diff -urp nginx-1.3.6/src/os/unix/ngx_channel.c nginx-1.3.6-patched/src/os/unix/ngx_channel.c
+--- nginx-1.3.6/src/os/unix/ngx_channel.c	2012-01-18 07:07:43.000000000 -0800
++++ nginx-1.3.6-patched/src/os/unix/ngx_channel.c	2012-09-17 11:33:09.215394217 -0700
+@@ -31,6 +31,8 @@ ngx_write_channel(ngx_socket_t s, ngx_ch
+         msg.msg_controllen = 0;
+ 
+     } else {
++        ngx_memzero(&cmsg, sizeof(cmsg));
++
+         msg.msg_control = (caddr_t) &cmsg;
+         msg.msg_controllen = sizeof(cmsg);
+ 
+diff -urp nginx-1.3.6/src/os/unix/ngx_process_cycle.c nginx-1.3.6-patched/src/os/unix/ngx_process_cycle.c
+--- nginx-1.3.6/src/os/unix/ngx_process_cycle.c	2012-07-02 09:23:14.000000000 -0700
++++ nginx-1.3.6-patched/src/os/unix/ngx_process_cycle.c	2012-09-17 11:33:09.214394215 -0700
+@@ -356,6 +356,8 @@ ngx_start_worker_processes(ngx_cycle_t *
+ 
+     ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "start worker processes");
+ 
++    ngx_memzero(&ch, sizeof(ngx_channel_t));
++
+     ch.command = NGX_CMD_OPEN_CHANNEL;
+ 
+     for (i = 0; i < n; i++) {
+@@ -463,6 +465,8 @@ ngx_signal_worker_processes(ngx_cycle_t
+     ngx_err_t      err;
+     ngx_channel_t  ch;
+ 
++    ngx_memzero(&ch, sizeof(ngx_channel_t));
++
+ #if (NGX_BROKEN_SCM_RIGHTS)
+ 
+     ch.command = 0;
+@@ -564,6 +568,8 @@ ngx_reap_children(ngx_cycle_t *cycle)
+     ngx_channel_t     ch;
+     ngx_core_conf_t  *ccf;
+ 
++    ngx_memzero(&ch, sizeof(ngx_channel_t));
++
+     ch.command = NGX_CMD_CLOSE_CHANNEL;
+     ch.fd = -1;
+ 
diff --git a/util/mirror-tarballs b/util/mirror-tarballs
index 8ad6a8d..a04b685 100755
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@@ -96,6 +96,9 @@ patch -p1 < $root/patches/nginx-$main_ver-location_if_inherits_proxy.patch || ex
 echo applying nonbuffered-upstream-truncation.patch ...
 patch -p1 < $root/patches/nginx-$main_ver-nonbuffered-upstream-truncation.patch || exit 1
 
+echo applying channel-uninit-params.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-channel-uninit-params.patch || exit 1
+
 echo applying dtrace.patch ...
 patch -p1 < $root/patches/nginx-$main_ver-dtrace.patch || exit 1