From: Joe Orton <jorton@apache.org>
Date: Thu, 12 Apr 2018 14:47:38 +0000 (+0000)
Subject: * server/vhost.c: Remove redundant vhost_check_config hook which never
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2688
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=528f71d454efba2288501b441bd84e9690014548;p=thirdparty%2Fapache%2Fhttpd.git

* server/vhost.c: Remove redundant vhost_check_config hook which never
  fails, r1053230 removed all the places where config_error was set.


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

diff --git a/server/vhost.c b/server/vhost.c
index f71deb49488..dc9689d2c0e 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -98,13 +98,6 @@ static ipaddr_chain *iphash_table[IPHASH_TABLE_SIZE];
 /* list of the _default_ servers */
 static ipaddr_chain *default_list;
 
-/* whether a config error was seen */
-static int config_error = 0;
-
-/* config check function */
-static int vhost_check_config(apr_pool_t *p, apr_pool_t *plog,
-                              apr_pool_t *ptemp, server_rec *s);
-
 /*
  * How it's used:
  *
@@ -133,7 +126,6 @@ AP_DECLARE(void) ap_init_vhost_config(apr_pool_t *p)
 {
     memset(iphash_table, 0, sizeof(iphash_table));
     default_list = NULL;
-    ap_hook_check_config(vhost_check_config, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 
@@ -694,12 +686,6 @@ AP_DECLARE(void) ap_fini_vhost_config(apr_pool_t *p, server_rec *main_s)
     }
 }
 
-static int vhost_check_config(apr_pool_t *p, apr_pool_t *plog,
-                              apr_pool_t *ptemp, server_rec *s)
-{
-    return config_error ? !OK : OK;
-}
-
 /*****************************************************************************
  * run-time vhost matching functions
  */