svn commit: r160296 - in httpd/httpd/branches/simple-conf: docs/manual/mod/mod_userdir.xml modules/mappers/mod_userdir.c

[sl...@apache.org]

Author: slive
Date: Wed Apr  6 07:00:23 2005
New Revision: 160296

URL: http://svn.apache.org/viewcvs?view=rev&rev=160296
Log:
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.

Modified:
    httpd/httpd/branches/simple-conf/docs/manual/mod/mod_userdir.xml
    httpd/httpd/branches/simple-conf/modules/mappers/mod_userdir.c

Modified: httpd/httpd/branches/simple-conf/docs/manual/mod/mod_userdir.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/docs/manual/mod/mod_userdir.xml?view=diff&r1=160295&r2=160296
==============================================================================
--- httpd/httpd/branches/simple-conf/docs/manual/mod/mod_userdir.xml (original)
+++ httpd/httpd/branches/simple-conf/docs/manual/mod/mod_userdir.xml Wed Apr  6 07:00:23 2005
@@ -43,7 +43,6 @@
 <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>
 
@@ -146,6 +145,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>
 

Modified: httpd/httpd/branches/simple-conf/modules/mappers/mod_userdir.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/modules/mappers/mod_userdir.c?view=diff&r1=160295&r2=160296
==============================================================================
--- httpd/httpd/branches/simple-conf/modules/mappers/mod_userdir.c (original)
+++ httpd/httpd/branches/simple-conf/modules/mappers/mod_userdir.c Wed Apr  6 07:00:23 2005
@@ -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;