summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2004-04-15 22:36:45 +0200
committerJoe Orton <jorton@apache.org>2004-04-15 22:36:45 +0200
commitb39f62cdc463c450a54d03d172e3f3329de619ee (patch)
treeb995406becdaf5ba1c075c2d718f7d5847ae2b34 /server
parentSynch with 2.0 branch. (diff)
downloadapache2-b39f62cdc463c450a54d03d172e3f3329de619ee.tar.xz
apache2-b39f62cdc463c450a54d03d172e3f3329de619ee.zip
* server/vhost.c (remove_unused_name_vhosts): Remove redundant check;
catch all port-based NameVirtualHosts without defined VirtualHosts, preventing segfaults later in some misconfigurations. PR: 27731 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103400 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
-rw-r--r--server/vhost.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/server/vhost.c b/server/vhost.c
index 5c04d11be0..9ea6782296 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -500,12 +500,6 @@ static void remove_unused_name_vhosts(server_rec *main_s, ipaddr_chain **pic)
ic->sar->virthost, ic->sar->host_port);
*pic = ic->next;
}
- else if (ic->names == NULL) {
- /* if server != NULL and names == NULL then we're done
- * looking at NameVirtualHosts
- */
- break;
- }
else {
pic = &ic->next;
}