ben 99/06/20 04:19:48
Modified: mpm/src/include httpd.h
mpm/src/main http_protocol.c http_vhost.c mpm_prefork.c
Log:
Server is not a per-connection thing. This also makes virtual hosts work
better.
Revision Changes Path
1.2 +0 -1 apache-2.0/mpm/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/include/httpd.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd.h 1999/06/18 18:39:28 1.1
+++ httpd.h 1999/06/20 11:19:45 1.2
@@ -833,7 +833,6 @@
struct conn_rec {
ap_pool *pool;
- server_rec *server;
server_rec *base_server; /* Physical vhost this conn come in on */
void *vhost_lookup_data; /* used by http_vhost.c */
1.5 +1 -2 apache-2.0/mpm/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_protocol.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_protocol.c 1999/06/19 20:23:37 1.4
+++ http_protocol.c 1999/06/20 11:19:46 1.5
@@ -931,8 +931,7 @@
r = ap_pcalloc(p, sizeof(request_rec));
r->pool = p;
r->connection = conn;
- conn->server = conn->base_server;
- r->server = conn->server;
+ r->server = conn->base_server;
conn->keptalive = conn->keepalive == 1;
conn->keepalive = 0;
1.2 +4 -4 apache-2.0/mpm/src/main/http_vhost.c
Index: http_vhost.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_vhost.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- http_vhost.c 1999/06/18 18:39:30 1.1
+++ http_vhost.c 1999/06/20 11:19:46 1.2
@@ -832,7 +832,7 @@
found:
/* s is the first matching server, we're done */
- r->server = r->connection->server = s;
+ r->server = s;
}
@@ -871,7 +871,7 @@
(s->path[s->pathlen - 1] == '/' ||
r->uri[s->pathlen] == '/' ||
r->uri[s->pathlen] == '\0')) {
- r->server = r->connection->server = s;
+ r->server = s;
return;
}
}
@@ -907,7 +907,7 @@
if (trav) {
/* save the name_chain for later in case this is a name-vhost */
conn->vhost_lookup_data = trav->names;
- conn->server = trav->server;
+ conn->base_server = trav->server;
return;
}
@@ -919,7 +919,7 @@
/* maybe there's a default server matching this port */
trav = find_default_server(port);
if (trav) {
- conn->server = trav->server;
+ conn->base_server = trav->server;
}
/* otherwise we're stuck with just the main server */
1.3 +3 -4 apache-2.0/mpm/src/main/mpm_prefork.c
Index: mpm_prefork.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/main/mpm_prefork.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpm_prefork.c 1999/06/19 21:56:27 1.2
+++ mpm_prefork.c 1999/06/20 11:19:47 1.3
@@ -835,10 +835,10 @@
if (timeout_req != NULL)
dirconf = timeout_req->per_dir_config;
else
- dirconf = current_conn->server->lookup_defaults;
+ dirconf = current_conn->base_server->lookup_defaults;
if (!current_conn->keptalive) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
- current_conn->server, "[client %s] %s timed out",
+ current_conn->base_server, "[client %s] %s timed out",
current_conn->remote_ip,
timeout_name ? timeout_name : "request");
}
@@ -2434,8 +2434,7 @@
conn->pool = p;
conn->local_addr = *saddr;
- conn->server = server; /* just a guess for now */
- conn->base_server = conn->server;
+ conn->base_server = server;
conn->client = inout;
conn->remote_addr = *remaddr;
