From: Jim Jagielski Date: Wed, 3 Jun 2026 17:24:44 +0000 (+0000) Subject: pytest_suite: fix hardcoded absolute paths in .htaccess files X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=514a5be1ee7aaaa7f94338a68b9517b2c56cb1bd;p=thirdparty%2Fapache%2Fhttpd.git pytest_suite: fix hardcoded absolute paths in .htaccess files Both files were committed with /Users/jjagielski/... paths that only work on one developer's machine. autoindex2/dir_protected/.htaccess: AuthUserFile now uses a path relative to ServerRoot (Apache 2.4+ resolves these against the configured ServerRoot, which the test framework sets to pytest_suite/t/). setenvif/htaccess/.htaccess: file() argument in SetEnvIfExpr now uses %{DOCUMENT_ROOT} instead of a hardcoded absolute path. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1934937 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess b/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess index 37bd439c51..7c14448d2c 100644 --- a/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess +++ b/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess @@ -1,4 +1,4 @@ AuthType Basic AuthName "Restricted Directory" -AuthUserFile /Users/jjagielski/src/asf/httpd/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/htpasswd +AuthUserFile htdocs/modules/autoindex2/dir_protected/htpasswd Require valid user diff --git a/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess b/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess index a2c2bf38bb..8eabdc3c76 100644 --- a/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess +++ b/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess @@ -1 +1 @@ -SetEnvIfExpr "file('/Users/jjagielski/src/asf/httpd/test/pytest_suite/t/htdocs/foobar.html') =~ /(.+)/" VAR_ONE=$0 \ No newline at end of file +SetEnvIfExpr "file('%{DOCUMENT_ROOT}/foobar.html') =~ /(.+)/" VAR_ONE=$0 \ No newline at end of file