File descriptor passing code: set msg_controllen for better portability.

phusion · May 6, 2008 · a5abd87 · a5abd87
1 parent db775b0
commit a5abd87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/ext/apache2/MessageChannel.h b/ext/apache2/MessageChannel.h
@@ -282,6 +282,8 @@ class MessageChannel {
 		control_header->cmsg_type  = SCM_RIGHTS;
 		memcpy(CMSG_DATA(control_header), &fileDescriptor, sizeof(int));
 
+		msg.msg_controllen = control_header->cmsg_len;
+
 		if (sendmsg(fd, &msg, 0) == -1) {
 			throw SystemException("Cannot send file descriptor with sendmsg()", errno);
 		}

diff --git a/ext/passenger/native_support.c b/ext/passenger/native_support.c
@@ -68,6 +68,8 @@ send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
 	control_payload = NUM2INT(fd_to_send);
 	memcpy(CMSG_DATA(control_header), &control_payload, sizeof(int));
 
+	msg.msg_controllen = control_header->cmsg_len;
+
 	if (sendmsg(NUM2INT(socket_fd), &msg, 0) == -1) {
 		rb_sys_fail("sendmsg(2)");
 		return Qnil;