httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1373109 - in /httpd/httpd/branches/2.4.x: ./ STATUS server/mpm/winnt/child.c
Date Tue, 14 Aug 2012 21:11:30 GMT
Author: jim
Date: Tue Aug 14 21:11:29 2012
New Revision: 1373109

URL: http://svn.apache.org/viewvc?rev=1373109&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1367819

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1373109&r1=1373108&r2=1373109&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Aug 14 21:11:29 2012
@@ -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 ]
 

Modified: httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c?rev=1373109&r1=1373108&r2=1373109&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c Tue Aug 14 21:11:29 2012
@@ -649,11 +649,12 @@ reinit: /* target of data or connect upo
             }
         }
 
-        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).



Mime
View raw message