cvs commit: apache-site related_projects.html
brian 99/01/03 16:26:43 Modified:.related_projects.html Log: Updated link upon request by Andrew Ford, the owner. Revision ChangesPath 1.34 +3 -3 apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- related_projects.html 1998/10/26 21:03:07 1.33 +++ related_projects.html 1999/01/04 00:26:42 1.34 @@ -181,9 +181,9 @@ H3A NAME=quickrefApache Quick Reference Card/A/h3 BLOCKQUOTE -A compact, tri-fold double-sided page listing all major directives, available at -A HREF=http://www.ford-mason.co.uk/resources/refcards/apache.html; -http://www.ford-mason.co.uk/resources/refcards/apache.html/A +A compact, tri-fold double-sided page listing all major directives, +available at A HREF=http://www.refcards.com/;http://www.refcards.com//A. A +mod_perl refcard is also available. /BLOCKQUOTE HR
cvs commit: apache-1.3/icons README
brian 99/01/03 18:21:25 Modified:iconsREADME Log: Eit.com RIP. Kevin's got a new addy. Mention the small directory. Revision ChangesPath 1.3 +5 -10 apache-1.3/icons/README Index: README === RCS file: /home/cvs/apache-1.3/icons/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README1998/12/16 19:07:51 1.2 +++ README1999/01/04 02:21:25 1.3 @@ -3,21 +3,16 @@ These icons were originally made for Mosaic for X and have been included in the NCSA httpd and Apache server distributions in the past. They are in the public domain and may be freely included in any - application. The originals were done by Kevin Hughes ([EMAIL PROTECTED]). + application. The originals were done by Kevin Hughes + ([EMAIL PROTECTED]). Many thanks to Andy Polyakov for tuning the icon colors and adding a few new images. If you'd like to contribute additions or ideas to this set, please let me know. - Almost all of these icons are 20x22 pixels in size. - - The distribution site for these icons is at: - - http://www.eit.com/goodies/www.icons/ - - Kevin Hughes - September 11, 1995 - + Almost all of these icons are 20x22 pixels in size. There are + alternative icons in the small directory that are 16x16 in size, + provided by Mike Brown ([EMAIL PROTECTED]). Suggested Uses
cvs commit: apache-site/library index.html
brian 99/01/03 18:34:40 Modified:library index.html Log: Updated links to HTML specifications (thanks Brian Slesinsky for the suggestion) Revision ChangesPath 1.4 +2 -2 apache-site/library/index.html Index: index.html === RCS file: /home/cvs/apache-site/library/index.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.html1998/11/10 06:44:39 1.3 +++ index.html1999/01/04 02:34:39 1.4 @@ -46,8 +46,8 @@ LISTRONGA HREF=http://www.w3.org/MarkUp/;Hypertext Markup Language/A (HTML)/STRONG/LI UL LIA HREF=http://www.ics.uci.edu/pub/ietf/html/rfc1866.txt;RFC1866: HTML 2.0/A/LI -LIA HREF=http://www.w3.org/pub/WWW/TR/REC-html32.html;Reference Spec: HTML 3.2/A/LI -LIA HREF=http://www.w3.org/pub/WWW/TR/WD-html40/;Working Draft: HTML 4.0/A/LI +LIA HREF=http://www.w3.org/TR/REC-html32.html;Reference Spec: HTML 3.2/A/LI +LIA HREF=http://www.w3.org/TR/REC-html40/;Reference Spec: HTML 4.0/A/LI /UL LISTRONGA HREF=http://www.webreference.com/index2.html;Related Stuff/A/STRONG/LI UL
cvs commit: apache-1.3/src/support ab.c
randy 99/01/03 20:13:14
Modified:src Configure
Log:
Portability fixes for QNX32. This may also apply to QNX, but I cannot
verify that. /bin/sh is pathetic on this platform so configuration
still requires a replacement shell.
Revision ChangesPath
1.319 +1 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- Configure 1999/01/02 23:54:34 1.318
+++ Configure 1999/01/04 04:11:38 1.319
@@ -497,6 +497,7 @@
DEF_WANTHSREGEX=yes
;;
*-qnx32)
+CC='cc -F'
OS='QNX32'
CFLAGS=$CFLAGS -DQNX -mf -3
LIBS=$LIBS -N128k -lsocket -lunix
Modified:src/support ab.c
Log:
Portability fixes for QNX32. This change seems to be the most
portable way to handle the conflict with this macro in other
included files.
Revision ChangesPath
1.18 +6 -6 apache-1.3/src/support/ab.c
Index: ab.c
===
RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ab.c 1999/01/01 19:05:32 1.17
+++ ab.c 1999/01/04 04:13:13 1.18
@@ -155,8 +155,8 @@
int time; /* time in ms for connection */
};
-#define min(a,b) ((a)(b))?(a):(b)
-#define max(a,b) ((a)(b))?(a):(b)
+#define ap_min(a,b) ((a)(b))?(a):(b)
+#define ap_max(a,b) ((a)(b))?(a):(b)
/* - GLOBALS */
@@ -320,10 +320,10 @@
for (i = 0; i requests; i++) {
struct data s = stats[i];
-mincon = min(mincon, s.ctime);
-mintot = min(mintot, s.time);
-maxcon = max(maxcon, s.ctime);
-maxtot = max(maxtot, s.time);
+mincon = ap_min(mincon, s.ctime);
+mintot = ap_min(mintot, s.time);
+maxcon = ap_max(maxcon, s.ctime);
+maxtot = ap_max(maxtot, s.time);
totalcon += s.ctime;
total += s.time;
}
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
coar99/01/04 06:35:56
Modified:.STATUS
htdocs/manual/mod mod_autoindex.html
src CHANGES
src/modules/standard mod_autoindex.c
Log:
Allow fancyindexed directories to be presorted in some other way
than by name.
PR: 1699
Submitted by: Ken Coar
Reviewed by: Martin Kraemer
Revision ChangesPath
1.587 +1 -7 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- STATUS1999/01/03 13:46:16 1.586
+++ STATUS1999/01/04 14:35:52 1.587
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/01/03 13:46:16 $]
+ Last modified at [$Date: 1999/01/04 14:35:52 $]
Release:
@@ -93,12 +93,6 @@
vhost-xxx.html document out of it. -- rse
Available Patches:
-
-* Ken's default sort order for autoindexed listings
- First pass for concept; maybe directive should be renamed or
- syntax changed?
- Message-ID: [EMAIL PROTECTED]
- Status: Ken +1 (concept), Martin +1 (concept)
* Lars' 'binbuild' patch
Message-ID: [EMAIL PROTECTED]
1.30 +61 -0 apache-1.3/htdocs/manual/mod/mod_autoindex.html
Index: mod_autoindex.html
===
RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_autoindex.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_autoindex.html1998/10/22 17:43:20 1.29
+++ mod_autoindex.html1999/01/04 14:35:53 1.30
@@ -74,6 +74,7 @@
LIA HREF=#headernameHeaderName/A
LIA HREF=#indexignoreIndexIgnore/A
LIA HREF=#indexoptionsIndexOptions/A
+LIA HREF=#indexorderdefaultIndexOrderDefault/A
LIA HREF=#readmenameReadmeName/A
/MENU
HR
@@ -668,6 +669,66 @@
/P
/DD
/DL
+
+HR
+
+H2A NAME=indexorderdefaultIndexOrderDefault/A/H2
+!--%plaintext lt;?INDEX {\tt IndexOrderDefault} directivegt; --
+A
+ HREF=directive-dict.html#Syntax
+ REL=Help
+STRONGSyntax:/STRONG/A IndexOrderDefault
+EMAscending|Descending/EM EMName|Date|Size|Description/EM
+BR
+A
+ HREF=directive-dict.html#Context
+ REL=Help
+STRONGContext:/STRONG/A server config, virtual host, directory,
+.htaccess
+BR
+A
+ HREF=directive-dict.html#Override
+ REL=Help
+STRONGOverride:/STRONG/A Indexes
+BR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A Base
+BR
+A
+ HREF=directive-dict.html#Module
+ REL=Help
+STRONGModule:/STRONG/A mod_autoindex
+BR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A IndexOrderDefault is only available in
+Apache 1.3.4 and later.
+
+P
+The SAMPIndexOrderDefault/SAMP directive is used in combination with
+the A HREF=#indexoptions:fancyindexingSAMPFancyIndexing/SAMP/A
+index option. By default, fancyindexed directory listings are displayed in
ascending order by filename; the SAMPIndexOrderDefault/SAMP allows
+you to change this initial display order.
+/P
+P
+SAMPIndexOrderDefault/SAMP takes two arguments. The first must be either
+SAMPAscending/SAMP or SAMPDescending/SAMP, indicating the direction
+of the sort. The second argument must be one of the keywords
+SAMPName/SAMP, SAMPDate/SAMP, SAMPSize/SAMP, or
+SAMPDescription/SAMP, and identifies the primary key. The secondary
+key is EMalways/EM the ascending filename.
+/P
+P
+You can force a directory listing to only be displayed in a particular
+order by combining this directive with the
+A HREF=#indexoptions:suppresscolumnsorting
+SAMPSuppressColumnSorting/SAMP/A index option; this will prevent
+the client from requesting the directory listing in a different order.
+/P
+
HR
H2A NAME=readmenameReadmeName/A/H2
1.1200+5 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1199
retrieving revision 1.1200
diff -u -r1.1199 -r1.1200
--- CHANGES 1999/01/03 16:45:23 1.1199
+++ CHANGES 1999/01/04 14:35:54 1.1200
@@ -1,5 +1,8 @@
Changes with Apache 1.3.4
+ *) Added IndexOrderDefault directive to supply a default sort order
+ for FancyIndexed directory listings. [Ken Coar] PR#1699
+
*) Change the ap_assert macro to a variant that works on all platforms.
[Richard Prinz [EMAIL PROTECTED]] PR#2575
@@ -19,7 +22,8 @@
*) Make top-level Makefile aware of a parallel build procedures (make -j)
by
making sure the src/support/ tools are _forced_ to be build last (they
- depend on other
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
coar99/01/04 11:49:46
Modified:src CHANGES
src/modules/standard mod_autoindex.c
Log:
Fix mod_autoindex's handling of SuppressColumnSorting; the
display order could be manually overridden by putting the
appropriate query string into the URL (one of the strings
the column-header anchors used).
Revision ChangesPath
1.1201+6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1200
retrieving revision 1.1201
diff -u -r1.1200 -r1.1201
--- CHANGES 1999/01/04 14:35:54 1.1200
+++ CHANGES 1999/01/04 19:49:36 1.1201
@@ -1,5 +1,11 @@
Changes with Apache 1.3.4
+ *) IndexOptions SuppressColumnSorting only turned off making
+ the column headers anchors; you could still change the display
+ order by manually adding a '?N=A' or similar query string to the
+ URL. Now SuppressColumnSorting locks in the sort order so
+ it can't be overridden this way. [Ken Coar]
+
*) Added IndexOrderDefault directive to supply a default sort order
for FancyIndexed directory listings. [Ken Coar] PR#1699
1.101 +20 -22apache-1.3/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- mod_autoindex.c 1999/01/04 14:35:55 1.100
+++ mod_autoindex.c 1999/01/04 19:49:41 1.101
@@ -1365,35 +1365,33 @@
/*
* Figure out what sort of indexing (if any) we're supposed to use.
+ *
+ * If no QUERY_STRING was specified or column sorting has been
+ * explicitly disabled, we use the default specified by the
+ * IndexOrderDefault directive (if there is one); otherwise,
+ * we fall back to ascending by name.
*/
-if (autoindex_opts SUPPRESS_COLSORT) {
+qstring = r-args;
+if ((autoindex_opts SUPPRESS_COLSORT)
+ || ((qstring == NULL) || (*qstring == '\0'))) {
+ qstring = autoindex_conf-default_order;
+}
+/*
+ * If there is no specific ordering defined for this directory,
+ * default to ascending by filename.
+ */
+if ((qstring == NULL) || (*qstring == '\0')) {
keyid = K_NAME;
direction = D_ASCENDING;
}
else {
- qstring = r-args;
-
- /*
- * If no QUERY_STRING was specified, we use the default specified
- * by the IndexOrderDefault directive (if there is one); otherwise,
- * we fall back to ascending by name.
- */
- if ((qstring == NULL) || (*qstring == '\0')) {
- qstring = autoindex_conf-default_order;
+ keyid = *qstring;
+ ap_getword(r-pool, qstring, '=');
+ if (qstring != '\0') {
+ direction = *qstring;
}
- if ((qstring == NULL) || (*qstring == '\0')) {
- keyid = K_NAME;
- direction = D_ASCENDING;
- }
else {
- keyid = *qstring;
- ap_getword(r-pool, qstring, '=');
- if (qstring != '\0') {
- direction = *qstring;
- }
- else {
- direction = D_ASCENDING;
- }
+ direction = D_ASCENDING;
}
}
