Skip to content

Commit fe9367b

Browse files
author
Joshua Slive
committed
Disable mod_userdir by default.
This is non-backwards-compatible. But it shouldn't effect most people, because almost everyone has a UserDir directive in their config anyway. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@160296 13f79535-47bb-0310-9956-ffa450edef68
1 parent b4b84f7 commit fe9367b

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

docs/manual/mod/mod_userdir.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ tutorial</a></seealso>
4343
<name>UserDir</name>
4444
<description>Location of the user-specific directories</description>
4545
<syntax>UserDir <em>directory-filename</em></syntax>
46-
<default>UserDir public_html</default>
4746
<contextlist><context>server config</context> <context>virtual
4847
host</context></contextlist>
4948

@@ -147,6 +146,11 @@ Apache cannot determine if the redirect succeeded or not, so if you have
147146
the redirect earlier in the list, that will always be the alternative
148147
that is used.</p>
149148

149+
<p>User directory substitution is not active by default in versions
150+
2.1.4 and later. In earlier versions, <code>UserDir public_html</code>
151+
was assumed if no <directive module="mod_userdir">UserDir</directive>
152+
directive was present.</p>
153+
150154
</usage>
151155

152156
<seealso><a href="../howto/public_html.html">public_html

modules/mappers/mod_userdir.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,12 @@
7373
#endif
7474

7575

76-
/* The default directory in user's home dir */
76+
/*
77+
* The default directory in user's home dir
78+
* In the default install, the module is disabled
79+
*/
7780
#ifndef DEFAULT_USER_DIR
78-
#define DEFAULT_USER_DIR "public_html"
81+
#define DEFAULT_USER_DIR NULL
7982
#endif
8083

8184
module AP_MODULE_DECLARE_DATA userdir_module;

0 commit comments

Comments
 (0)