cvs commit: apache-1.3 STATUS
jim 98/10/05 16:04:29 Modified:.STATUS Log: Remove some out-of-date comments Revision ChangesPath 1.502 +1 -13 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.501 retrieving revision 1.502 diff -u -r1.501 -r1.502 --- STATUS1998/10/05 22:34:28 1.501 +++ STATUS1998/10/05 23:04:28 1.502 @@ -97,13 +97,6 @@ documentation... we should handle it in the case the user doesn't ever supply a dot-notation address. -* Amdahl UTS 2.1.2 - Message-Id: [EMAIL PROTECTED] - Message-Id: [EMAIL PROTECTED] - Jim: Sounded like the version of the OS that required - the patches were WAY old and would bugger the newer - versions... Not sure if we want to do that. - * Problems dealing with .-rooted domain names such as twinlark. versus twinlark.arctic.org.. See the thread containing Message-ID: [EMAIL PROTECTED] for more details. @@ -155,7 +148,7 @@ of: alpha bebox macppc newsmips ofppc pica pmax sparc64. * How should an Apache binary release tarball look? - NOTE: This should be resolved before 1.3.1 !! + NOTE: This should be resolved before 1.3.3 !! 1. The old way where it is just a source release tarball plus a pre-compiled src/httpd-gnutriple. It is created @@ -275,11 +268,6 @@ * In ap_bclose() there's no test that (fb-fd != -1) -- so it's possible that it'll do something completely bogus when it's used for read-only things. - Dean Gaudet - -* ap_pcfg_openfile doesn't use pfopen() to open the file. Consider - .htaccess parsing, if a timeout occurs the file may not be closed. I - can't imagine that a timeout would be set during this stage... but it'd - probably be good to just clean this up. - Dean Gaudet * Okay, so our negotiation strategy needs a bit of refinement. See [EMAIL PROTECTED].
cvs commit: apache-devsite how-to-release.html
martin 98/10/06 03:10:46 Modified:.how-to-release.html Log: Updates - and corrections to my earlier commit Revision ChangesPath 1.45 +30 -18apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- how-to-release.html 1998/10/05 11:12:19 1.44 +++ how-to-release.html 1998/10/06 10:10:46 1.45 @@ -60,7 +60,7 @@ CODESTRONG$ vi Announcement/STRONG/CODEBR CODESTRONG$ cvs commit Announcement/STRONG/CODEBR CODESTRONG$ cd ../STRONG/CODEBR - CODESTRONG$ rm -rf apache-1.X/STRONG/CODE + CODESTRONG$ cvs release -d apache-1.X/STRONG/CODE P HR STRONG[ Building the source release ]/STRONGBR @@ -131,22 +131,22 @@ LI Change CODESERVER_VERSION/CODE in TTsrc/include/httpd.h/TT from ``CODEApache/1.X.Y-dev/CODE'' to ``CODEApache/1.X.Y/CODE''. Then also change - CODEAPACHE_RELEASE/CODE in same file from + CODEAPACHE_RELEASE/CODE in the same file from ``CODE1XXYYZZ/CODE'' to ``CODE1XXYYSTRONG99/STRONG/CODE''. The format is something like CODEprintf(%d%02d%02d%02d, major, minor, bugfix, - betaseq)/CODE. Additionally make sure the Configure scripts version + betaseq)/CODE. Also update the Windows registry key: edit + SAMPsrc/os/win32/registry.c/SAMP and change the + CODEVERSION/CODE from 1.X.Y dev to the string 1.X.Y. + Additionally make sure the Configure scripts version knowledge for the CODESHARED_CORE/CODE reflects the correct version.revision.patchlevel triple. Look for the line ``CODEV=1 R=3 P=2/CODE'' inside CODEsrc/Configure/CODE and adjust it accordingly. BR CODESTRONG$ vi src/include/httpd.h/STRONG/CODEBR + CODESTRONG$ vi src/os/win32/registry.c/STRONG/CODEBR CODESTRONG$ vi src/Configure/STRONG/CODEBR - CODESTRONG$ cvs commit src/include/httpd.h src/Configure/STRONG/CODE - P - If the release is going from beta to non-beta, or non-beta to a - beta, also update the Windows registry key release. See - SAMPos/win32/registry.c/SAMP for more details. + CODESTRONG$ cvs commit src/include/httpd.h src/os/win32/registry.c src/Configure/STRONG/CODE P LI Tag the sources for this release:BR (EMnote: be sure to tag the whole thing, not just CODEsrc/CODE/EM!)BR @@ -155,10 +155,12 @@ HR STRONG[ For all releases ]/STRONGBR P -LI Make an export version of the distribution:BR +LI Make an export version of the distribution: (this creates a second + subdirectory CODEapache-1.X.Y/CODE for the exported version + beside the existing CVS tree in CODEapache-1.X/CODE)BR CODESTRONG$ cd ../STRONG/CODEBR CODESTRONG$ umask 022/STRONG/CODEBR - CODESTRONG$ cvs export -r APACHE_1_X_Y -d apache_1.X.Y apache-1.3/STRONG/CODEBR + CODESTRONG$ cvs export -r APACHE_1_X_Y -d apache_1.X.Y apache-1.X/STRONG/CODEBR CODESTRONG$ cd apache_1.X.Y/STRONG/CODEBR UL LIFONT COLOR=redNote:/FONT There is a known problem @@ -166,7 +168,7 @@ and later. If this affects you, you will need to do a checkout instead:BR CODESTRONG$ umask 022/STRONG/CODEBR - CODESTRONG$ cvs checkout -r APACHE_1_X_Y -d apache_1.X.Y apache-1.3/STRONG/CODEBR + CODESTRONG$ cvs checkout -r APACHE_1_X_Y -d apache_1.X.Y apache-1.X/STRONG/CODEBR CODESTRONG$ cd apache_1.X.Y/STRONG/CODEBR /UL P @@ -221,12 +223,16 @@ LI Remember the CHANGES file:BR CODESTRONG$ cp apache_1.X.Y/src/CHANGES ./STRONG/CODE P +LI Cleanup: (this deletes the export tree: it is now no longer + required. We still need the CVS tree, see below)BR + CODESTRONG$ rm -fr apache_1.X.Y/STRONG/CODE +P LI Make the tarball available for testing purposes: (http://dev.apache.org/)BR + CODESTRONG$ chmod 664 CHANGES apache_1.X.Y.tar.*/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.gz /pub/httpd/dist/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.gz.asc /pub/httpd/dist/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.Z /pub/httpd/dist/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.Z.asc /pub/httpd/dist/STRONG/CODEBR - CODESTRONG$ chmod 664 apache_1.X.Y.tar.*/STRONG/CODEBR UL LIFONT COLOR=redNote:/FONT If rolling the tarball remotely, you should use CODEscp/CODE to place them @@ -238,19 +244,24 @@ STRONG[ Only for final releases, not for internal pre-releases ]/STRONGBR P LI cd back into the CVS tree location.BR - CODESTRONG$ cd apache-1.X.Y/STRONG/CODE + CODESTRONG$ cd apache-1.X/STRONG/CODE P LI Change CODESERVER_VERSION/CODE in
cvs commit: apache-devsite how-to-release.html
martin 98/10/06 07:56:22 Modified:.how-to-release.html Log: Cosmetics Revision ChangesPath 1.46 +9 -6 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- how-to-release.html 1998/10/06 10:10:46 1.45 +++ how-to-release.html 1998/10/06 14:56:21 1.46 @@ -135,11 +135,12 @@ ``CODE1XXYYZZ/CODE'' to ``CODE1XXYYSTRONG99/STRONG/CODE''. The format is something like CODEprintf(%d%02d%02d%02d, major, minor, bugfix, - betaseq)/CODE. Also update the Windows registry key: edit - SAMPsrc/os/win32/registry.c/SAMP and change the - CODEVERSION/CODE from 1.X.Y dev to the string 1.X.Y. - Additionally make sure the Configure scripts version - knowledge for the CODESHARED_CORE/CODE reflects the correct + betaseq)/CODE. BR Also update the Windows registry key: + edit SAMPsrc/os/win32/registry.c/SAMP and change the + CODEVERSION/CODE from CODE1.X.Y dev/CODE to the + string CODE1.X.Y/CODE.BR Additionally make sure the + Configure scripts version knowledge for the + CODESHARED_CORE/CODE reflects the correct version.revision.patchlevel triple. Look for the line ``CODEV=1 R=3 P=2/CODE'' inside CODEsrc/Configure/CODE and adjust it accordingly. BR @@ -223,7 +224,7 @@ LI Remember the CHANGES file:BR CODESTRONG$ cp apache_1.X.Y/src/CHANGES ./STRONG/CODE P -LI Cleanup: (this deletes the export tree: it is now no longer +LI Cleanup:BR(this deletes the export tree: it is now no longer required. We still need the CVS tree, see below)BR CODESTRONG$ rm -fr apache_1.X.Y/STRONG/CODE P @@ -261,6 +262,8 @@ P HR LI Cleanup:BR + (delete the CVS tree, after verification that it does not + contain any uncommitted changes)BR CODESTRONG$ cvs release -d apache-1.X/STRONG/CODE P HR
cvs commit: apache-devsite how-to-release.html
martin 98/10/06 08:05:30 Modified:.how-to-release.html Log: More cosmetics Revision ChangesPath 1.47 +3 -4 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- how-to-release.html 1998/10/06 14:56:21 1.46 +++ how-to-release.html 1998/10/06 15:05:29 1.47 @@ -228,7 +228,7 @@ required. We still need the CVS tree, see below)BR CODESTRONG$ rm -fr apache_1.X.Y/STRONG/CODE P -LI Make the tarball available for testing purposes: (http://dev.apache.org/)BR +LI Make the tarball available for testing purposes: (http://dev.apache.org/dist/)BR CODESTRONG$ chmod 664 CHANGES apache_1.X.Y.tar.*/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.gz /pub/httpd/dist/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.gz.asc /pub/httpd/dist/STRONG/CODEBR @@ -266,9 +266,8 @@ contain any uncommitted changes)BR CODESTRONG$ cvs release -d apache-1.X/STRONG/CODE P +STRONG[ Now wait for the group to test and approve the tarball ]/STRONG HR -STRONG[ Wait for group to test and approve the tarball ]/STRONGBR -HR STRONG[ Final release steps Uafter/U the group has approved the tarball ]/STRONGBR P @@ -276,7 +275,7 @@ these instructions until the group really approves the tarball !/EM P -LI Make the distribution available: (http://www.apache.org/)BR +LI Make the distribution available: (http://www.apache.org/dist/)BR CODESTRONG$ cp CHANGES /pub/apache/dist/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.gz /pub/apache/dist/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.gz.asc /pub/apache/dist/STRONG/CODEBR
cvs commit: apache-1.3/src/main http_main.c
pcs 98/10/06 08:36:04
Modified:src/main http_main.c
Log:
Avoid warning about PID file being overwritten on each start of Apache.
This had two causes: first, if -i, -u or -S was given (none of which
start a daemon) the PID file was being updated with the new PID. Secondly,
doing net stop apache or stopping Apache from the SCM did not remove the
PID file because reporting a STOPPED status to the SCM seems to stop the
process, so move the reporting of the STOPPED service to the very last
thing we do.
PR: 3053, 3084
Revision ChangesPath
1.398 +2 -2 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- http_main.c 1998/09/21 10:16:11 1.397
+++ http_main.c 1998/10/06 15:36:02 1.398
@@ -5579,7 +5579,6 @@
forcing termination of child #%d (handle %d), i,
process_handles[i]);
TerminateProcess((HANDLE) process_handles[i], 1);
}
-service_set_status(SERVICE_STOPPED);
/* cleanup pid file on normal shutdown */
{
@@ -5597,6 +5596,7 @@
}
ap_destroy_mutex(start_mutex);
+service_set_status(SERVICE_STOPPED);
return (0);
}
@@ -5718,7 +5718,7 @@
exit(0);
}
-if (!child) {
+if (!child !ap_dump_settings !install) {
ap_log_pid(pconf, ap_pid_fname);
}
ap_set_version();
cvs commit: apache-site/dist .htaccess
martin 98/10/06 08:40:45 Modified:dist .htaccess Log: In preparation for the 1.3.3 version Revision ChangesPath 1.15 +3 -0 apache-site/dist/.htaccess Index: .htaccess === RCS file: /export/home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .htaccess 1998/09/23 11:25:14 1.14 +++ .htaccess 1998/10/06 15:40:44 1.15 @@ -7,6 +7,9 @@ AddDescription 1.3.2 compressed source apache_1.3.2.tar.Z AddDescription 1.3.2 gzipped source apache_1.3.2.tar.gz AddDescription 1.3.2 Win32 binary apache_1_3_2_win32.exe +AddDescription 1.3.3 compressed source apache_1.3.3.tar.Z +AddDescription 1.3.3 gzipped source apache_1.3.3.tar.gz +AddDescription 1.3.3 Win32 binary apache_1_3_3_win32.exe AddDescription List of changes in 1.3 /export/pub/apache/dist/CHANGES_1.3 AddDescription List of changes in 1.2 /export/pub/apache/dist/CHANGES_1.2 AddDescription Developer PGP keys /export/pub/apache/dist/KEYS
cvs commit: apache-1.3/src/main http_main.c
pcs 98/10/06 08:41:46
Modified:src/main http_main.c
Log:
WIN32: Add new options to let Apache signal itself to shutdown or
restart. The option is -k, used like this:
-k shutdown
-k restart
This lets people signal Apache on Win95 systems (where previously Apache
was controlled by doing a ^C to stop it running).
Reviewed by: Ken, Lars, Jim, Martin (all concept only)
Revision ChangesPath
1.399 +242 -84 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- http_main.c 1998/10/06 15:36:02 1.398
+++ http_main.c 1998/10/06 15:41:44 1.399
@@ -999,6 +999,10 @@
fprintf(stderr, -l : list compiled-in modules\n);
fprintf(stderr, -S : show parsed settings (currently
only vhost settings)\n);
fprintf(stderr, -t : run syntax test for configuration
files only\n);
+#ifdef WIN32
+fprintf(stderr, -k shutdown : tell running Apache to
shutdown\n);
+fprintf(stderr, -k restart : tell running Apache to do a
graceful restart\n);
+#endif
exit(1);
}
@@ -2542,17 +2546,41 @@
#ifdef WIN32
/*
- * signal_parent() tells the parent process to wake up and do something.
- * Once woken it will look at shutdown_pending and restart_pending to decide
- * what to do. If neither variable is set, it will do a shutdown. This
function
- * if called by start_shutdown() or start_restart() in the parent's process
- * space, so that the variables get set. However it can also be called
- * by child processes to force the parent to exit in an emergency.
+ * Signalling Apache on NT.
+ *
+ * Under Unix, Apache can be told to shutdown or restart by sending various
+ * signals (HUP, USR, TERM). On NT we don't have easy access to signals, so
+ * we use events instead. The parent apache process goes into a loop
+ * where it waits forever for a set of events. Two of those events are
+ * called
+ *
+ *apPID_shutdown
+ *apPID_restart
+ *
+ * (where PID is the PID of the apache parent process). When one of these
+ * is signalled, the Apache parent performs the appropriate action. The
events
+ * can become signalled through internal Apache methods (e.g. if the child
+ * finds a fatal error and needs to kill its parent), via the service
+ * control manager (the control thread will signal the shutdown event when
+ * requested to stop the Apache service), from the -k Apache command line,
+ * or from any external program which finds the Apache PID from the
+ * httpd.pid file.
+ *
+ * The signal_parent() function, below, is used to signal one of these
events.
+ * It can be called by any child or parent process, since it does not
+ * rely on global variables.
+ *
+ * On entry, type gives the event to signal. 0 means shutdown, 1 means
+ * graceful restart.
*/
-static void signal_parent(void)
+static void signal_parent(int type)
{
HANDLE e;
+char *signal_name;
+extern char signal_shutdown_name[];
+extern char signal_restart_name[];
+
/* after updating the shutdown_pending or restart flags, we need
* to wake up the parent process so it can see the changes. The
* parent will normally be waiting for either a child process
@@ -2564,21 +2592,28 @@
return;
}
-APD1(*** SIGNAL_PARENT SET ***);
+switch(type) {
+case 0: signal_name = signal_shutdown_name; break;
+case 1: signal_name = signal_restart_name; break;
+default: return;
+}
-e = OpenEvent(EVENT_ALL_ACCESS, FALSE, apache-signal);
+APD2(signal_parent signalling event \%s\, signal_name);
+
+e = OpenEvent(EVENT_ALL_ACCESS, FALSE, signal_name);
if (!e) {
- /* Um, problem, can't signal the main loop, which means we can't
+ /* Um, problem, can't signal the parent, which means we can't
* signal ourselves to die. Ignore for now...
*/
ap_log_error(APLOG_MARK, APLOG_EMERG|APLOG_WIN32ERROR, server_conf,
- OpenEvent on apache-signal event);
+ OpenEvent on %s event, signal_name);
return;
}
if (SetEvent(e) == 0) {
/* Same problem as above */
ap_log_error(APLOG_MARK, APLOG_EMERG|APLOG_WIN32ERROR, server_conf,
- SetEvent on apache-signal event);
+ SetEvent on %s event, signal_name);
+ CloseHandle(e);
return;
}
CloseHandle(e);
@@ -2586,24 +2621,19 @@
#endif
/*
- * start_shutdown() and start_restart(), below, are a first stab at
+ * ap_start_shutdown() and ap_start_restart(), below, are a first stab at
* functions to initiate
cvs commit: apache-1.3/src/main http_protocol.c http_request.c
fielding98/10/06 12:06:11
Modified:src CHANGES
src/include httpd.h
src/main http_protocol.c http_request.c
Log:
Added a complete implementation of the Expect header field as
specified in rev-05 of HTTP/1.1. Used that implementation as a means
of disabling the 100 Continue response when we already know the final
status, which is mighty useful for PUT responses that result in 302 or 401.
Moved two ugly protocol condition checks that were in http_request.c
over to where they belong in http_protocol.c. They were put there
originally because ap_read_request formerly could not return an
error response, but I added that capability in 1.3.2.
Added removal of extra trailing whitespace from the getline results as part
of the protocol processing, which is extra nice because it works
between continuation lines, is almost no cost in the normal case
of no extra whitespace, and saves memory.
Revision ChangesPath
1.1103+10 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1102
retrieving revision 1.1103
diff -u -r1.1102 -r1.1103
--- CHANGES 1998/10/05 22:11:14 1.1102
+++ CHANGES 1998/10/06 19:06:06 1.1103
@@ -1,5 +1,15 @@
Changes with Apache 1.3.3
+ *) Added a complete implementation of the Expect header field as
+ specified in rev-05 of HTTP/1.1. Disabled the 100 Continue
+ response when we already know the final status, which is mighty
+ useful for PUT responses that result in 302 or 401. [Roy Fielding]
+
+ *) Remove extra trailing whitespace from the getline results as part
+ of the protocol processing, which is extra nice because it works
+ between continuation lines, is almost no cost in the normal case
+ of no extra whitespace, and saves memory. [Roy Fielding]
+
*) Added new HTTP status codes and default response bodies from the
revised HTTP/1.1 (307, 416, 417), WebDAV (102, 207, 422, 423), and
HTTP Extension Framework (510) specifications. Did not add the
1.246 +7 -0 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- httpd.h 1998/10/05 22:11:16 1.245
+++ httpd.h 1998/10/06 19:06:08 1.246
@@ -752,6 +752,13 @@
* that way, a sub request's list can (temporarily) point to a parent's list
*/
const struct htaccess_result *htaccess;
+
+/* Things placed at the end of the record to avoid breaking binary
+ * compatibility. It would be nice to remember to reorder the entire
+ * record to improve 64bit alignment the next time we need to break
+ * binary compatibility for some other reason.
+ */
+unsigned expecting_100; /* is client waiting for a 100 response? */
};
1.243 +93 -13apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- http_protocol.c 1998/10/05 22:11:16 1.242
+++ http_protocol.c 1998/10/06 19:06:09 1.243
@@ -551,6 +551,17 @@
total += retval;/* and how long s has become */
if (*pos == '\n') { /* Did we get a full line of input?*/
+/*
+ * Trim any extra trailing spaces or tabs except for the first
+ * space or tab at the beginning of a blank string. This makes
+ * it much easier to check field values for exact matches, and
+ * saves memory as well. Terminate string at end of line.
+ */
+while (pos (s + 1) (*(pos - 1) == ' ' || *(pos - 1) ==
'\t')) {
+--pos; /* trim extra trailing spaces or tabs */
+--total;/* but not one at the beginning of line*/
+++n;
+}
*pos = '\0';
--total;
++n;
@@ -767,8 +778,6 @@
while (*value == ' ' || *value == '\t')
++value;/* Skip to start of value */
-/* XXX: should strip trailing whitespace as well */
-
ap_table_addn(tmp_headers, copy, value);
}
@@ -778,8 +787,9 @@
request_rec *ap_read_request(conn_rec *conn)
{
request_rec *r;
-int access_status;
pool *p;
+const char *expect;
+int access_status;
p = ap_make_sub_pool(conn-pool);
r = ap_pcalloc(p, sizeof(request_rec));
@@ -846,6
cvs commit: apache-1.3/htdocs/manual/mod mod_autoindex.html
martin 98/10/06 12:54:02
Modified:htdocs/manual new_features_1_3.html
htdocs/manual/mod mod_autoindex.html
Log:
Add the new mod_autoindex features to new_features_1_3, add hyperlinks to
the IndexOptions keyword arguments (in the new form
HREF=#indexoption:keyword).
Revision ChangesPath
1.74 +25 -6 apache-1.3/htdocs/manual/new_features_1_3.html
Index: new_features_1_3.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- new_features_1_3.html 1998/10/01 18:25:11 1.73
+++ new_features_1_3.html 1998/10/06 19:54:00 1.74
@@ -282,18 +282,37 @@
HREF=mod/mod_autoindex.html#indexoptionsIndexOptions/A
keyword.
-LIA HREF=mod/mod_autoindex.html#indexoptions
+LIA HREF=mod/mod_autoindex.html#indexoptions:suppresshtmlpreamble
CODESTRONGSuppressHTMLPreamble/STRONG/CODE/A can be used if
your README.html file includes its own HTML header.
-LISTRONGCODEIconHeight/CODE and CODEIconWidth/CODE/STRONG
let
-you set
-height and width attributes to the CODElt;IMGgt;/CODE tag in
-directory listings.
+LIThe A HREF=mod/mod_autoindex.html#indexoptions
+CODESTRONGIndexOptions/STRONG/CODE/A directive now allows
+the use of incremental prefixes (+/- to add/remove the respective
+keyword feature, as was already possible for the
+A HREF=mod/core.html#optionsOptions/A directive) to its
+keyword arguments. Multiple IndexOptions directives applying
+to the same directory will now be merged.
+LIA HREF=mod/mod_autoindex.html#indexoptions:iconheight
+STRONGCODEIconHeight/CODE/STRONG/A and
+ A HREF=mod/mod_autoindex.html#indexoptions:iconwidth
+STRONGCODEIconWidth/CODE/STRONG/A
+let you set height and width attributes to the
+CODElt;IMGgt;/CODE tag in directory listings.
+
+LIThe new A HREF=mod/mod_autoindex.html#indexoptions:namewidth
+STRONGCODENameWidth/CODE/STRONG/A keyword to the
+A HREF=mod/mod_autoindex.html#indexoptionsIndexOptions/A
+ directive lets you set the number of columns for
+ A HREF=mod/mod_autoindex.html#indexoptions:fancyindexingfancy
+ directory listings/A. If set to an '*' asterisk, the name width
+ will be adjusted automatically.
+
LIThe A HREF=mod/mod_autoindex.html#fancyindexing
SAMPFancyIndexing/SAMP/A directive now correctly has
-the same impact as SAMPIndexOptionsnbsp;FancyIndexing/SAMP
+the same impact as
+A
HREF=mod/mod_autoindex.html#indexoptions:fancyindexingSAMPIndexOptionsnbsp;FancyIndexing/SAMP/A
without replacing the effect of any existing SAMPIndexOptions/SAMP
directive.
1.27 +11 -11apache-1.3/htdocs/manual/mod/mod_autoindex.html
Index: mod_autoindex.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_autoindex.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_autoindex.html1998/10/02 21:35:33 1.26
+++ mod_autoindex.html1998/10/06 19:54:01 1.27
@@ -509,7 +509,7 @@
The IndexOptions directive specifies the behavior of the directory indexing.
EMOption/EM can be one of
DL
-DTFancyIndexing
+DTA NAME=indexoptions:fancyindexingFancyIndexing/A
DD!--%plaintext lt;?INDEX {\tt FancyIndexing} index optiongt; --
This turns on fancy indexing of directories.
BLOCKQUOTE
@@ -522,7 +522,7 @@
is combined with any SAMPIndexOptions/SAMP directive already
specified for the current scope./STRONG
/BLOCKQUOTE
-DTIconHeight[=pixels] (EMApache 1.3 and later/EM)
+DTA NAME=indexoptions:iconheightIconHeight[=pixels] (EMApache 1.3
and later/EM)/A
DD
!--%plaintext lt;?INDEX {\tt IconHeight} index optiongt; --
Presence of this option, when used with IconWidth, will cause the server
@@ -532,12 +532,12 @@
images have been loaded. If no value is given for the option, it
defaults to the standard height of the icons supplied with the Apache
software.
-DTIconsAreLinks
+DTA NAME=indexoptions:iconsarelinksIconsAreLinks/A
DD
!--%plaintext lt;?INDEX {\tt IconsAreLinks} index optiongt; --
This makes the icons part of the anchor for the filename, for
fancy indexing.
-DTIconWidth[=pixels] (EMApache 1.3 and later/EM)
+DTA NAME=indexoptions:iconwidthIconWidth[=pixels] (EMApache 1.3 and
later/EM)/A
DD
!--%plaintext lt;?INDEX {\tt IconWidth} index optiongt; --
Presence of this option, when used with IconHeight, will cause the server
@@ -547,19 +547,19 @@
images have been loaded. If no
cvs commit: apache-1.3 Announcement
martin 98/10/06 12:56:51 Modified:.Announcement Log: Rough draft: please check and complain Revision ChangesPath 1.37 +13 -10apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Announcement 1998/09/23 10:13:02 1.36 +++ Announcement 1998/10/06 19:56:50 1.37 @@ -1,16 +1,20 @@ -Apache 1.3.2 Released +Apache 1.3.3 Released = The Apache Group is pleased to announce the release of version -1.3.2 of the Apache HTTP server. +1.3.3 of the Apache HTTP server. -The changes in this release consist of Unix portability fixes, -DoS issues, Proxy and DSO enhancements, and assorted other minor -features or fixes. Users should review the CHANGES file and -decide on their upgrade plans; We consider Apache 1.3.2 to be the +This new Apache version is mainly a bugfix release. In the previous +1.3.2 release, server error reporting was seriously broken. +This affected the functionality of most custom ErrorDocuments and +of modules such as mod_speling. +Additionally, changes in this release consist of new supported platforms, +Win32 and Unix portability fixes, ErrorDocument environment enhancements, +and assorted other features or fixes. Users should review the CHANGES file +and decide on their upgrade plans; We consider Apache 1.3.3 to be the most stable version of Apache available. -Apache 1.3.2 is available for download from +Apache 1.3.3 is available for download from http://www.apache.org/dist/ @@ -26,10 +30,10 @@ In general, Apache 1.3 offers several substantial improvements over version 1.2, including better performance, reliability and a -wider-range of supported platforms, including Windows 95 and NT +wider range of supported platforms, including Windows 95 and NT (which both fall under the Win32 label). -Apache is the most popular web-server in the known universe; over +Apache is the most popular web server in the known universe; over half of the servers on the Internet are running Apache or one of its variants. @@ -42,4 +46,3 @@ and resources by individuals and companies, we hope that the Win32 version of Apache will grow stronger through the 1.3.x release cycle. -
cvs commit: apache-1.3 Announcement
jim 98/10/06 13:12:43 Modified:.Announcement Log: Just some additional notes on 1.3.3 Revision ChangesPath 1.38 +10 -8 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- Announcement 1998/10/06 19:56:50 1.37 +++ Announcement 1998/10/06 20:12:43 1.38 @@ -5,14 +5,16 @@ 1.3.3 of the Apache HTTP server. This new Apache version is mainly a bugfix release. In the previous -1.3.2 release, server error reporting was seriously broken. -This affected the functionality of most custom ErrorDocuments and -of modules such as mod_speling. -Additionally, changes in this release consist of new supported platforms, -Win32 and Unix portability fixes, ErrorDocument environment enhancements, -and assorted other features or fixes. Users should review the CHANGES file -and decide on their upgrade plans; We consider Apache 1.3.3 to be the -most stable version of Apache available. +1.3.2 release, server error reporting was seriously broken. This +affected the functionality of most custom ErrorDocuments and of modules +such as mod_speling. Additionally, changes in this release consist of +new supported platforms, Win32 and Unix portability fixes, ErrorDocument +environment enhancements, incorrect error reporting of non-existant +.htaccess files and assorted other features or fixes. Users should +review the CHANGES file and decide on their upgrade plans; We consider +Apache 1.3.3 to be the most stable version of Apache available and we +strongly recommend that users of older versions, especially of the 1.1.x +and 1.2.x family, upgrade as soon as possible. Apache 1.3.3 is available for download from
cvs commit: apache-1.3 Announcement
fielding98/10/06 13:29:41 Modified:.Announcement Log: Minor rewording and mention HTTP/1.1 revision stuff. Revision ChangesPath 1.39 +17 -13apache-1.3/Announcement Index: Announcement === RCS file: /home/cvs/apache-1.3/Announcement,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- Announcement 1998/10/06 20:12:43 1.38 +++ Announcement 1998/10/06 20:29:39 1.39 @@ -4,17 +4,21 @@ The Apache Group is pleased to announce the release of version 1.3.3 of the Apache HTTP server. -This new Apache version is mainly a bugfix release. In the previous -1.3.2 release, server error reporting was seriously broken. This -affected the functionality of most custom ErrorDocuments and of modules -such as mod_speling. Additionally, changes in this release consist of -new supported platforms, Win32 and Unix portability fixes, ErrorDocument -environment enhancements, incorrect error reporting of non-existant -.htaccess files and assorted other features or fixes. Users should -review the CHANGES file and decide on their upgrade plans; We consider -Apache 1.3.3 to be the most stable version of Apache available and we -strongly recommend that users of older versions, especially of the 1.1.x -and 1.2.x family, upgrade as soon as possible. +This new Apache version is a bugfix release, primarily to fix a +serious problem with server error reporting introduced in 1.3.2. +This affected the functionality of most custom ErrorDocuments and +of some modules that depend on special error output (e.g., mod_speling). +A side-effect bug that resulted in incorrect error reporting of +nonexistent .htaccess files has also been fixed. + +Additional changes in this release consist of new supported platforms, +Win32 and Unix portability fixes, ErrorDocument environment enhancements, +improved protocol behavior to match the HTTP/1.1 revised specification, +and assorted other features or fixes. Users should review the CHANGES file +and decide on their upgrade plans. We consider Apache 1.3.3 to be the +most stable version of Apache available and we strongly recommend that +users of older versions, especially of the 1.1.x and 1.2.x family, upgrade +as soon as possible. Apache 1.3.3 is available for download from @@ -46,5 +50,5 @@ Win32 stability or security problems do not impact, in any way, Apache on other platforms. With the continued donation of time and resources by individuals and companies, we hope that the Win32 -version of Apache will grow stronger through the 1.3.x release -cycle. +version of Apache will grow stronger through the 1.3.x release cycle. +
cvs commit: apache-devsite how-to-release.html
martin 98/10/06 13:33:43 Modified:.how-to-release.html Log: Add pointer to copies of Announcement Revision ChangesPath 1.48 +49 -18apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- how-to-release.html 1998/10/06 15:05:29 1.47 +++ how-to-release.html 1998/10/06 20:33:42 1.48 @@ -41,8 +41,8 @@ POnce a release is built (A HREF=#tarballsee below/A), it is time to announce it to the world. Ideally, the Announcement -should be composed STRONGbefore/STRONG the Release is actually built. So -we describe these steps at the beginning. +should be composed and committed STRONGbefore/STRONG the +Release is actually built. So we describe these steps at the beginning. OL HR @@ -55,12 +55,16 @@ release. For example, the Release Version should reflect what is actually being announced. Also, the key enhancements of the Release should be noted.BR - CODESTRONG$ cvs checkout apache-1.X/STRONG/CODEBR + CODESTRONG$ cvs checkout apache-1.X/Announcement/STRONG/CODEBR CODESTRONG$ cd apache-1.X/STRONG/CODEBR CODESTRONG$ vi Announcement/STRONG/CODEBR CODESTRONG$ cvs commit Announcement/STRONG/CODEBR CODESTRONG$ cd ../STRONG/CODEBR CODESTRONG$ cvs release -d apache-1.X/STRONG/CODE + P + STRONGNote:/STRONG This document is also present in the + CODEapache-site/dist//CODE directory, both in HTML and plain + text form. You may want to create one version out of the other. P HR STRONG[ Building the source release ]/STRONGBR @@ -112,9 +116,10 @@ will be noted. PFONT COLOR=redImportant:/FONT Once tagged and the tarball -is rolled, there is no going back. If there are problems with -the tarball, the version number (either the rev-level or beta-level) -EMmust/EM be bumped resulting in a new tag, tarball and release. +is rolled, there is STRONGno going back/STRONG. If there are +problems with the tarball, the version number (either the rev-level +or beta-level) EMmust/EM be bumped resulting in a new tag, +tarball and release. OL HR @@ -139,7 +144,7 @@ edit SAMPsrc/os/win32/registry.c/SAMP and change the CODEVERSION/CODE from CODE1.X.Y dev/CODE to the string CODE1.X.Y/CODE.BR Additionally make sure the - Configure scripts version knowledge for the + Configure script's version knowledge for the CODESHARED_CORE/CODE reflects the correct version.revision.patchlevel triple. Look for the line ``CODEV=1 R=3 P=2/CODE'' inside CODEsrc/Configure/CODE and adjust it accordingly. @@ -149,9 +154,14 @@ CODESTRONG$ vi src/Configure/STRONG/CODEBR CODESTRONG$ cvs commit src/include/httpd.h src/os/win32/registry.c src/Configure/STRONG/CODE P +LI Make sure your PGP keys are already present in the CODEKEYS/CODE + file. If they are not, extract your public key using the + ``CODEpgpnbsp;-kxa/CODE'' command, add them to the + CODEKEYS/CODE file and commit it before tagging. +P LI Tag the sources for this release:BR (EMnote: be sure to tag the whole thing, not just CODEsrc/CODE/EM!)BR - CODESTRONG$ cvs tag APACHE_1_X_Y ./STRONG/CODE + CODESTRONG$ cvs tag APACHE_1_X_Y/STRONG/CODE P HR STRONG[ For all releases ]/STRONGBR @@ -228,7 +238,8 @@ required. We still need the CVS tree, see below)BR CODESTRONG$ rm -fr apache_1.X.Y/STRONG/CODE P -LI Make the tarball available for testing purposes: (http://dev.apache.org/dist/)BR +LI Make the tarball available for testing purposes + (in A HREF=http://dev.apache.org/dist/;http://dev.apache.org/dist//A):BR CODESTRONG$ chmod 664 CHANGES apache_1.X.Y.tar.*/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.gz /pub/httpd/dist/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.gz.asc /pub/httpd/dist/STRONG/CODEBR @@ -253,9 +264,9 @@ CODEAPACHE_RELEASE/CODE to CODE1XX(YY+1)01/CODE.BR In the CODEVERSION/CODE macro in SAMPsrc/os/win32/registry.c/SAMP, increase the version - number and re-insert the dev suffix (change the string - ``CODE1.X.Y/CODE'' to ``CODE1.X.(Y+1) dev/CODE''; note - the SPACE character instrad of the hyphen).BR + number and re-insert the ``nbsp;dev'' suffix (change the string + ``CODE1.X.Y/CODE'' to ``CODE1.X.(Y+1)nbsp;dev/CODE''; note + the SPACE character instead of the hyphen).BR CODESTRONG$ vi src/include/httpd.h src/os/win32/registry.c/STRONG/CODEBR CODESTRONG$ cvs commit src/include/httpd.h src/os/win32/registry.c/STRONG/CODEBR CODESTRONG$ cd
cvs commit: apache-devsite how-to-release.html
martin 98/10/06 13:36:50 Modified:.how-to-release.html Log: correct CHANGES name to apache-site/dist/CHANGES_1.X Revision ChangesPath 1.49 +1 -1 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- how-to-release.html 1998/10/06 20:33:42 1.48 +++ how-to-release.html 1998/10/06 20:36:48 1.49 @@ -288,7 +288,7 @@ P LI Make the distribution available (in A HREF=http://www.apache.org/dist/;http://www.apache.org/dist//A):BR - CODESTRONG$ cp CHANGES /pub/apache/dist/STRONG/CODEBR + CODESTRONG$ cp CHANGES /pub/apache/dist/CHANGES_1.X/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.gz /pub/apache/dist/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.gz.asc /pub/apache/dist/STRONG/CODEBR CODESTRONG$ cp apache_1.X.Y.tar.Z /pub/apache/dist/STRONG/CODEBR
cvs commit: apache-1.3 STATUS
fielding98/10/06 13:46:34 Modified:.STATUS Log: Remove things done today and increase priority of binary build discussion. Revision ChangesPath 1.503 +44 -55apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.502 retrieving revision 1.503 diff -u -r1.502 -r1.503 --- STATUS1998/10/05 23:04:28 1.502 +++ STATUS1998/10/06 20:46:32 1.503 @@ -18,6 +18,48 @@ * need to ensure it compiles properly on win32 before rolling the tarball, and that no last minute changes break it +* How should an Apache binary release tarball look? + + 1. The old way where it is just a source release tarball + plus a pre-compiled src/httpd-gnutriple. It is created + via the apache-devsite/binbuild.sh script which + - creates the build tree + - creates the src/Configuration file with standard modules + - runs make + - renames src/httpd to src/httpd-gnutriple + - runs make clean + - packs the build tree stuff together + Already known discussion points: + - should src/httpd be renamed or now because a lot + of PRs say they cannot find the httpd :-( + Status: Ralf -0, Ken +0 + + 2. The way other projects release binary tarballs, i.e. + a package containing the installed (binary) files. + It can be created by a script which + - creates the build tree + - runs ./configure --prefix=/usr/local/apache \ + --enable-shared=remain \ + --disable-module=auth_db \ + --enable-suexec ... + - runs make install root=apache-root + - packs the stuff together from ./apache-root only!! + Already known discussion points: + - should there be a prefix usr/local/apache in + the tarball or not? Some people think + it's useful while others dislike it a lot. + - it doesn't include the source. + - should suexec be prebuilt in a binary tarball? + Status: Ralf +1, Martin +1, Ken -1 (not a veto), Roy -1 + + 3. A source release tarball with three extra directories: +lib: for the shared library object files +bin: for the httpd and support executables +man: for the man files (if desired) + as if the server was installed in those directories. + Status: Roy +1 + + Documentation that needs writing: * Need a document explaining mod_rewrite/UseCanonicalName off based @@ -47,24 +89,11 @@ Message-ID: [EMAIL PROTECTED] Status: Ralf +1, Lars +1 -* Paul's patch to add integrated restart/shutdown signalling (Win32) - This patch make Apache listen on predictable event names to allow - restarts and shutdowns to be initiated. Also adds a new command line - option to send the shutdown or restart signal to the running parent - process. - Message-ID: [EMAIL PROTECTED] - Status: Ken +1 (on concept), Lars +1 (on concept), Jim +1 (concept) - Martin +1 (on concept; the restart switches could -be added to the unix version, too) - In progress: * Ken's IndexFormat enhancement to mod_autoindex to allow CustomLog-like tailoring of directory listing formats -* Roy is working on the 100 Continue problem with calls to - ap_discard_request_body() - Needs patch: * Ralf: mod_so doesn't correctly initialise modules. For instance @@ -147,45 +176,6 @@ You can differentiate by comparing the output of `uname -m' with any of: alpha bebox macppc newsmips ofppc pica pmax sparc64. -* How should an Apache binary release tarball look? - NOTE: This should be resolved before 1.3.3 !! - - 1. The old way where it is just a source release tarball - plus a pre-compiled src/httpd-gnutriple. It is created - via the apache-devsite/binbuild.sh script which - - creates the build tree - - creates the src/Configuration file with standard modules - - runs make - - renames src/httpd to src/httpd-gnutriple - - runs make clean - - packs the build tree stuff together - Already known discussion points: - - should src/httpd be renamed or now because a lot - of PRs say they cannot find the httpd :-( - Pros: gets filled tomorrow - Cons: gets filled tomorrow - Status: Ralf -0, Ken +0 - - 2. The way other projects release binary tarballs, i.e. - a package containing the installed (binary) files. - It can be
cvs commit: apache-1.3 STATUS
fielding98/10/06 13:59:05 Modified:.STATUS Log: Point to Harrie's patch (Jim must have missed it) Revision ChangesPath 1.504 +7 -0 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.503 retrieving revision 1.504 diff -u -r1.503 -r1.504 --- STATUS1998/10/06 20:46:32 1.503 +++ STATUS1998/10/06 20:59:05 1.504 @@ -70,6 +70,13 @@ Available Patches: +* Harrie Hazewinkel's PATCH scoreboard + This is a patch that changes the 'vhost'-name (type char [32]) + in the scoreboard into a 'vhost'-number (type int), and then uses a + lookup table to display the server name. +Message-ID: [EMAIL PROTECTED] +Status: Roy (untested +1) + * Manoj's [PATCH] mime.types update Message-ID: [EMAIL PROTECTED] Status: Roy thinks we should put a common_mime_types.txt file in
cvs commit: apache-1.3 STATUS
dgaudet 98/10/06 14:55:18 Modified:.STATUS Log: it's october in sanfrancisco, summer is finally here Revision ChangesPath 1.505 +6 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.504 retrieving revision 1.505 diff -u -r1.504 -r1.505 --- STATUS1998/10/06 20:59:05 1.504 +++ STATUS1998/10/06 21:55:16 1.505 @@ -76,6 +76,12 @@ lookup table to display the server name. Message-ID: [EMAIL PROTECTED] Status: Roy (untested +1) + Dean -1: I see no need to add a new virtual host number to the + server guts... although I can understand why it's nice for + SNMP. However I'd be totally for a patch which places + server_rec * into the scoreboard in place of the name + -- because the pointers are valid across parent and + children... why waste the time doing number lookups and such. * Manoj's [PATCH] mime.types update Message-ID: [EMAIL PROTECTED]
