cvs commit: apachen/htdocs/manual/mod mod_autoindex.html
coar97/09/09 08:19:49
Modified:htdocs/manual/mod mod_autoindex.html
Log:
Strongly note that the standalone FancyIndexing and IndexOptions
directives override each other.
PR: 1106
Revision ChangesPath
1.13 +23 -5 apachen/htdocs/manual/mod/mod_autoindex.html
Index: mod_autoindex.html
===
RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_autoindex.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_autoindex.html1997/07/25 11:04:00 1.12
+++ mod_autoindex.html1997/09/09 15:19:48 1.13
@@ -39,8 +39,12 @@
If
A
HREF=#fancyindexing
-FancyIndexing/A
-is enabled, the column headers are links that control the
+SAMPFancyIndexing/SAMP/A
+is enabled, or the SAMPFancyIndexing/SAMP keyword is present on the
+A
+ HREF=#indexoptions
+SAMPIndexOptions/SAMP/A
+directive, the column headers are links that control the
order of the display. If you select a header link, the
listing will be regenerated, sorted by the values in that
column. Selecting the same header repeatedly toggles
@@ -226,12 +230,20 @@
StrongContext:/strong server config, virtual host, directory,
.htaccessbr
StrongOverride:/strong Indexesbr
strongStatus:/strong Basebr
-strongModule:/strong mod_autoindexp
-
+strongModule:/strong mod_autoindex
+p
The FancyIndexing directive sets the FancyIndexing option for a directory.
emBoolean/em can be codeon/code or codeoff/code. The
A HREF=#indexoptionsIndexOptions/A directive should be used in
-preference.phr
+preference.
+/p
+BLOCKQUOTE
+ STRONGNote that the SAMPFancyIndexing/SAMP and
+ SAMPIndexOptions/SAMP directives will override each other. You
+ should use SAMPIndexOptionsnbsp;FancyIndexing/SAMP in preference
+ to the standalone SAMPFancyIndexing/SAMP directive./STRONG
+/BLOCKQUOTE
+hr
A name=headernameh2HeaderName/h2/A
!--%plaintext lt;?INDEX {\tt HeaderName} directivegt; --
@@ -285,6 +297,12 @@
dtFancyIndexing
dd!--%plaintext lt;?INDEX {\tt FancyIndexing} index optiongt; --
This turns on fancy indexing of directories.
+BLOCKQUOTE
+ STRONGNote that the SAMPFancyIndexing/SAMP and
+ SAMPIndexOptions/SAMP directives will override each other. You
+ should use SAMPIndexOptionsnbsp;FancyIndexing/SAMP in preference
+ to the standalone SAMPFancyIndexing/SAMP directive./STRONG
+/BLOCKQUOTE
dtIconHeight[=pixels] (EMApache 1.3 and later/EM)
dd
!--%plaintext lt;?INDEX {\tt IconHeight} index optiongt; --
cvs commit: apachen/src/main conf.h
akosut 97/09/09 11:36:59 Modified:src CHANGES src/main conf.h Log: Have Windows do full status reports with mod_status. PR: 1094 Reviewed by: Ben Laurie Revision ChangesPath 1.431 +3 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.430 retrieving revision 1.431 diff -u -u -r1.430 -r1.431 --- CHANGES 1997/09/09 11:06:55 1.430 +++ CHANGES 1997/09/09 18:36:53 1.431 @@ -1,5 +1,8 @@ Changes with Apache 1.3b1 + *) Windows now defaults to using full status reports with mod_status. + [Alexei Kosut, PR #1094] + *) *Really* disable all mod_rewrite operations if the engine is off. Some things (like RewriteMaps) were checked/performed even if they weren't supposed to be. [Ken Coar, PR #991] 1.131 +1 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.130 retrieving revision 1.131 diff -u -u -r1.130 -r1.131 --- conf.h1997/08/28 01:36:59 1.130 +++ conf.h1997/09/09 18:36:58 1.131 @@ -630,6 +630,7 @@ chdir() */ #include direct.h +#define STATUS #define WIN32_LEAN_AND_MEAN #define STRICT #define NO_UNISTD_H
cvs commit: apachen/src/main http_core.c
akosut 97/09/09 11:39:19
Modified:src/main http_core.c
Log:
Canonicalize Windows pathnames in Directory and Files sections, so
they will match the filenames you expect them to match. Also do
case-insentitive matching for DirectoryMatch and FilesMatch, for the
same reason.
Reviewed by: Ben Laurie
Revision ChangesPath
1.119 +25 -6 apachen/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -u -r1.118 -r1.119
--- http_core.c 1997/09/02 16:12:08 1.118
+++ http_core.c 1997/09/09 18:39:17 1.119
@@ -753,6 +753,16 @@
return NULL;
}
+/* We use this in DirectoryMatch and FilesMatch, to ensure that
+ * people don't get bitten by wrong-cased regex matches
+ */
+
+#ifdef WIN32
+#define USE_ICASE REG_ICASE
+#else
+#define USE_ICASE 0
+#endif
+
static const char end_dir_magic[] = /Directory outside of any Directory
section;
const char *end_dirsection (cmd_parms *cmd, void *dummy) {
@@ -782,11 +792,15 @@
cmd-override = OR_ALL|ACCESS_CONF;
if (cmd-info) { /* DirectoryMatch */
- r = pregcomp(cmd-pool, cmd-path, REG_EXTENDED);
+ r = pregcomp(cmd-pool, cmd-path, REG_EXTENDED|USE_ICASE);
}
else if (!strcmp(cmd-path, ~)) {
cmd-path = getword_conf (cmd-pool, arg);
- r = pregcomp(cmd-pool, cmd-path, REG_EXTENDED);
+ r = pregcomp(cmd-pool, cmd-path, REG_EXTENDED|USE_ICASE);
+}
+else {
+ /* Ensure that the pathname is canonical */
+ cmd-path = os_canonical_filename(cmd-pool, cmd-path);
}
errmsg = srm_command_loop (cmd, new_dir_conf);
@@ -881,16 +895,21 @@
if (cmd-info) { /* FilesMatch */
if (old_path cmd-path[0] != '/' cmd-path[0] != '^')
cmd-path = pstrcat(cmd-pool, ^, old_path, cmd-path, NULL);
-r = pregcomp(cmd-pool, cmd-path, REG_EXTENDED);
+r = pregcomp(cmd-pool, cmd-path, REG_EXTENDED|USE_ICASE);
}
else if (!strcmp(cmd-path, ~)) {
cmd-path = getword_conf (cmd-pool, arg);
if (old_path cmd-path[0] != '/' cmd-path[0] != '^')
cmd-path = pstrcat(cmd-pool, ^, old_path, cmd-path, NULL);
- r = pregcomp(cmd-pool, cmd-path, REG_EXTENDED);
+ r = pregcomp(cmd-pool, cmd-path, REG_EXTENDED|USE_ICASE);
+}
+else {
+ if (old_path cmd-path[0] != '/')
+ cmd-path = pstrcat(cmd-pool, old_path, cmd-path, NULL);
+
+ /* Ensure that the pathname is canonical */
+ cmd-path = os_canonical_filename(cmd-pool, cmd-path);
}
-else if (old_path cmd-path[0] != '/')
- cmd-path = pstrcat(cmd-pool, old_path, cmd-path, NULL);
errmsg = srm_command_loop (cmd, new_file_conf);
if (errmsg != end_file_magic) return errmsg;
cvs commit: apachen/src/main http_log.c
randy 97/09/09 19:35:39
Modified:src/main http_log.c
Log:
Attempt to make syslog support more portable as suggested by Alexei.
Revision ChangesPath
1.32 +34 -0 apachen/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- http_log.c1997/08/31 22:14:07 1.31
+++ http_log.c1997/09/10 02:35:37 1.32
@@ -75,26 +75,60 @@
#ifdef LOG_AUTHPRIV
{authpriv,LOG_AUTHPRIV},
#endif
+#ifdef LOG_CRON
{cron, LOG_CRON},
+#endif
+#ifdef LOG_DAEMON
{daemon, LOG_DAEMON},
+#endif
#ifdef LOG_FTP
{ftp, LOG_FTP},
#endif
+#ifdef LOG_KERN
{kern, LOG_KERN},
+#endif
+#ifdef LOG_LPR
{lpr, LOG_LPR},
+#endif
+#ifdef LOG_MAIL
{mail, LOG_MAIL},
+#endif
+#ifdef LOG_NEWS
{news, LOG_NEWS},
+#endif
+#ifdef LOG_SYSLOG
{syslog, LOG_SYSLOG},
+#endif
+#ifdef LOG_USER
{user, LOG_USER},
+#endif
+#ifdef LOG_UUCP
{uucp, LOG_UUCP},
+#endif
+#ifdef LOG_LOCAL0
{local0, LOG_LOCAL0},
+#endif
+#ifdef LOG_LOCAL1
{local1, LOG_LOCAL1},
+#endif
+#ifdef LOG_LOCAL2
{local2, LOG_LOCAL2},
+#endif
+#ifdef LOG_LOCAL3
{local3, LOG_LOCAL3},
+#endif
+#ifdef LOG_LOCAL4
{local4, LOG_LOCAL4},
+#endif
+#ifdef LOG_LOCAL5
{local5, LOG_LOCAL5},
+#endif
+#ifdef LOG_LOCAL6
{local6, LOG_LOCAL6},
+#endif
+#ifdef LOG_LOCAL7
{local7, LOG_LOCAL7},
+#endif
{NULL, -1},
};
#endif
