From: Martin Kraemer <martin@apache.org>
Date: Fri, 20 Jun 2003 12:53:52 +0000 (+0000)
Subject: DocumentRoot always used to be interpreted relative to ServerRoot. Make it server_roo... 
X-Git-Tag: pre_ajp_proxy~1524
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38ea0e84887b11d229386c2a48a1ef24d2ccb242;p=apache

DocumentRoot always used to be interpreted relative to ServerRoot. Make it server_root_relative like in Apache-1.3


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

diff --git a/server/core.c b/server/core.c
index 606e083144..da425cc431 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1113,8 +1113,10 @@ static const char *set_document_root(cmd_parms *cmd, void *dummy,
         return err;
     }
 
+    /* Make it absolute, relative to ServerRoot */
+    arg = ap_server_root_relative(cmd->pool, arg);
+
     /* TODO: ap_configtestonly && ap_docrootcheck && */
-    /* XXX Shouldn't this be relative to ServerRoot ??? */
     if (apr_filepath_merge((char**)&conf->ap_document_root, NULL, arg,
                            APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS
         || !ap_is_directory(cmd->pool, arg)) {