From: Jeff Trawick <trawick@apache.org>
Date: Thu, 5 Sep 2013 16:33:11 +0000 (+0000)
Subject: Mistakenly try to use a line comment to the end of your Listen
X-Git-Tag: 2.5.0-alpha~5102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dedba685f4789918c29833391efcdf316217d629;p=apache

Mistakenly try to use a line comment to the end of your Listen
directive on Windows => crash-o-matic

Or,

WinNT MPM: Don't crash during child process initialization if the
Listen protocol is unrecognized.


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

diff --git a/CHANGES b/CHANGES
index f142a7d0dc..6f3d2f98ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) WinNT MPM: Don't crash during child process initialization if the
+     Listen protocol is unrecognized.  [Jeff Trawick]
+
   *) mod_lua: add setcookie and getcookie functions to the request_rec struct.
      [Daniel Gruno]
 
diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index 17ab988c3d..4aabc755bc 100644
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-2531
+2532
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index da9f0a09c1..bda0d71c73 100644
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -315,7 +315,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;