diff options
| author | Jeff Trawick <trawick@apache.org> | 2000-12-14 19:47:30 +0100 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2000-12-14 19:47:30 +0100 |
| commit | b1e8b050e9f11e3e3302b5eeb11ad8170128e2c2 (patch) | |
| tree | 8c1990510d37aa5f55123c3f0d4c02129f4b0eec /server/vhost.c | |
| parent | Suppress xcopy prompt during installation (diff) | |
| download | apache2-b1e8b050e9f11e3e3302b5eeb11ad8170128e2c2.tar.xz apache2-b1e8b050e9f11e3e3302b5eeb11ad8170128e2c2.zip | |
The local_addr and remote_addr fields in the conn_rec are now
apr_sockaddr_t * instead of sockaddr_in. This is a small step
towards IPv6 support.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87342 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/vhost.c')
| -rw-r--r-- | server/vhost.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/server/vhost.c b/server/vhost.c index a5f83b0288..4a2d784445 100644 --- a/server/vhost.c +++ b/server/vhost.c @@ -967,13 +967,12 @@ void ap_update_vhost_given_ip(conn_rec *conn) { ipaddr_chain *trav; apr_port_t port; - apr_sockaddr_t *localsa; - apr_get_sockaddr(&localsa, APR_LOCAL, conn->client_socket); - apr_get_port(&port, localsa); + apr_get_port(&port, conn->local_addr); /* scan the hash apr_table_t for an exact match first */ - trav = find_ipaddr(&conn->local_addr.sin_addr, port); + /* XXX IPv6 issues handled in an uncommitted patch */ + trav = find_ipaddr(&conn->local_addr->sa.sin.sin_addr, port); if (trav) { /* save the name_chain for later in case this is a name-vhost */ conn->vhost_lookup_data = trav->names; |