Get "NameVirtualHost *" option working in Apache 2.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87393 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 21c1b79d81dd70dab61e48d850c86ad5c7224ab4..bb5c9d8b8c06db6679efe6e741a12093cb08aae1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 Changes with Apache 2.0b1
+  *) Get "NameVirtualHost *" working in 2.0.  [Ryan Bloom]
+
   *) Return HTTP_RANGE_NOT_SATISFIABLE if the every range requested starts
      after the end of the response. [Ryan Bloom]
 

diff --git a/server/vhost.c b/server/vhost.c
index 5b4cb1ee65392383739bc03dea6a9e1d014e660a..57d383a703a224e56ce8348e1d924654972999fc 100644 (file)
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -219,7 +219,10 @@ static const char *get_addresses(apr_pool_t *p, const char *w_,
         port = default_port;
     }
 
-    if (strcasecmp(host, "_default_") == 0
+    if (strcmp(host, "*") == 0) {
+        rv = apr_getaddrinfo(&my_addr, NULL, APR_INET, port, 0, p);
+        my_addr->sa.sin.sin_addr.s_addr = htonl(INADDR_ANY);
+    } else if (strcasecmp(host, "_default_") == 0
         || strcmp(host, "255.255.255.255") == 0) {
         rv = apr_getaddrinfo(&my_addr, NULL, APR_INET, port, 0, p);
         ap_assert(rv == APR_SUCCESS); /* must be bug or out of storage */