Merge r1367819 from trunk:

initialize the protocol field when manufacturing an apr socket
lest accidential autodata contents leak into the apr_socket_t

(this doesn't address any known problem symptom)

Submitted by: trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1373109 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 5a790029d8fe66384f68bf13f8aaf1f724b9dba1..21a0044a77f937fd747e34d1972535b57d348069 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -94,20 +94,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: rjung, humbedooh, trawick (needs CHANGES entry)
      -0: What should CHANGES say???
 
-   * PR 52476: SSL failures on Windows with AcceptFilter https none
-     trunk patch: http://svn.apache.org/viewvc?rev=1371801&view=rev
-     2.4.x patch: trunk patch works
-     Questions/explanations: http://mail-archives.apache.org/mod_mbox/httpd-dev/201208.mbox/%3C20120813123221.GA21932%40redhat.com%3E
-     +1: trawick, gsmith, jim
-
-   * mpm_winnt: initialize the protocol field when manufacturing an apr socket
-     lest accidential autodata contents leak into the apr_socket_t.
-     (this doesn't address any known problem symptom)
-     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1367819
-     2.4.x patch: trunk patch works
-     +1: rjung, trawick, jim
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 8859fac319fbe523e470b5b439883354827efddf..ae34b07bb60d3c3b1e8be419ec4957238b9385cd 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -649,11 +649,12 @@ reinit: /* target of data or connect upon too many AcceptEx failures */
             }
         }
 
-        sockinfo.os_sock = &context->accept_socket;
-        sockinfo.local   = context->sa_server;
-        sockinfo.remote  = context->sa_client;
-        sockinfo.family  = context->sa_server->sa_family;
-        sockinfo.type    = SOCK_STREAM;
+        sockinfo.os_sock  = &context->accept_socket;
+        sockinfo.local    = context->sa_server;
+        sockinfo.remote   = context->sa_client;
+        sockinfo.family   = context->sa_server->sa_family;
+        sockinfo.type     = SOCK_STREAM;
+        sockinfo.protocol = IPPROTO_TCP;
         /* Restore the state corresponding to apr_os_sock_make's default
          * assumption of timeout -1 (really, a flaw of os_sock_make and
          * os_sock_put that it does not query to determine ->timeout).