From: Allan K. Edwards <ake@apache.org>
Date: Tue, 22 Mar 2005 21:50:54 +0000 (+0000)
Subject: Fix Windows CompContext buff size miscalculation
X-Git-Tag: 2.1.5~272
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e807f6b3c3d8a47857120d0bf7130896251be05e;p=thirdparty%2Fapache%2Fhttpd.git

Fix Windows CompContext buff size miscalculation


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@158685 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 8c4b0e27278..98f4a3b5d51 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@ Changes with Apache 2.1.5
 
 Changes with Apache 2.1.4
 
+  *) Fix Windows CompContext buff size miscalculation
+     [Allan Edwards]
+
   *) Add ReceiveBufferSize directive to control the TCP receive buffer.
      [Eric Covener <covener gmail.com>]
 
diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index 7332e740577..dce956c39aa 100644
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -87,9 +87,9 @@ AP_DECLARE(void) ap_signal_parent(ap_signal_parent_e type);
                                                   (PCHAR)(address) - \
                                                   (PCHAR)(&((type *)0)->field)))
 #if APR_HAVE_IPV6
-#define PADDED_ADDR_SIZE sizeof(SOCKADDR_IN6)+16
+#define PADDED_ADDR_SIZE (sizeof(SOCKADDR_IN6)+16)
 #else
-#define PADDED_ADDR_SIZE sizeof(SOCKADDR_IN)+16
+#define PADDED_ADDR_SIZE (sizeof(SOCKADDR_IN)+16)
 #endif
 
 typedef struct CompContext {