svn commit: r1934937 - in httpd/httpd/trunk/test/pytest_suite/t/htdocs/modules: autoindex2/dir_protected setenvif/htaccess
| Newsgroups | gmane.comp.apache.cvs |
|---|---|
| Message-ID | <178050748476.2438467.13489612468456439957@svn03-he-fi> |
Author: jim
Date: Wed Jun 3 17:24:44 2026
New Revision: 1934937
Log:
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.
Modified:
httpd/httpd/trunk/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess
httpd/httpd/trunk/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess
Modified: httpd/httpd/trunk/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess
==============================================================================
--- httpd/httpd/trunk/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess Wed Jun 3 17:21:22 2026 (r1934936)
+++ httpd/httpd/trunk/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess Wed Jun 3 17:24:44 2026 (r1934937)
@@ -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
Modified: httpd/httpd/trunk/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess
==============================================================================
--- httpd/httpd/trunk/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess Wed Jun 3 17:21:22 2026 (r1934936)
+++ httpd/httpd/trunk/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess Wed Jun 3 17:24:44 2026 (r1934937)
@@ -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