WinNT MPM: crash-o-matic with "Listen <portnumber> <unrecognized>"

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

Submitted by: trawick
Reviewed by: covener, humbedooh

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

diff --git a/CHANGES b/CHANGES
index 4695a6710b13e943990d42f7db016aa439ade7aa..0fa06e5bc1b37061575ef5032022b344ae3170d5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]

diff --git a/STATUS b/STATUS
index 92557cfdbf98387bcadaa507afa04e820ad0b4f5..d353e8f4f10e70af8cd261a120f7eb59c2cb4059 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 ]
 

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 7983851a86ab32e71735fa76a7d53981dbf12269..aa7f557f04e18b54ea43c52b4cc933cc586fc6a8 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -296,7 +296,15 @@ static unsigned int __stdcall winnt_accept(void *lr_)
     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;