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

diff --git a/docs/manual/mod/mod_userdir.xml b/docs/manual/mod/mod_userdir.xml
index 8c050dfefccd404a926374a10fe800db6e309b93..5b479703e06ea9ee3087ad18b4bfa5701120a564 100644 (file)
--- a/docs/manual/mod/mod_userdir.xml
+++ b/docs/manual/mod/mod_userdir.xml
@@ -43,7 +43,6 @@ tutorial</a></seealso>
 <name>UserDir</name>
 <description>Location of the user-specific directories</description>
 <syntax>UserDir <em>directory-filename</em></syntax>
-<default>UserDir public_html</default>
 <contextlist><context>server config</context> <context>virtual
 host</context></contextlist>
 
@@ -147,6 +146,11 @@ Apache cannot determine if the redirect succeeded or not, so if you have
 the redirect earlier in the list, that will always be the alternative
 that is used.</p>
 
+<p>User directory substitution is not active by default in versions
+2.1.4 and later.  In earlier versions, <code>UserDir public_html</code>
+was assumed if no <directive module="mod_userdir">UserDir</directive>
+directive was present.</p>
+
 </usage>
 
 <seealso><a href="../howto/public_html.html">public_html

diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c
index 455b150d514a0243d1ad622008d325129782ed62..00130d8ec52745fbe38fd4eae7865524d94a08c3 100644 (file)
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -73,9 +73,12 @@
 #endif
 
 
-/* The default directory in user's home dir */
+/* 
+ * The default directory in user's home dir 
+ * In the default install, the module is disabled
+ */
 #ifndef DEFAULT_USER_DIR
-#define DEFAULT_USER_DIR "public_html"
+#define DEFAULT_USER_DIR NULL
 #endif
 
 module AP_MODULE_DECLARE_DATA userdir_module;