aboutsummaryrefslogtreecommitdiff
path: root/server_http.c
diff options
context:
space:
mode:
Diffstat (limited to 'server_http.c')
-rw-r--r--server_http.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/server_http.c b/server_http.c
index 1a48b4a..0113a82 100644
--- a/server_http.c
+++ b/server_http.c
@@ -617,6 +617,8 @@ server_reset_http(struct client *clt)
{
struct server *srv = clt->clt_srv;
+ server_log(clt, NULL);
+
server_httpdesc_free(clt->clt_descreq);
server_httpdesc_free(clt->clt_descresp);
clt->clt_headerlen = 0;
@@ -627,8 +629,6 @@ server_reset_http(struct client *clt)
clt->clt_remote_user = NULL;
clt->clt_bev->readcb = server_read_http;
clt->clt_srv_conf = &srv->srv_conf;
-
- server_log(clt, NULL);
}
ssize_t
@@ -998,7 +998,7 @@ server_getlocation(struct client *clt, const char *path)
}
#endif
if ((location->flags & SRVFLAG_LOCATION) &&
- location->id == srv_conf->id &&
+ location->parent_id == srv_conf->parent_id &&
fnmatch(location->location, path, FNM_CASEFOLD) == 0) {
/* Replace host configuration */
clt->clt_srv_conf = srv_conf = location;