Merge branch 'upstream'

diff --git a/VERSION b/VERSION
index 1866a362b7bef6cc0e128e9d3f846fdb6b179858..3eefcb9dd5b38e2c1dc061052455dd97bcd51e6c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.9
+1.0.0

diff --git a/mod_vhost_ldap.c b/mod_vhost_ldap.c
index cdfe89ca2e3fc7047762ed54574c85793493a4c4..ff8a61d73248d79c2f3c660cf7ceea4d587ff481 100644 (file)
--- a/mod_vhost_ldap.c
+++ b/mod_vhost_ldap.c
@@ -540,10 +540,10 @@ fallback:
        return DECLINED;
     }
 
-    r->server->server_hostname = apr_pstrdup (top->pool, reqc->name);
+    top->server->server_hostname = apr_pstrdup (top->pool, reqc->name);
 
     if (reqc->admin) {
-       r->server->server_admin = apr_pstrdup (top->pool, reqc->admin);
+       top->server->server_admin = apr_pstrdup (top->pool, reqc->admin);
     }
 
     // set environment variables