You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2002/09/28 08:10:47 UTC
cvs commit: httpd-2.0/modules/ssl ssl_expr_parse.h
rbb 2002/09/27 23:10:47
Modified: . CHANGES
docs/manual/mod mod_userdir.html.en mod_userdir.xml
modules/mappers mod_userdir.c
modules/ssl ssl_expr_parse.h
Log:
Allow the UserDir directive to accept a list of directories.
This matches what Apache 1.3 does. Also add documentation for
this feature.
PR: 9299
Submitted by: Jay Ball <ja...@veggiespam.com>
Revision Changes Path
1.941 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.940
retrieving revision 1.941
diff -u -r1.940 -r1.941
--- CHANGES 28 Sep 2002 04:18:34 -0000 1.940
+++ CHANGES 28 Sep 2002 06:10:46 -0000 1.941
@@ -1,5 +1,9 @@
Changes with Apache 2.0.43
+ *) Allow the UserDir directive to accept a list of directories.
+ This matches what Apache 1.3 does. Also add documentation for
+ this feature. [Jay Ball <ja...@veggiespam.com>]
+
*) New Module: mod_logio. adds the ability to log bytes sent and
received. [Bojan Smojver <bo...@rexursive.com>]
1.13 +14 -0 httpd-2.0/docs/manual/mod/mod_userdir.html.en
Index: mod_userdir.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_userdir.html.en,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_userdir.html.en 10 Sep 2002 01:55:53 -0000 1.12
+++ mod_userdir.html.en 28 Sep 2002 06:10:46 -0000 1.13
@@ -104,5 +104,19 @@
UserDir disabled user4 user5 user6
</code></p></div>
+<p>It is also possible to specify alternative user directories.
+If you use a command like:</p>
+<div class="example"><p><code>
+Userdir public_html /usr/web http://www.foo.com/
+</code></p></div>
+<p>With a request for http://www.foo.com/~bob/one/two.html, will try to
+find the page at ~bob/public_html/one/two.html first, then
+/usr/web/bob/one/two.html, and finally it will send a redirect
+to http://www.foo.com/bob/one/two.html.</p>
+<p>If you add a redirect, it must be the last alternative in the list.
+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>
+
<h3>See also</h3><ul><li><a href="../howto/public_html.html">public_html
tutorial</a></li></ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
1.10 +14 -0 httpd-2.0/docs/manual/mod/mod_userdir.xml
Index: mod_userdir.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_userdir.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_userdir.xml 5 Sep 2002 02:38:08 -0000 1.9
+++ mod_userdir.xml 28 Sep 2002 06:10:46 -0000 1.10
@@ -114,6 +114,20 @@
UserDir disabled user4 user5 user6
</example>
+<p>It is also possible to specify alternative user directories.
+If you use a command like:</p>
+<example>
+Userdir public_html /usr/web http://www.foo.com/
+</example>
+<p>With a request for http://www.foo.com/~bob/one/two.html, will try to
+find the page at ~bob/public_html/one/two.html first, then
+/usr/web/bob/one/two.html, and finally it will send a redirect
+to http://www.foo.com/bob/one/two.html.</p>
+<p>If you add a redirect, it must be the last alternative in the list.
+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>
+
</usage>
<seealso><a href="../howto/public_html.html">public_html
1.52 +0 -3 httpd-2.0/modules/mappers/mod_userdir.c
Index: mod_userdir.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_userdir.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mod_userdir.c 21 Jul 2002 18:06:51 -0000 1.51
+++ mod_userdir.c 28 Sep 2002 06:10:47 -0000 1.52
@@ -328,9 +328,6 @@
if (apr_get_home_directory(&homedir, w, r->pool) == APR_SUCCESS) {
filename = apr_pstrcat(r->pool, homedir, "/", userdir, NULL);
}
- else {
- return DECLINED;
- }
#else
return DECLINED;
#endif
1.8 +20 -22 httpd-2.0/modules/ssl/ssl_expr_parse.h
Index: ssl_expr_parse.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_expr_parse.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ssl_expr_parse.h 12 Apr 2002 17:46:09 -0000 1.7
+++ ssl_expr_parse.h 28 Sep 2002 06:10:47 -0000 1.8
@@ -1,27 +1,25 @@
+#define T_TRUE 257
+#define T_FALSE 258
+#define T_DIGIT 259
+#define T_ID 260
+#define T_STRING 261
+#define T_REGEX 262
+#define T_REGEX_I 263
+#define T_FUNC_FILE 264
+#define T_OP_EQ 265
+#define T_OP_NE 266
+#define T_OP_LT 267
+#define T_OP_LE 268
+#define T_OP_GT 269
+#define T_OP_GE 270
+#define T_OP_REG 271
+#define T_OP_NRE 272
+#define T_OP_IN 273
+#define T_OP_OR 274
+#define T_OP_AND 275
+#define T_OP_NOT 276
typedef union {
char *cpVal;
ssl_expr *exVal;
} YYSTYPE;
-#define T_TRUE 257
-#define T_FALSE 258
-#define T_DIGIT 259
-#define T_ID 260
-#define T_STRING 261
-#define T_REGEX 262
-#define T_REGEX_I 263
-#define T_FUNC_FILE 264
-#define T_OP_EQ 265
-#define T_OP_NE 266
-#define T_OP_LT 267
-#define T_OP_LE 268
-#define T_OP_GT 269
-#define T_OP_GE 270
-#define T_OP_REG 271
-#define T_OP_NRE 272
-#define T_OP_IN 273
-#define T_OP_OR 274
-#define T_OP_AND 275
-#define T_OP_NOT 276
-
-
extern YYSTYPE ssl_expr_yylval;