httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1523261 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/mpm/winnt/child.c
Date Sat, 14 Sep 2013 14:51:49 GMT
Author: minfrin
Date: Sat Sep 14 14:51:48 2013
New Revision: 1523261

URL: http://svn.apache.org/r1523261
Log:
WinNT MPM: crash-o-matic with "Listen <portnumber> <unrecognized>"

trunk patch: http://svn.apache.org/r1520368

Submitted by: trawick
Reviewed by: covener, humbedooh

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    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:r1520368

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1523261&r1=1523260&r2=1523261&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Sep 14 14:51:48 2013
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.7
 
+  *) WinNT MPM: Don't crash during child process initialization if the
+     Listen protocol is unrecognized.  [Jeff Trawick]
+
   *) modules: Fix some compiler warnings. [Guenter Knauf]
 
   * skiplist: Add skiplist capability to httpd [Jim Jagielski]

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1523261&r1=1523260&r2=1523261&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Sep 14 14:51:48 2013
@@ -159,12 +159,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     +1: covener, jim, humbedooh
 
 
-  * WinNT MPM: crash-o-matic with "Listen <portnumber> <unrecognized>"
-    trunk patch: http://svn.apache.org/r1520368
-    2.4.x patch: trunk patch works
-    +1: trawick, covener, humbedooh
-
-
 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=1523261&r1=1523260&r2=1523261&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 Sat Sep 14 14:51:48 2013
@@ -296,7 +296,15 @@ static unsigned int __stdcall winnt_acce
     core_sconf = ap_get_core_module_config(ap_server_conf->module_config);
     accf_name = apr_table_get(core_sconf->accf_map, lr->protocol);
 
-    if (strcmp(accf_name, "data") == 0)
+    if (!accf_name) {
+        accf = 0;
+        accf_name = "none";
+        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf,
+                     APLOGNO(02531) "winnt_accept: Listen protocol '%s' has "
+                     "no known accept filter. Using 'none' instead",
+                     lr->protocol);
+    }
+    else if (strcmp(accf_name, "data") == 0)
         accf = 2;
     else if (strcmp(accf_name, "connect") == 0)
         accf = 1;



Mime
View raw message