summaryrefslogtreecommitdiffstats
path: root/server/vhost.c
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2018-09-12 15:06:00 +0200
committerEric Covener <covener@apache.org>2018-09-12 15:06:00 +0200
commit8167ffff20f98830770313137b13c03d8e485308 (patch)
treecfba9a1863b1e27cdd68cbe37c2da21609aa282e /server/vhost.c
parentFollow up to r1840265: really privatize ap_filter_{recycle,adopt_brigade}(). (diff)
downloadapache2-8167ffff20f98830770313137b13c03d8e485308.tar.xz
apache2-8167ffff20f98830770313137b13c03d8e485308.zip
move the assignment to the end of the loop.
This is more readable and isn't miscompiled w/ -O3 on a certain unnamed EBCDIC platforms compiler. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1840678 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/vhost.c')
-rw-r--r--server/vhost.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/vhost.c b/server/vhost.c
index 5b1d8742c5..9dbd1691f3 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -1041,7 +1041,6 @@ static int update_server_from_aliases(request_rec *r)
goto found;
}
}
- last_s = s;
/* Fallback: does it match the virthost from the sar? */
if (!strcasecmp(host, sar->virthost)) {
@@ -1050,6 +1049,8 @@ static int update_server_from_aliases(request_rec *r)
virthost_s = s;
}
}
+
+ last_s = s;
}
/* If ServerName and ServerAlias check failed, we end up here. If it