cvs commit: apache-site related_projects.html
fielding00/02/08 16:04:59 Modified:.related_projects.html Log: Add pointer for Vision For Apache Submitted by: Lawrie Scovell <[EMAIL PROTECTED]> Revision ChangesPath 1.47 +13 -0 apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- related_projects.html 2000/02/08 21:05:52 1.46 +++ related_projects.html 2000/02/09 00:04:57 1.47 @@ -50,6 +50,7 @@ Red Hat Secure Server Stronghold WebTen, a MacOS port of Apache +Vision For Apache @@ -330,6 +331,18 @@ For more information visit http://www.tenon.com/products/webten/";>Tenon's web site. + + + +Vision For Apache + +Vision For Apache is a 100% Java graphical user interface for the Apache +HTTP server. Free for non-commercial use. Commercial license includes online +support and updates. + + +For more information visit +http://www.focus-array.com/";>The Focus Array's web site.
cvs commit: apache-1.3/src/modules/proxy proxy_util.c
fielding00/02/07 16:34:44 Modified:src/main http_protocol.c src/modules/proxy proxy_util.c Log: Fix a few more cases where we were not properly html_escaping text for error-notes that came from the untrusted client request. Revision ChangesPath 1.288 +2 -2 apache-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.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- http_protocol.c 2000/02/02 20:43:50 1.287 +++ http_protocol.c 2000/02/08 00:34:36 1.288 @@ -958,7 +958,7 @@ r->status = HTTP_BAD_REQUEST; ap_table_setn(r->notes, "error-notes", ap_pstrcat(r->pool, "Size of a request header field exceeds server limit.\n" -"\n", field, "\n", NULL)); +"\n", ap_escape_html(r->pool, field), "\n", NULL)); return; } copy = ap_palloc(r->pool, len + 1); @@ -968,7 +968,7 @@ r->status = HTTP_BAD_REQUEST; /* or abort the bad request */ ap_table_setn(r->notes, "error-notes", ap_pstrcat(r->pool, "Request header field is missing colon separator.\n" -"\n", copy, "\n", NULL)); +"\n", ap_escape_html(r->pool, copy), "\n", NULL)); return; } 1.85 +3 -2 apache-1.3/src/modules/proxy/proxy_util.c Index: proxy_util.c === RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- proxy_util.c 2000/02/02 20:43:57 1.84 +++ proxy_util.c 2000/02/08 00:34:40 1.85 @@ -845,13 +845,14 @@ ap_pstrcat(r->pool, "The proxy server could not handle the request " "pool, r->uri), - "\">", r->method, " ", + "\">", ap_escape_html(r->pool, r->method), + " ", ap_escape_html(r->pool, r->uri), ".\n" "Reason: ", ap_escape_html(r->pool, message), "", NULL)); -/* Allow the "error-notes" string to be printed by ap_send_error_response() */ +/* Allow "error-notes" string to be printed by ap_send_error_response() */ ap_table_setn(r->notes, "verbose-error-to", ap_pstrdup(r->pool, "*")); r->status_line = ap_psprintf(r->pool, "%3.3u Proxy Error", statuscode);
cvs commit: apache-site related_projects.html
fielding00/01/27 15:30:18 Modified:.related_projects.html Log: Add mention of kshIndex Submitted by: Dana French <[EMAIL PROTECTED]> Revision ChangesPath 1.44 +12 -0 apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- related_projects.html 2000/01/21 21:22:42 1.43 +++ related_projects.html 2000/01/27 23:30:15 1.44 @@ -34,6 +34,7 @@ Apache Documentation Project Apache Quick Reference Card Webmonkey XSSI Extensions +kshIndex fancy index utility Commercial Products @@ -226,6 +227,17 @@ You can http://www.hotwired.com/webmonkey/javascript/code_library/wm_dwxssi_ext/";>obtain the extensions here. + + +kshIndex fancy index utility + +http://www.aigsupport.com/fancyIndex/Tools/CGI/kshIndex/";>kshIndex +is a set of utilities and scripts built around the +Apache fancyIndex functions. It allows webmasters to provide +a variety of functions to users including automated indexing +of URL's, files, and directories, user authorization management, +cascading user customization, events calendars, contact lists, etc. Apache Week
cvs commit: apache-1.3/src/main http_vhost.c
fielding00/01/16 12:59:59
Modified:src/main http_vhost.c
Log:
Squash warnings by using ap_isalnum and ap_isdigit.
Revision ChangesPath
1.18 +2 -2 apache-1.3/src/main/http_vhost.c
Index: http_vhost.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_vhost.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- http_vhost.c 1999/12/20 18:16:50 1.17
+++ http_vhost.c 2000/01/16 20:59:59 1.18
@@ -670,7 +670,7 @@
src = r->hostname;
dst = host;
while (*src) {
- if (!isalnum(*src) && *src != '.' && *src != '-') {
+ if (!ap_isalnum(*src) && *src != '.' && *src != '-') {
if (*src == ':')
break;
else
@@ -682,7 +682,7 @@
/* check the port part */
if (*src++ == ':') {
while (*src) {
- if (!isdigit(*src++)) {
+ if (!ap_isdigit(*src++)) {
goto bad;
}
}
cvs commit: apache-1.3/src/main http_main.c
fielding00/01/11 19:38:25
Modified:src CHANGES
src/main http_main.c
Log:
this patch is intended to avoid a problem witnessed in apache
installations with certain third party libraries: if there are many
children, and then take sufficiently long to shut down, then apache's
reclaim child processes sends the remaining children SIGKILL. that's
alright with me -- shutdown shouldn't take so long -- but the current code
doesn't wait around for them to die; if they haven't all finished
terminating right away, it sleeps for approximately 16 seconds before
noticing that they're dead. thus, the total time required to shut down is
generally a bit more than twenty seconds ... the last 16 seconds of which
is quite unnecessary.
anyway, what this patch does is change things so that after SIGKILL has
been sent, the parent checks a couple of times (approx: 16ms, 84ms, 350ms,
1.4sec) and then decides that the SIGKILL failed. i could easily adjust
this so that the total time spent waiting for the SIGKILL to fail is what
it was -- 16 seconds, give or take -- but in writing this, i figured that
if they haven't died after 1.4 seconds, then the SIGKILL wasn't
sufficient; it's not instant, but it should never take that long.
Submitted by: Ed Korthof <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision ChangesPath
1.1496+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1495
retrieving revision 1.1496
diff -u -r1.1495 -r1.1496
--- CHANGES 2000/01/12 01:15:20 1.1495
+++ CHANGES 2000/01/12 03:38:14 1.1496
@@ -1,5 +1,10 @@
Changes with Apache 1.3.10
+ *) Reduce the time that a parent waits for its children to die
+ after SIGKILL has been sent, since there isn't much point in waiting
+ another 16 seconds beyond the initial SIGTERM waiting period.
+ [Ed Korthof]
+
*) Revert to the 1.3.3 way of getting the server name from the
scoreboard, with a modification to make it respect the
UseCanonicalName setting. This makes things work better with
1.488 +7 -2 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- http_main.c 2000/01/12 01:13:23 1.487
+++ http_main.c 2000/01/12 03:38:19 1.488
@@ -2380,7 +2380,7 @@
ap_sync_scoreboard_image();
-for (tries = terminate ? 4 : 1; tries <= 9; ++tries) {
+for (tries = terminate ? 4 : 1; tries <= 12; ++tries) {
/* don't want to hold up progress any more than
* necessary, but we need to allow children a few moments to exit.
* Set delay with an exponential backoff.
@@ -2435,8 +2435,13 @@
"child process %d still did not exit, sending a SIGKILL",
pid);
kill(pid, SIGKILL);
+ waittime = 1024 * 16; /* give them some time to die */
break;
- case 9: /* 14 sec */
+ case 9: /* 6 sec */
+ case 10:/* 6.1 sec */
+ case 11:/* 6.4 sec */
+ break;
+ case 12:/* 7.4 sec */
/* gave it our best shot, but alas... If this really
* is a child we are trying to kill and it really hasn't
* exited, we will likely fail to bind to the port
cvs commit: apache-2.0/src/lib/apr/include apr_errno.h
fielding99/10/21 09:13:25
Modified:src/lib/apr/include apr_errno.h
Log:
Sorry to butt-in, but all these magic offsets make me itch.
Add APR_OS_START_STATUS, APR_OS_START_SYSERR, and APR_OS_START_USEERR.
Revision ChangesPath
1.8 +114 -94 apache-2.0/src/lib/apr/include/apr_errno.h
Index: apr_errno.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr_errno.h 1999/10/21 15:16:10 1.7
+++ apr_errno.h 1999/10/21 16:13:24 1.8
@@ -62,366 +62,386 @@
extern "C" {
#endif /* __cplusplus */
+/* Define four layers of status code offsets so that we don't interfere
+ * with the predefined errno codes on the operating system. Codes beyond
+ * APR_OS_START_USEERR are reserved for applications that use APR that
+ * layer their own error codes along with APR's.
+ */
+#ifndef APR_OS_START_ERROR
#define APR_OS_START_ERROR 4000
+#endif
+#ifndef APR_OS_START_STATUS
+#define APR_OS_START_STATUS (APR_OS_START_ERROR + 500)
+#endif
+#ifndef APR_OS_START_SYSERR
+#define APR_OS_START_SYSERR (APR_OS_START_STATUS + 500)
+#endif
+#ifndef APR_OS_START_USEERR
+#define APR_OS_START_USEERR (APR_OS_START_SYSERR + 500)
+#endif
/* If this definition of APRStatus changes, then we can remove this, but
right
- now, the decision was to use an errno-like implementation.
-*/
+ * now, the decision was to use an errno-like implementation.
+ */
typedef int ap_status_t;
#define APR_SUCCESS 0
+/* APR ERROR VALUES */
+#define APR_ENOSTAT(APR_OS_START_ERROR + 1)
+#define APR_ENOPOOL(APR_OS_START_ERROR + 2)
+#define APR_ENOFILE(APR_OS_START_ERROR + 3)
+#define APR_EBADDATE (APR_OS_START_ERROR + 4)
+#define APR_ENOCONT(APR_OS_START_ERROR + 5)
+#define APR_ENOPROC(APR_OS_START_ERROR + 6)
+#define APR_ENOTIME(APR_OS_START_ERROR + 7)
+#define APR_ENODIR (APR_OS_START_ERROR + 8)
+#define APR_ENOLOCK(APR_OS_START_ERROR + 9)
+#define APR_ENOPOLL(APR_OS_START_ERROR + 10)
+#define APR_ENOSOCKET (APR_OS_START_ERROR + 11)
+#define APR_ENOTHREAD (APR_OS_START_ERROR + 12)
+#define APR_ENOTHDKEY (APR_OS_START_ERROR + 13)
+#define APR_ENOTTHREADSAFE (APR_OS_START_ERROR + 14)
+
+/* APR STATUS VALUES */
+#define APR_INCHILD(APR_OS_START_STATUS + 1)
+#define APR_INPARENT (APR_OS_START_STATUS + 2)
+#define APR_DETACH (APR_OS_START_STATUS + 3)
+#define APR_NOTDETACH (APR_OS_START_STATUS + 4)
+#define APR_CHILD_DONE (APR_OS_START_STATUS + 5)
+#define APR_CHILD_NOTDONE (APR_OS_START_STATUS + 6)
+#define APR_TIMEUP (APR_OS_START_STATUS + 7)
+#define APR_INVALSOCK (APR_OS_START_STATUS + 8)
+#define APR_ALLSTD (APR_OS_START_STATUS + 9)
+#define APR_STDOUT (APR_OS_START_STATUS + 10)
+#define APR_STDERR (APR_OS_START_STATUS + 11)
+#define APR_BADCH (APR_OS_START_STATUS + 12)
+#define APR_BADARG (APR_OS_START_STATUS + 13)
+#define APR_EOF(APR_OS_START_STATUS + 14)
+#define APR_NOTFOUND (APR_OS_START_STATUS + 15)
+
+/* A simple value to be used to initialze a status variable. */
+#define APR_EINIT (APR_OS_START_STATUS + 16)
+
+/* Not implemented either because we haven't gotten to it yet, or
+ * because it is not possible to do correctly.
+ */
+#define APR_ENOTIMPL (APR_OS_START_STATUS + 17)
+
+/*
+ * APR equivalents to what should be standard errno codes.
+ */
#ifdef EACCES
#define APR_EACCES EACCES
#else
-#define APR_EACCES (APR_OS_START_ERROR + 1000)
+#define APR_EACCES (APR_OS_START_SYSERR + 0)
#endif
#ifdef EEXIST
#define APR_EEXIST EEXIST
#else
-#define APR_EEXIST (APR_OS_START_ERROR + 1001)
+#define APR_EEXIST (APR_OS_START_SYSERR + 1)
#endif
#ifdef EISDIR
#define APR_EISDIR EISDIR
#else
-#define APR_EISDIR (APR_OS_START_ERROR + 1002)
+#define APR_EISDIR (APR_OS_START_SYSERR + 2)
#endif
#ifdef ENAMETOOLONG
#define APR_ENAMETOOLONG ENAMETOOLONG
#else
-#define APR_ENAMETOOLONG (APR_OS_START_ERROR + 1003)
+#define APR_ENAMETOOLONG (APR_OS_START_SYSERR + 3)
#endif
#ifdef ENOENT
#define APR_ENOENT ENOENT
#else
-#define APR_ENOENT (APR_OS_START_ERROR + 1004)
+#define APR_ENOENT (APR_OS_START_SYSERR + 4)
#endif
#ifdef ENOTDIR
#define APR_ENOTDIR ENOTDIR
#else
-#define APR_ENOTDIR (APR_OS_START_ERROR + 1005)
+#define APR_ENOTDIR (APR_OS_START_SYSERR + 5)
#endif
#ifdef ENXIO
#define APR_ENXIO ENXIO
#else
-#define APR_ENXIO (APR_OS_START_ERROR + 1006)
+#define APR_ENXIO (APR_OS_START_SYSERR + 6)
#endif
#ifdef ENO
cvs commit: apache-site httpd.html
fielding99/09/10 18:54:45 Modified:.httpd.html Log: Revert last change -- it screws up mirroring. Revision ChangesPath 1.82 +0 -1 apache-site/httpd.html Index: httpd.html === RCS file: /export/home/cvs/apache-site/httpd.html,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- httpd.html1999/09/09 19:16:25 1.81 +++ httpd.html1999/09/11 01:54:43 1.82 @@ -1,7 +1,6 @@ Apache Project -http://www.apache.org/";>
cvs commit: apache-2.0/src/modules/standard Makefile.tmpl
fielding99/09/01 15:48:17 Modified:src CHANGES Configuration.tmpl src/modules README src/modules/experimental Makefile.tmpl src/modules/standard Makefile.tmpl Removed: src/modules/experimental mod_auth_digest.c Log: Moved mod_auth_digest.c from experimental to standard. Revision ChangesPath 1.8 +2 -0 apache-2.0/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-2.0/src/CHANGES,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CHANGES 1999/08/31 21:57:32 1.7 +++ CHANGES 1999/09/01 22:48:10 1.8 @@ -1,5 +1,7 @@ Changes with Apache 2.0-dev + *) Moved mod_auth_digest.c from experimental to standard. [Roy Fielding] + *) Change all pools to APR contexts. This is the first step to incorporating APR into Apache. [Ryan Bloom] 1.4 +2 -3 apache-2.0/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /home/cvs/apache-2.0/src/Configuration.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Configuration.tmpl1999/08/30 07:16:49 1.3 +++ Configuration.tmpl1999/09/01 22:48:11 1.4 @@ -374,8 +374,7 @@ ## "auth_digest" implements HTTP/1.1 Digest Authentication (RFC 2617) ## rather than the less secure Basic Auth used by the other modules. -## This is an updated version of mod_digest, but it is not as well tested -## and is therefore marked experimental. Use either the one above, or +## This is an updated version of mod_digest. Use either the one above, or ## this one below, but not both digest modules. ## Note: if you add this module in then you might also need the ## truerand library (available for example from @@ -386,7 +385,7 @@ ## WWW-Authenticate and Proxy-Authenticate headers are parsed in the ## post-read-request phase and it needs to know if this is a proxy request. -# AddModule modules/experimental/mod_auth_digest.o +# AddModule modules/standard/mod_auth_digest.o ## Optional Proxy ## 1.2 +0 -4 apache-2.0/src/modules/README Index: README === RCS file: /home/cvs/apache-2.0/src/modules/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README1999/08/24 06:55:06 1.1 +++ README1999/09/01 22:48:13 1.2 @@ -17,10 +17,6 @@ evolve radically in the future. This code isn't supported officially. -extra/ - - This is the directory for third-party modules, such as mod_jserv. - test/ This directory houses modules which test various components 1.2 +0 -9 apache-2.0/src/modules/experimental/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/src/modules/experimental/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.tmpl 1999/08/24 06:55:12 1.1 +++ Makefile.tmpl 1999/09/01 22:48:14 1.2 @@ -12,12 +12,3 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ $(INCDIR)/http_request.h $(INCDIR)/http_core.h -mod_digest.o: mod_digest.c $(INCDIR)/httpd.h \ - $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \ - $(INCDIR)/ap_md5.h 1.4 +9 -0 apache-2.0/src/modules/standard/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/src/modules/standard/Makefile.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.tmpl 1999/09/01 14:38:40 1.3 +++ Makefile.tmpl 1999/09/01 22:48:17 1.4 @@ -102,6 +102,15 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h +mod_auth_digest.o: mod_auth_digest.c $(INCDIR)/httpd.h \ + $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \ + $(INCDIR)/ap_md5.h
cvs commit: apache-2.0 STATUS
fielding99/08/27 20:25:05 Modified:.STATUS Log: Enough for one week. Revision ChangesPath 1.4 +17 -1 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- STATUS1999/08/28 02:44:09 1.3 +++ STATUS1999/08/28 03:25:04 1.4 @@ -1,5 +1,5 @@ Apache 2.0 STATUS: -Last modified at [$Date: 1999/08/28 02:44:09 $] +Last modified at [$Date: 1999/08/28 03:25:04 $] Release: @@ -53,6 +53,11 @@ behavior. Dean has suggested getting rid of regex containers completely. +* Areas where APRFile is being used need to be cleaned-up + +* mod_mmap_static hides ap_block_alarms() and ap_unblock_alarms() + This should really be done in some header file elsewhere. + Other features that need writing: * Finish infrastructure in core for async MPMs @@ -60,6 +65,8 @@ * TODO in source -- just do an egrep on "TODO" and see what's there +* Odd comments in source (egrep for "ZZZ") need to be cleaned-up + * Work on other MPMs. Possible MPMs discussed or in progress include: - David Reid's <[EMAIL PROTECTED]> Beos MPM @@ -82,6 +89,12 @@ Status: Ben Laurie has written some hooks documentation (apache-2.0/htdocs/hooks.html) +* Changes since 1.3.9 can be more easily seen in the commitlog file + dev.apache.org:/home/cvs/CVSROOT/commitlogs/apache-2.0 + which includes some of Roy's comments when the changes were + committed in rough change-sets by purpose. Note that the commitlog + does not show the contents of new files until later. + Available Patches: * Mike Abbott's <[EMAIL PROTECTED]> patches to improve @@ -94,3 +107,6 @@ * What do we do about mod_proxy? * Which MPMs will be included with Apache 2.0? + + * Is conf/highperformance.conf-dist obsolete? It looks obsolete. +
cvs commit: apache-1.3/src/regex regex2.h
fielding99/08/27 20:07:32 Modified:src/regex regex2.h Log: Change defined(RHAPSODY) to defined(MAC_OS) || defined(MAC_OS_X_SERVER) to match the rest of the server. Revision ChangesPath 1.9 +1 -1 apache-1.3/src/regex/regex2.h Index: regex2.h === RCS file: /home/cvs/apache-1.3/src/regex/regex2.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- regex2.h 1998/10/19 02:16:28 1.8 +++ regex2.h 1999/08/28 03:07:32 1.9 @@ -8,7 +8,7 @@ = #endif = #endif = - = #if defined(RHAPSODY) + = #if defined(MAC_OS) || defined(MAC_OS_X_SERVER) = #define ap_private_extern __private_extern__ = #else = #define ap_private_extern
cvs commit: apache-2.0/src/regex regex2.h
fielding99/08/27 20:03:35 Modified:src/include hsregex.h src/lib/apr/include hsregex.h src/regex regex2.h Log: Change defined(RHAPSODY) to defined(MAC_OS) || defined(MAC_OS_X_SERVER) to match the rest of the server. Revision ChangesPath 1.3 +1 -1 apache-2.0/src/include/hsregex.h Index: hsregex.h === RCS file: /home/cvs/apache-2.0/src/include/hsregex.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hsregex.h 1999/08/26 07:21:43 1.2 +++ hsregex.h 1999/08/28 03:03:32 1.3 @@ -16,7 +16,7 @@ #endif #endif -#if defined(RHAPSODY) +#if defined(MAC_OS) || defined(MAC_OS_X_SERVER) #define ap_private_extern __private_extern__ #else #define ap_private_extern 1.2 +1 -1 apache-2.0/src/lib/apr/include/hsregex.h Index: hsregex.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/include/hsregex.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hsregex.h 1999/08/17 15:59:53 1.1 +++ hsregex.h 1999/08/28 03:03:34 1.2 @@ -16,7 +16,7 @@ #endif #endif -#if defined(RHAPSODY) +#if defined(MAC_OS) || defined(MAC_OS_X_SERVER) #define ap_private_extern __private_extern__ #else #define ap_private_extern 1.9 +1 -1 apache-2.0/src/regex/regex2.h Index: regex2.h === RCS file: /home/cvs/apache-2.0/src/regex/regex2.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- regex2.h 1998/10/19 02:16:28 1.8 +++ regex2.h 1999/08/28 03:03:34 1.9 @@ -8,7 +8,7 @@ = #endif = #endif = - = #if defined(RHAPSODY) + = #if defined(MAC_OS) || defined(MAC_OS_X_SERVER) = #define ap_private_extern __private_extern__ = #else = #define ap_private_extern
cvs commit: apache-1.3/src/main http_core.c
fielding99/08/27 19:51:32
Modified:src/main http_core.c
Log:
Reverse a change that was made in rev 1.227 because the old version
was better (and consistent with what was left in Apache 2.0).
Revision ChangesPath
1.272 +4 -10 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- http_core.c 1999/08/09 07:29:29 1.271
+++ http_core.c 1999/08/28 02:51:31 1.272
@@ -3037,16 +3037,10 @@
}
if (r->finfo.st_mode == 0 || (r->path_info && *r->path_info)) {
- char *emsg;
-
- emsg = "File does not exist: ";
- if (r->path_info == NULL) {
- emsg = ap_pstrcat(r->pool, emsg, r->filename, NULL);
- }
- else {
- emsg = ap_pstrcat(r->pool, emsg, r->filename, r->path_info, NULL);
- }
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, "%s", emsg);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
+ "File does not exist: %s",r->path_info ?
+ ap_pstrcat(r->pool, r->filename, r->path_info, NULL)
+ : r->filename);
return HTTP_NOT_FOUND;
}
if (r->method_number != M_GET) {
cvs commit: apache-2.0 STATUS
fielding99/08/27 19:44:10 Modified:.STATUS Log: no shortage of things TODO Revision ChangesPath 1.3 +3 -1 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- STATUS1999/08/27 19:02:51 1.2 +++ STATUS1999/08/28 02:44:09 1.3 @@ -1,5 +1,5 @@ Apache 2.0 STATUS: -Last modified at [$Date: 1999/08/27 19:02:51 $] +Last modified at [$Date: 1999/08/28 02:44:09 $] Release: @@ -57,6 +57,8 @@ * Finish infrastructure in core for async MPMs Status: ? + +* TODO in source -- just do an egrep on "TODO" and see what's there * Work on other MPMs. Possible MPMs discussed or in progress include:
cvs commit: apache-2.0/src/main http_core.c
fielding99/08/27 19:38:00
Modified:src/main http_core.c
Log:
Remove error message that was missed in an earlier merge with 1.3.x.
Revision ChangesPath
1.9 +1 -6 apache-2.0/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- http_core.c 1999/08/26 16:34:13 1.8
+++ http_core.c 1999/08/28 02:37:59 1.9
@@ -2480,18 +2480,13 @@
int convert_flag;
#endif
-if (r->handler) {
-ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING,
- r->server, "handler \"%s\" not found, using default "
- "handler for : %s", r->handler, r->filename);
-}
/* This handler has no use for a request body (yet), but we still
* need to read and discard it if the client sent one.
*/
if ((errstatus = ap_discard_request_body(r)) != OK) {
return errstatus;
}
-
+
r->allowed |= (1 << M_GET) | (1 << M_OPTIONS);
if (r->method_number == M_INVALID) {
cvs commit: apache-2.0 .cvsignore
fielding99/08/27 18:13:27 Modified:..cvsignore Log: Don't ignore everything when everything isn't supposed to be ignored. If this bugs configure users, then fix configure so that it uses a distinctive prefix that won't match Makefile.tmpl. Submitted by: Roy Fielding, Sander van Zoest Revision ChangesPath 1.3 +0 -1 apache-2.0/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1999/08/26 04:57:01 1.2 +++ .cvsignore1999/08/28 01:13:22 1.3 @@ -1,5 +1,4 @@ Makefile config.status config.status.* -Makefile.* src.*
cvs commit: apache-1.3/htdocs .cvsignore
fielding99/08/27 18:11:49 Modified:..cvsignore Removed: htdocs .cvsignore Log: Don't ignore everything when everything isn't supposed to be ignored. If this bugs configure users, then fix configure so that it uses a distinctive prefix that won't match Makefile.tmpl. Submitted by: Roy Fielding, Sander van Zoest Revision ChangesPath 1.4 +0 -1 apache-1.3/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-1.3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore1998/06/16 03:28:45 1.3 +++ .cvsignore1999/08/28 01:11:47 1.4 @@ -1,4 +1,3 @@ Makefile config.status -Makefile.* src.*
cvs commit: apache-1.3/src CHANGES
fielding99/08/27 17:59:04 Modified:src CHANGES Log: make that eight PRs Revision ChangesPath 1.1426+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1425 retrieving revision 1.1426 diff -u -r1.1425 -r1.1426 --- CHANGES 1999/08/27 23:38:05 1.1425 +++ CHANGES 1999/08/28 00:58:54 1.1426 @@ -2,7 +2,7 @@ *) Move "handler not found" warning message to below the check for a wildcard handler. [Dirk <[EMAIL PROTECTED]>, Roy Fielding] - PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 + PR#2584, PR#2751, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 *) Build errors in src/support stop with an error, just like all the other recursive make calls. [David Harris <[EMAIL PROTECTED]>]
cvs commit: apache-2.0/src CHANGES
fielding99/08/27 17:36:41 Modified:src CHANGES Log: make that eight PRs. Revision ChangesPath 1.4 +1 -1 apache-2.0/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-2.0/src/CHANGES,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CHANGES 1999/08/27 23:47:08 1.3 +++ CHANGES 1999/08/28 00:36:40 1.4 @@ -2,7 +2,7 @@ *) Move "handler not found" warning message to below the check for a wildcard handler. [Dirk <[EMAIL PROTECTED]>, Roy Fielding] - PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 + PR#2584, PR#2751, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 *) Support line-continuation feature in config.option file. [Ralf S. Engelschall]
cvs commit: apache-2.0/src/main http_config.c
fielding99/08/27 16:47:10
Modified:src CHANGES
src/main http_config.c
Log:
Move "handler not found" warning message to below the check
for a wildcard handler. Gee, you'd think someone would have
fixed it before seven PRs.
PR: 2584, 3349, 3436, 3548, 4384, 4795, 4807
Submitted by: Dirk <[EMAIL PROTECTED]>, Roy Fielding
Revision ChangesPath
1.3 +4 -0 apache-2.0/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CHANGES 1999/08/27 14:37:13 1.2
+++ CHANGES 1999/08/27 23:47:08 1.3
@@ -1,5 +1,9 @@
Changes with Apache 2.0-dev
+ *) Move "handler not found" warning message to below the check
+ for a wildcard handler. [Dirk <[EMAIL PROTECTED]>, Roy Fielding]
+ PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
+
*) Support line-continuation feature in config.option file.
[Ralf S. Engelschall]
1.7 +4 -5 apache-2.0/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- http_config.c 1999/08/27 22:03:06 1.6
+++ http_config.c 1999/08/27 23:47:09 1.7
@@ -338,11 +338,6 @@
}
}
-if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler) {
-ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
-"handler \"%s\" not found for: %s", r->handler, r->filename);
-}
-
/* Pass two --- wildcard matches */
for (handp = wildhandlers; handp->hr.content_type; ++handp) {
@@ -355,6 +350,10 @@
}
}
+if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler && r->filename) {
+ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
+"handler \"%s\" not found for: %s", r->handler, r->filename);
+}
return HTTP_INTERNAL_SERVER_ERROR;
}
cvs commit: apache-1.3/src/main http_config.c
fielding99/08/27 16:38:11
Modified:src CHANGES
src/main http_config.c
Log:
Move "handler not found" warning message to below the check
for a wildcard handler. Gee, you'd think someone would have
fixed it before seven PRs.
PR: 2584, 3349, 3436, 3548, 4384, 4795, 4807
Submitted by: Dirk <[EMAIL PROTECTED]>, Roy Fielding
Revision ChangesPath
1.1425+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1424
retrieving revision 1.1425
diff -u -r1.1424 -r1.1425
--- CHANGES 1999/08/19 09:07:32 1.1424
+++ CHANGES 1999/08/27 23:38:05 1.1425
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) Move "handler not found" warning message to below the check
+ for a wildcard handler. [Dirk <[EMAIL PROTECTED]>, Roy Fielding]
+ PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
+
*) Build errors in src/support stop with an error, just like all the
other recursive make calls. [David Harris <[EMAIL PROTECTED]>]
1.147 +4 -5 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- http_config.c 1999/08/06 16:21:33 1.146
+++ http_config.c 1999/08/27 23:38:10 1.147
@@ -512,11 +512,6 @@
}
}
-if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler) {
-ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
-"handler \"%s\" not found for: %s", r->handler, r->filename);
-}
-
/* Pass two --- wildcard matches */
for (handp = wildhandlers; handp->hr.content_type; ++handp) {
@@ -529,6 +524,10 @@
}
}
+if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler && r->filename) {
+ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
+"handler \"%s\" not found for: %s", r->handler, r->filename);
+}
return HTTP_INTERNAL_SERVER_ERROR;
}
cvs commit: apache-2.0/src/modules/proxy proxy_cache.c
fielding99/08/27 15:18:59
Modified:src/include util_date.h
src/main http_protocol.c util_date.c util_script.c
src/modules/proxy proxy_cache.c
Log:
Reverse the unnecessary change to the interface of ap_parseHTTPdate()
that was discovered while rebuilding the repository.
Revision ChangesPath
1.3 +1 -1 apache-2.0/src/include/util_date.h
Index: util_date.h
===
RCS file: /home/cvs/apache-2.0/src/include/util_date.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util_date.h 1999/08/26 14:53:20 1.2
+++ util_date.h 1999/08/27 22:18:45 1.3
@@ -76,7 +76,7 @@
API_EXPORT(int) ap_checkmask(const char *data, const char *mask);
API_EXPORT(time_t) ap_tm2sec(const struct tm *t);
-API_EXPORT(time_t) ap_parseHTTPdate(const char *date, time_t * retval);
+API_EXPORT(time_t) ap_parseHTTPdate(const char *date);
#ifdef __cplusplus
}
1.11 +7 -12 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- http_protocol.c 1999/08/27 22:03:06 1.10
+++ http_protocol.c 1999/08/27 22:18:48 1.11
@@ -428,12 +428,10 @@
*/
if_unmodified = ap_table_get(r->headers_in, "If-Unmodified-Since");
if (if_unmodified != NULL) {
- /* ZZZ we are changing time funcs to AP time thread funcs.
-and we need to check return values of ap_parseHTTPdate. */
-time_t ius ;
- if (ap_parseHTTPdate(if_unmodified, &ius) == 1
- && (mtime > ius)) {
- return HTTP_PRECONDITION_FAILED;
+time_t ius = ap_parseHTTPdate(if_unmodified);
+
+if ((ius != BAD_DATE) && (mtime > ius)) {
+return HTTP_PRECONDITION_FAILED;
}
}
}
@@ -483,12 +481,9 @@
else if ((r->method_number == M_GET)
&& ((if_modified_since =
ap_table_get(r->headers_in, "If-Modified-Since")) !=
NULL)) {
-time_t ims;
- if (ap_parseHTTPdate(if_modified_since, &ims) != 1) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING,
- r->server, "bogus if-modified-since-header");
- }
-else if ((ims >= mtime) && (ims <= r->request_time)) {
+time_t ims = ap_parseHTTPdate(if_modified_since);
+
+if ((ims >= mtime) && (ims <= r->request_time)) {
return HTTP_NOT_MODIFIED;
}
}
1.3 +3 -5 apache-2.0/src/main/util_date.c
Index: util_date.c
===
RCS file: /home/cvs/apache-2.0/src/main/util_date.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util_date.c 1999/08/26 14:53:23 1.2
+++ util_date.c 1999/08/27 22:18:49 1.3
@@ -214,7 +214,7 @@
* but many changes since then.
*
*/
-API_EXPORT(time_t) ap_parseHTTPdate(const char *date, time_t * retval)
+API_EXPORT(time_t) ap_parseHTTPdate(const char *date)
{
struct tm ds;
int mint, mon;
@@ -228,7 +228,7 @@
('S' << 16) | ('e' << 8) | 'p', ('O' << 16) | ('c' << 8) | 't',
('N' << 16) | ('o' << 8) | 'v', ('D' << 16) | ('e' << 8) | 'c'};
-if (!date) /* ZZZ return AP_FAILURE on all errors. */
+if (!date)
return BAD_DATE;
while (*date && ap_isspace(*date)) /* Find first non-whitespace
char */
@@ -317,7 +317,5 @@
ds.tm_mon = mon;
-/* ZZZ return AP_SUCCESS. use AP Implode time func for this. */
-*retval = ap_tm2sec(&ds);
-return 1;
+return ap_tm2sec(&ds);
}
1.6 +4 -5 apache-2.0/src/main/util_script.c
Index: util_script.c
===
RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- util_script.c 1999/08/26 14:53:24 1.5
+++ util_script.c 1999/08/27 22:18:49 1.6
@@ -588,11 +588,10 @@
* pass it on blindly because of restrictions on future values.
*/
else if (!strcasecmp(w, "Last-Modified")) {
- time_t mtime;
- if (ap_pars
cvs commit: apache-2.0/src/main alloc.c http_config.c http_protocol.c
fielding99/08/27 15:03:20
Modified:src/main alloc.c http_config.c http_protocol.c
Log:
Reverse the errors from bad merges that were found while
rebuilding the repository.
Revision ChangesPath
1.5 +7 -7 apache-2.0/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-2.0/src/main/alloc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alloc.c 1999/08/26 15:17:06 1.4
+++ alloc.c 1999/08/27 22:03:05 1.5
@@ -2074,14 +2074,14 @@
if (pipe_in) {
close(in_fds[0]);
close(in_fds[1]);
- }
+ }
if (pipe_out) {
close(out_fds[0]);
close(out_fds[1]);
- }
+ }
errno = save_errno;
return 0;
- }
+}
#ifdef WIN32
@@ -2230,10 +2230,10 @@
close(out_fds[0]);
close(out_fds[1]);
}
- if (pipe_err) {
+ if (pipe_err) {
close(err_fds[0]);
close(err_fds[1]);
- }
+ }
errno = save_errno;
return 0;
}
@@ -2254,11 +2254,11 @@
close(in_fds[0]);
}
- if (pipe_err) {
+ if (pipe_err) {
close(err_fds[0]);
dup2(err_fds[1], STDERR_FILENO);
close(err_fds[1]);
- }
+ }
/* HP-UX SIGCHLD fix goes here, if someone will remind me what it is...
*/
signal(SIGCHLD, SIG_DFL); /* Was that it? */
1.6 +22 -21apache-2.0/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- http_config.c 1999/08/26 16:30:34 1.5
+++ http_config.c 1999/08/27 22:03:06 1.6
@@ -1088,27 +1088,28 @@
/* loop through the access names and find the first one */
-while (!f && access_name[0]) {
-char * w = ap_getword_conf(r->pool, &access_name);
-filename = ap_make_full_path(r->pool, d, w);
- f = ap_pcfg_openfile(r->pool, filename);
-}
-if (f) {
-dc = ap_create_per_dir_config(r->pool);
-
- parms.config_file = f;
-
- errmsg = ap_srm_command_loop(&parms, dc);
-
- ap_cfg_closefile(f);
-
- if (errmsg) {
- ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r,
- "%s: %s", filename, errmsg);
- return HTTP_INTERNAL_SERVER_ERROR;
- }
- *result = dc;
-}
+while (access_name[0]) {
+filename = ap_make_full_path(r->pool, d,
+ ap_getword_conf(r->pool, &access_name));
+
+if ((f = ap_pcfg_openfile(r->pool, filename)) != NULL) {
+
+dc = ap_create_per_dir_config(r->pool);
+
+parms.config_file = f;
+
+errmsg = ap_srm_command_loop(&parms, dc);
+
+ap_cfg_closefile(f);
+
+if (errmsg) {
+ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r,
+ "%s: %s", filename, errmsg);
+return HTTP_INTERNAL_SERVER_ERROR;
+}
+*result = dc;
+break;
+}
else if (errno != ENOENT && errno != ENOTDIR) {
ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
"%s pcfg_openfile: unable to check htaccess file, "
1.10 +3 -3 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- http_protocol.c 1999/08/26 16:30:36 1.9
+++ http_protocol.c 1999/08/27 22:03:06 1.10
@@ -1558,9 +1558,6 @@
r->sent_bodyct = 1;
return;
}
-else {
- fixup_vary(r);
-}
/*
* Now that we are ready to send a response, we need to combine the two
@@ -1580,6 +1577,9 @@
ap_table_unset(r->headers_out, "Vary");
r->proto_num = HTTP_VERSION(1,0);
ap_table_set(r->subprocess_env, "force-response-1.0", "1");
+}
+else {
+ fixup_vary(r);
}
ap_basic_http_header(r);
cvs commit: apache-1.3 STATUS
fielding99/08/16 02:52:26 Modified:.STATUS Log: I knew I forgot something ... Revision ChangesPath 1.745 +5 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.744 retrieving revision 1.745 diff -u -r1.744 -r1.745 --- STATUS1999/08/16 09:19:48 1.744 +++ STATUS1999/08/16 09:52:25 1.745 @@ -1,11 +1,11 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/16 09:19:48 $] + Last modified at [$Date: 1999/08/16 09:52:25 $] Release: -1.3.9-dev: COUNTDOWN started at 08/14 2:30am PDT - Tarball planned for Sunday morning unless problems found. - Votes for rolling: Ralf +1, Martin +1 +1.3.9-dev: COUNTDOWN restarted at 08/15 3:00pm PDT + Tarball planned for Monday morning unless problems found. + Votes for rolling: Ralf +1, Martin +1, Roy +1 1.3.8: Not released. 1.3.7: Not released. @@ -27,7 +27,7 @@ libstandard.a and adding .so objects to the libstandard.a starting with mod_vhost_alias.so. Message-ID: <[EMAIL PROTECTED]> - Status: Randy needs someone familiar with HPUX to look at it. + Status: Randy committed a temporary fix * long pathnames with many components and no AllowOverride None Workaround is to define with AllowOverride None,
cvs commit: apachegroup-site projects.html
fielding99/08/15 00:11:12 Modified:.projects.html Log: Fix link to server project. Submitted by: Fred Curtis <[EMAIL PROTECTED]> Reviewed by: Roy Fielding Revision ChangesPath 1.8 +1 -1 apachegroup-site/projects.html Index: projects.html === RCS file: /home/cvs/apachegroup-site/projects.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- projects.html 1999/06/29 10:17:37 1.7 +++ projects.html 1999/08/15 07:11:11 1.8 @@ -56,7 +56,7 @@ projects. -Apache HTTP Server +Apache HTTP Server The Apache HTTP Server Project is an effort to develop and maintain an
cvs commit: apache-1.3 STATUS
fielding99/08/15 00:09:01 Modified:.STATUS Log: hello? anybody home? Revision ChangesPath 1.742 +11 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.741 retrieving revision 1.742 diff -u -r1.741 -r1.742 --- STATUS1999/08/14 09:36:34 1.741 +++ STATUS1999/08/15 07:08:59 1.742 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/14 09:36:34 $] + Last modified at [$Date: 1999/08/15 07:08:59 $] Release: @@ -22,6 +22,12 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: +* HPUX binary build failure due to the fact that it is building + libstandard.a and adding .so objects to the libstandard.a starting + with mod_vhost_alias.so. +Message-ID: <[EMAIL PROTECTED]> + Status: Randy needs someone familiar with HPUX to look at it. + * long pathnames with many components and no AllowOverride None Workaround is to define with AllowOverride None, which is something all sites should do in any case. @@ -36,6 +42,10 @@ Available Patches: + +* David Harris's [patch] make does not propagate src/support errors +Message-ID: <[EMAIL PROTECTED]> + Status: * Paul Reder's patch to fix Allow/Deny (.htaccess parsing) in regex processing.
cvs commit: apache-1.3/htdocs/manual/mod core.html
fielding99/08/14 23:55:49
Modified:htdocs/manual/mod core.html
Log:
The current documentation on the Rlimit{CPU,MEM,Nproc} directives
uses the wording "for all processes", which leads one to believe that
the limit applies to all of the Apache children processes.
However, this is not the case. The resource limits are applied in
ap_call_exec() which is only called by mod_cgi and mod_include.
Submitted by: David Harris <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision ChangesPath
1.155 +15 -0 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- core.html 1999/07/29 18:17:43 1.154
+++ core.html 1999/08/15 06:55:48 1.155
@@ -2460,6 +2460,11 @@
configuration. Raising the maximum resource limit requires that the server
is running as root, or in the initial startup phase.
+This applies to processes forked off from Apache children servicing requests,
+not the Apache children themselves. This includes CGI scripts and SSI
+exec commands, but not any processes forked off from the Apache parent
+such as piped logs.
+
CPU resource limits are expressed in seconds per process.
See also RLimitMEM or
@@ -2498,6 +2503,11 @@
configuration. Raising the maximum resource limit requires that the
server is running as root, or in the initial startup phase.
+This applies to processes forked off from Apache children servicing requests,
+not the Apache children themselves. This includes CGI scripts and SSI
+exec commands, but not any processes forked off from the Apache parent
+such as piped logs.
+
Memory resource limits are expressed in bytes per process.
See also RLimitCPU or
@@ -2535,6 +2545,11 @@
that the limit should be set to the maximum allowed by the operating system
configuration. Raising the maximum resource limit requires that the server
is running as root, or in the initial startup phase.
+
+This applies to processes forked off from Apache children servicing requests,
+not the Apache children themselves. This includes CGI scripts and SSI
+exec commands, but not any processes forked off from the Apache parent
+such as piped logs.
Process limits control the number of processes per user.
cvs commit: apache-1.3 STATUS
fielding99/08/14 02:36:37 Modified:.STATUS Log: bedtime Revision ChangesPath 1.741 +53 -58apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.740 retrieving revision 1.741 diff -u -r1.740 -r1.741 --- STATUS1999/08/13 07:17:08 1.740 +++ STATUS1999/08/14 09:36:34 1.741 @@ -1,11 +1,12 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/13 07:17:08 $] + Last modified at [$Date: 1999/08/14 09:36:34 $] Release: -1.3.9-dev: current. +1.3.9-dev: COUNTDOWN started at 08/14 2:30am PDT + Tarball planned for Sunday morning unless problems found. -1.3.8: Rolled on August 9. +1.3.8: Not released. 1.3.7: Not released. 1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th. 1.3.5: Not released. @@ -17,63 +18,8 @@ 2.0 : In pre-alpha development, see apache-2.0 and apache-apr repository -Binaries (1.3.8): - - Platform Avail. Volunteer - -- - alpha-dec-osf3.0 no Sameer Parekh - alpha-dec-osf4.0 no Lars Eilebrecht, Ken Coar - armv4l-whatever-linux2no Rasmus Lerdorf - hppa1.1-hp-hpux no Rob Hartill - i386-slackware-linux(a.out) no Sameer Parekh - i386-sun-solaris2.5 no Sameer Parekh - i386-sun-solaris2.7 no Cliff Skolnick - i386-unixware-svr4no Sameer Parekh - i386-unknown-freebsd2.1 no Andrew Wilson, Brian Tao - i386-unknown-freebsd2.2.8 no Jim Jagielski - i386-whatever-freebsd3.0 no Ken Coar - i386-whatever-freebsd3.0 no Dirk-Willem van Gulik - i686-pc-freebsd3.1no Ralf S. Engelschall - i586-unknown-linux2 no Ralf S. Engelschall, Lars Eilebrecht - i686-unknown-linux2 no Lars Eilebrecht - i686-whatever-linux2 no Ken Coar - i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass - i386-unknown-netBSD-1.2.1 N/A Lars Eilebrecht - i386-unknown-netBSD-1.3.2 no Lars Eilebrecht - i386-unknown-sco3 no Ben Laurie - i386-unknown-sco5 no Ben Laurie - i386-sni-svr4 no Martin Kraemer - m68k-apple-aux3.1.1 no Jim Jagielski - m88k-dg-dgux5.4R2.01 no Sameer parekh - m88k-next-nextno Rob Hartill - mips-sgi-irix5.3 no Mark Imbrianco - mips-sgi-irix6.2 no Lars Eilebrecht - mips-sgi-irix6.4 no Lars Eilebrecht - mips-sni-svr4 no Martin Kraemer - OS/2 no Brian Havard - rs6000-ibm-aix3.2.5 no Sameer Parekh - rs6000-ibm-aix4.1 no Lars Eilebrecht - rs6000-ibm-aix4.2 no Bill Stoddard - rs6000-ibm-aix4.3.2 no Bill Stoddard - sparc-sun-solaris2.5 no Lars Eilebrecht - sparc-sun-solaris2.6 no Lars Eilebrecht - sparc-sun-solaris2.7 no Cliff Skolnick - sparc-sun-sunos4.1.4 no Lars Eilebrecht, Michael Douglass - sparc-sun-sunos4.1.3_U1 no Sameer Parekh - sparc-unknown-linux no Lars Eilebrecht - mips-dec-ultrix4.4no Sameer Parekh - mips-unknown-linuxno Lars Eilebrecht - RELEASE SHOWSTOPPERS: -* Responses with a return code HTTP_NOT_MODIFIED or HTTP_MULTIPLE_CHOICES - are broken if they do not supply a "Location:" header. - mod_speling ceases to work because of this bug. - Message-ID: <[EMAIL PROTECTED]> - Status: patch available, but Tony Finch suggests fixing the - ap_is_HTTP_REDIRECT() macro - - RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * long pathnames with many components and no AllowOverride None @@ -496,3 +442,52 @@ * apparently either "BrowserMatch" or the "nokeepalive" variable cause instability - see PR#1729. + + +Binaries (1.3.9): + + Platform Avail. Volunteer + -- + alpha-dec-osf3.0 no Sameer Parekh + alpha-dec-osf4.0 no Lars Eilebrecht, Ken Coar + armv4l-whatever-linux2no Rasmus Lerdorf + hppa1.1-hp-hpux no Rob Hartill + i386-slackware-linux(a.out) no Sameer Parekh + i386-sun-solaris2.5 no Sameer Parekh + i386-sun-solaris2.7 no C
cvs commit: apache-1.3/src/ap ap_md5c.c
fielding99/08/14 02:31:05 Modified:src/ap ap_md5c.c Log: Quiet warning -- strange that gcc doesn't auto-cast the literal string to match the argument type. Revision ChangesPath 1.30 +1 -1 apache-1.3/src/ap/ap_md5c.c Index: ap_md5c.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_md5c.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ap_md5c.c 1999/08/14 08:35:45 1.29 +++ ap_md5c.c 1999/08/14 09:31:04 1.30 @@ -487,7 +487,7 @@ /* * Then our magic string */ -ap_MD5Update(&ctx, AP_MD5PW_ID, AP_MD5PW_IDLEN); +ap_MD5Update(&ctx, (const unsigned char *) AP_MD5PW_ID, AP_MD5PW_IDLEN); /* * Then the raw salt
cvs commit: apache-1.3/src/main http_protocol.c
fielding99/08/14 02:21:20
Modified:src CHANGES
src/main http_protocol.c
Log:
Remove bogus error message when a redirect doesn't set Location.
Instead, use an empty string to avoid coredump if the error message
was supposed to include a location but doesn't.
Revision ChangesPath
1.1422+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1421
retrieving revision 1.1422
diff -u -r1.1421 -r1.1422
--- CHANGES 1999/08/14 08:35:43 1.1421
+++ CHANGES 1999/08/14 09:21:15 1.1422
@@ -1,5 +1,9 @@
Changes with Apache 1.3.9
+ *) Remove bogus error message when a redirect doesn't set Location.
+ Instead, use an empty string to avoid coredump if the error message
+ was supposed to include a location. [Roy Fielding]
+
*) Don't allow configure to include mod_auth_digest unless it is
explicitly requested, even if the user asked for all modules.
[Roy Fielding]
1.279 +7 -18 apache-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.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- http_protocol.c 1999/08/14 08:35:48 1.278
+++ http_protocol.c 1999/08/14 09:21:19 1.279
@@ -2450,24 +2450,13 @@
ap_clear_table(r->err_headers_out);
if (ap_is_HTTP_REDIRECT(status) || (status == HTTP_CREATED)) {
- if ((location != NULL) && *location) {
- ap_table_setn(r->headers_out, "Location", location);
- }
- else {
- /*
- * We're supposed to tell the client to go somewhere,
- * but the destination was omitted. Turn this into
- * a 500 status with an explanatory note in the error log.
- */
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
- "resource created or redirection requested "
- "(status=%03d) but no Location field set "
- "(URI=%s)",
- r->status, r->unparsed_uri);
- r->status = status = HTTP_INTERNAL_SERVER_ERROR;
- r->status_line = NULL;
- }
- }
+if ((location != NULL) && *location) {
+ ap_table_setn(r->headers_out, "Location", location);
+}
+else {
+location = ""; /* avoids coredump when printing, below */
+}
+}
r->content_language = NULL;
r->content_languages = NULL;
cvs commit: apache-1.3/src/include ap_mmn.h
fielding99/08/14 01:53:49 Modified:src/include ap_mmn.h Log: Minor MMN bump to note the addition of all the 1.3.6-9 functions. Revision ChangesPath 1.41 +10 -4 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- ap_mmn.h 1999/07/29 17:53:55 1.40 +++ ap_mmn.h 1999/08/14 08:53:48 1.41 @@ -217,9 +217,15 @@ * 19990320.1 - add ap_vrprintf() * 19990320.2 - add cmd_parms.context, ap_set_config_vectors, *export ap_add_file_conf - * 19990320.3 - add ap_regexec() - * 19990604.4 - add ap_field_noparam() - * 19990621.5 - add local_ip/host to conn_rec for mass-vhost + * 19990320.3 - add ap_regexec() and ap_regerror() + * 19990320.4 - add ap_field_noparam() + * 19990320.5 - add local_ip/host to conn_rec for mass-vhost + * 19990320.6 - add ap_SHA1Final(), ap_SHA1Init(), + *ap_SHA1Update_binary(), ap_SHA1Update(), + *ap_base64encode(), ap_base64encode_binary(), + *ap_base64encode_len(), ap_base64decode(), + *ap_base64decode_binary(), ap_base64decode_len(), + *ap_pbase64decode(), ap_pbase64encode() */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */ @@ -227,7 +233,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 19990320 #endif -#define MODULE_MAGIC_NUMBER_MINOR 5 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ /* Useful for testing for features. */
cvs commit: apache-1.3/src/support httpd.exp
fielding99/08/14 01:35:55 Modified:src ApacheCore.def ApacheCoreOS2.def CHANGES Configuration.tmpl src/ap ap_base64.c ap_checkpass.c ap_md5c.c ap_sha1.c src/include ap_md5.h ap_sha1.h httpd.h src/main http_protocol.c util.c src/modules/experimental mod_auth_digest.c src/modules/proxy proxy_ftp.c src/modules/standard mod_unique_id.c src/support httpd.exp Log: Clean up the base64 and SHA1 additions and make sure they are represented in the ApacheCore.def, ApacheCoreOS2.def, and httpd.exp files. I am very unhappy with the implementation assumptions between ap_validate_password and the various encoding routines, like the length of an encoded password never being greater than 120 characters, but I have no time to fix them right now. Not to mention all the other usages of magic numbers with no explanation. Yuck. Revision ChangesPath 1.19 +17 -3 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ApacheCore.def1999/08/09 15:31:08 1.18 +++ ApacheCore.def1999/08/14 08:35:42 1.19 @@ -343,6 +343,20 @@ ap_standalone @337 ap_server_confname @338 ap_sub_req_method_uri @339 - ap_sha1_base64 @340 - ap_puudecode@341 - ap_puuencode@342 + ap_regerror @341 + ap_regexec @342 + ap_field_noparam @343 + ap_pbase64decode @344 + ap_pbase64encode @345 + ap_base64encode @346 + ap_base64encode_binary @347 + ap_base64encode_len @348 + ap_base64decode @349 + ap_base64decode_binary @350 + ap_base64decode_len @351 + ap_SHA1Init @352 + ap_SHA1Update_binary @353 + ap_SHA1Update @354 + ap_SHA1Final @355 + ap_sha1_base64 @356 + 1.5 +16 -5 apache-1.3/src/ApacheCoreOS2.def Index: ApacheCoreOS2.def === RCS file: /home/cvs/apache-1.3/src/ApacheCoreOS2.def,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheCoreOS2.def 1999/08/10 16:12:20 1.4 +++ ApacheCoreOS2.def 1999/08/14 08:35:42 1.5 @@ -268,7 +268,7 @@ ;os_stat @261 ;readdir @262 regcomp @263 - ap_regexec @264 + regexec @264 regfree @265 ;access_module @266 ;alias_module @267 @@ -349,7 +349,18 @@ ap_dummy_mutex @343 ap_signal @344 ap_regerror @345 - ap_puudecode @346 - ap_puuencode @347 - ap_sha1_base64 @348 - ap_field_noparam @349 + ap_regexec @346 + ap_field_noparam @347 + ap_pbase64decode @348 + ap_pbase64encode @349 + ap_base64encode @350 + ap_base64encode_binary @351 + ap_base64encode_len @352 + ap_base64decode @353 + ap_base64decode_binary @354 + ap_base64decode_len @355 + ap_SHA1Init @356 + ap_SHA1Update_binary@357 + ap_SHA1Update @358 + ap_SHA1Final@359 + ap_sha1_base64 @360 1.1421+12 -4 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1420 retrieving revision 1.1421 diff -u -r1.1420 -r1.1421 --- CHANGES 1999/08/14 01:24:29 1.1420 +++ CHANGES 1999/08/14 08:35:43 1.1421 @@ -1,5 +1,9 @@ Changes with Apache 1.3.9 + *) Don't allow configure to include mod_auth_digest unless it is + explicitly requested, even if the user asked for all modules. + [Roy Fielding] + *) Translate module names to dll names for OS/2 so that they are no more than 8 characters long and have an extension of "dll" instead of "so". [Brian Havard] @@ -25,12 +29,16 @@ problem observed by some Win95/98 users where they get CGI script output sent to the console. [Bill Stoddard] - *) Roll back (re)naming in the uuencode/decode section. The ap/ap_ + *) Fix (re)naming in the uuencode/decode section. The ap/ap_ routines are now called ap_base64* and are 'plain' (i.e., no - pool access or anything clever). Inside apache the routines - acting like pstrdup are called ap_puuencode() and ap_puudecode(). - The oddly named ap_uuencode(), ap_uudecode() is kept around for + pool access or anything clever). Inside util.c the routines acting + like pstrdup are called ap_pbase64encode() and ap_pbase64decode(). + The oddly named ap
cvs commit: apache-1.3 configure
fielding99/08/14 01:29:06
Modified:.configure
Log:
Don't include mod_auth_digest unless explicitly requested,
even if they asked for all modules.
Revision ChangesPath
1.102 +2 -1 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- configure 1999/08/13 15:05:48 1.101
+++ configure 1999/08/14 08:29:05 1.102
@@ -742,6 +742,7 @@
eval "module_${module}=yes"
done
IFS="$OOIFS"
+ module_auth_digest=no # conflict with mod_digest
;;
most )
OOIFS="$IFS"
@@ -754,7 +755,7 @@
module_mmap_static=no # not all platforms have
mmap()
module_so=no # not all platforms have
dlopen()
module_example=no # only for developers
-module_auth_digest=no # experimental
+ module_auth_digest=no # conflict with mod_digest
module_log_agent=no # deprecated
module_log_referer=no # deprecated
;;
cvs commit: apache-1.3/src CHANGES
fielding99/08/13 18:24:31 Modified:src CHANGES Log: Update to reflect the reality of changes since first 1.3.8. Revision ChangesPath 1.1420+59 -13apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1419 retrieving revision 1.1420 diff -u -r1.1419 -r1.1420 --- CHANGES 1999/08/13 06:37:51 1.1419 +++ CHANGES 1999/08/14 01:24:29 1.1420 @@ -1,23 +1,69 @@ Changes with Apache 1.3.9 - *) Fixed generated AddModule adjustments in APACI's `configure' script in - order to allow (new) modules like mod_vhost_alias to be handled correctly - (which was touched by the adjustments for mod_alias). + *) Translate module names to dll names for OS/2 so that they are no more + than 8 characters long and have an extension of "dll" instead of "so". + [Brian Havard] + + *) Print out pointer to Rule DEV_RANDOM when truerand lib not found. + Fix test-compile check to check for randbyte instead of trand32. + Use ap_base64encode_binary/decode instead of copy in mod_auth_digest.c + and tweak to make Amaya happier. [Ronald Tschalär] + + *) Ensure that the installed expat include files are world readable, + just like the other header files. [Martin Kraemer] + + *) Fixed generated AddModule adjustments in APACI's `configure' script + in order to allow (new) modules like mod_vhost_alias to be handled + correctly (which was touched by the adjustments for mod_alias). [Ralf S. Engelschall] + + *) For binary builds, add -R flag to apachectl to work around the lack of + an absolute path to the ./libexec directory where the libhttp.ep file + is needed for SHARED_CORE architectures. [Randy Terbush] - *) For binary builds, add -R flag to apachectl to work around the - lack of an absolute path to the ./libexec directory where - libhttp.ep file is needed for SHARED_CORE architectures. - [Randy Terbush [EMAIL PROTECTED] + *) WIN32: Create the CGI script process as DETACHED. This may solve the + problem observed by some Win95/98 users where they get CGI script + output sent to the console. [Bill Stoddard] *) Roll back (re)naming in the uuencode/decode section. The ap/ap_ - routines are now called ap_base64* and are 'plain'. I.e. no - pool access or anything clever. Inside apache the routines - acting like pstrdup are called ap_puuencode() and ap_uudecode(). - The odly named ap_uuencode(), ap_uudecode() is kept around for - now but depricated. [dirkx] + routines are now called ap_base64* and are 'plain' (i.e., no + pool access or anything clever). Inside apache the routines + acting like pstrdup are called ap_puuencode() and ap_puudecode(). + The oddly named ap_uuencode(), ap_uudecode() is kept around for + now but deprecated. [dirkx] + + *) WIN32: Migrate to InstallShield 5.5 and provide a bit more error + checking. Allow compiling on VS 6.0. [Randy Terbush] + + *) Fixed assumption of absolute paths in binbuild.sh. [Tony Finch] + + *) Use TestCompile to search for the truerand library (rather than blindly + assuming its existence). If it is not found, complain (but do not + exit - yet). [Martin Kraemer] + + *) We forgot to add the new exported function names to + src/support/httpd.exp. [Bill Stoddard, Randy Terbush] + + *) Add description of -T command-line option to usage(). + [Ralf S. Engelschall] + + *) For "some" platforms (notably, EBCDIC based ones), libos needs to be + searched only AFTER libap has been searched, because libap needs + some symbols from libos. [Martin Kraemer] + + *) Fix conflict with original mod_digest related to the symbol of the + module dispatch list (which has to be unique for DSO and follow the + usual conventions for the installation procedure). + [Ralf S. Engelschall] + + *) Add a dbm-library check for the "usual places" (-ldbm, -lndbm, -ldb) + for other platforms as well. [Martin Kraemer] + + *) Make ap_sha1.c compile for EBCDIC platforms: replace remaining LONG + types by AP_LONG and replace reference to renamed variable 'ubuf' + by 'buffer'. [Martin Kraemer] -Changes with Apache 1.3.8 +Changes with Apache 1.3.8 [not released] *) Flush the output buffer immediately after sending an error or redirect response, since the result may be needed by the client to abort a
cvs commit: apache-1.3/src/main http_protocol.c
fielding99/08/09 02:41:41
Modified:src CHANGES
src/main http_protocol.c
Log:
Flush the output buffer immediately after sending an error or redirect
response, since the result will be needed by the client to abort a
long data transfer or restart a series of pipelined requests.
Submitted by: Tom Vaughan <[EMAIL PROTECTED]>, Roy Fielding
Revision ChangesPath
1.1414+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1413
retrieving revision 1.1414
diff -u -r1.1413 -r1.1414
--- CHANGES 1999/08/09 07:38:36 1.1413
+++ CHANGES 1999/08/09 09:41:36 1.1414
@@ -1,5 +1,10 @@
Changes with Apache 1.3.8
+ *) Flush the output buffer immediately after sending an error or redirect
+ response, since the result may be needed by the client to abort a
+ long data transfer or restart a series of pipelined requests.
+ [Tom Vaughan <[EMAIL PROTECTED]>, Roy Fielding]
+
*) PORT: Improved compilation and DSO support on Sequent DYNIX/ptx.
[Ian Turner <[EMAIL PROTECTED]>] PR#4735
1.277 +3 -5 apache-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.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- http_protocol.c 1999/08/08 11:45:18 1.276
+++ http_protocol.c 1999/08/09 09:41:39 1.277
@@ -949,7 +949,6 @@
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
"request failed: URI too long");
ap_send_error_response(r, 0);
-ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -963,7 +962,6 @@
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
"request failed: error reading the headers");
ap_send_error_response(r, 0);
-ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -983,7 +981,6 @@
r->header_only = 0;
r->status = HTTP_BAD_REQUEST;
ap_send_error_response(r, 0);
-ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -1016,7 +1013,6 @@
"client sent HTTP/1.1 request without hostname "
"(see RFC2068 section 9, and 14.23): %s", r->uri);
ap_send_error_response(r, 0);
-ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -1037,7 +1033,6 @@
"client sent an unrecognized expectation value of "
"Expect: %s", expect);
ap_send_error_response(r, 0);
-ap_rflush(r);
(void) ap_discard_request_body(r);
ap_log_transaction(r);
return r;
@@ -2487,6 +2482,7 @@
if (r->header_only) {
ap_finalize_request_protocol(r);
+ap_rflush(r);
return;
}
}
@@ -2510,6 +2506,7 @@
ap_rputs(custom_response + 1, r);
ap_kill_timeout(r);
ap_finalize_request_protocol(r);
+ap_rflush(r);
return;
}
/*
@@ -2773,4 +2770,5 @@
}
ap_kill_timeout(r);
ap_finalize_request_protocol(r);
+ap_rflush(r);
}
cvs commit: apache-devsite anoncvs.txt
fielding99/08/09 01:28:17 Modified:.anoncvs.txt Log: This is getting to be a frequently asked developer question. Revision ChangesPath 1.7 +18 -0 apache-devsite/anoncvs.txt Index: anoncvs.txt === RCS file: /export/home/cvs/apache-devsite/anoncvs.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- anoncvs.txt 1998/11/24 17:15:52 1.6 +++ anoncvs.txt 1999/08/09 08:28:16 1.7 @@ -1,3 +1,21 @@ +Anonymous CVS access is not currently working. There is, however, + +<http://www.apache.org/websrc/cvsweb.cgi> + +and an rsync server at dev.apache.org. Try + +rsync dev.apache.org:: + +to get a listing of the modules. + +rsync -avz dev.apache.org::module-name local-directory-name + +to grab or update a local copy of the "module-name" sources. + +The rest of this file can be ignored until we get anonymous CVS +access working again. + +== HOW TO USE ANONCVS ==
cvs commit: apache-devsite fetch-from-cvs.txt
fielding99/08/09 01:20:07
Modified:.fetch-from-cvs.txt
Log:
Update example to work with new directory names.
Submitted by: Magnus Bodin <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision ChangesPath
1.2 +13 -22apache-devsite/fetch-from-cvs.txt
Index: fetch-from-cvs.txt
===
RCS file: /export/home/cvs/apache-devsite/fetch-from-cvs.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetch-from-cvs.txt1998/04/17 22:05:34 1.1
+++ fetch-from-cvs.txt1999/08/09 08:20:06 1.2
@@ -1,28 +1,21 @@
+#!/usr/bin/perl -w
+#
+# Simple script to fetch the latest tarball in from-cvs/ and unpack it
+# in $dir.
+#
+# Script by Doug MacEachern <[EMAIL PROTECTED]>
+# minor fix by Magnus Bodin <[EMAIL PROTECTED]>
-From [EMAIL PROTECTED] Fri Apr 17 15:07:32 1998
-Date: Tue, 03 Feb 1998 09:00:23 +1300
-From: Doug MacEachern <[EMAIL PROTECTED]>
-Organization: SITEL Telebusiness NZ, Ltd.
-To: new-httpd@apache.org
-Subject: Re: Help me? The build isn't working.
-Reply-To: new-httpd@apache.org
-
-This script will fetch the latest tarball in from-cvs/ and unpack it in $dir
-I posted it a few months ago, maybe it should be made available somewhere on
-dev.apache.org?
-
--Doug
-
-#!/opt/perl5/bin/perl -w
-
use strict;
use URI::URL ();
use HTML::LinkExtor ();
use LWP::Simple;
use File::Path;
-my $dir = shift || "/tmp/apache_1.3-dev";
-my $cvs = "http://dev.apache.org/from-cvs/";;
+my $ver = '1.3';
+my $dir = shift || "/tmp/apache_$ver-dev";
+my $cvs = "http://dev.apache.org/from-cvs/apache-$ver/";;
+my $filptn = "apache-$ver\_";
rmtree $dir;
mkpath $dir, 0755;
@@ -34,10 +27,10 @@
sub cb {
my($tag, %links) = @_;
-return unless exists $links{href} and $links{href} =~ /apache_/;
+return unless exists $links{href} and $links{href} =~ /$fileptn/;
return unless ++$cnt == 4;
-my $file = URI::URL->new($links{href})->rel;
+my $file = URI::URL->new($links{href})->rel($cvs);
warn "mirror $links{href} => $file\n";
mirror $links{href} => $file;
@@ -46,6 +39,4 @@
}
$p->parse(get $cvs);
-
-
cvs commit: apache-1.3 STATUS
fielding99/08/09 01:11:05 Modified:.STATUS Log: Clean up a bit ... needs better prioritization. Some day. Revision ChangesPath 1.738 +36 -53apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.737 retrieving revision 1.738 diff -u -r1.737 -r1.738 --- STATUS1999/08/09 00:04:29 1.737 +++ STATUS1999/08/09 08:11:03 1.738 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/09 00:04:29 $] + Last modified at [$Date: 1999/08/09 08:11:03 $] Release: @@ -22,82 +22,68 @@ 2.0 : In pre-alpha development, see apache-2.0 and apache-apr repository -Binaries (1.3.6): +Binaries (1.3.8): Platform Avail. Volunteer -- alpha-dec-osf3.0 no Sameer Parekh - alpha-dec-osf4.0 yes Lars Eilebrecht, Ken Coar - armv4l-whatever-linux2yes Rasmus Lerdorf + alpha-dec-osf4.0 no Lars Eilebrecht, Ken Coar + armv4l-whatever-linux2no Rasmus Lerdorf hppa1.1-hp-hpux no Rob Hartill i386-slackware-linux(a.out) no Sameer Parekh i386-sun-solaris2.5 no Sameer Parekh - i386-sun-solaris2.7 yes Cliff Skolnick + i386-sun-solaris2.7 no Cliff Skolnick i386-unixware-svr4no Sameer Parekh i386-unknown-freebsd2.1 no Andrew Wilson, Brian Tao - i386-unknown-freebsd2.2.8 yes Jim Jagielski - i386-whatever-freebsd3.0 yes Ken Coar - i386-whatever-freebsd3.0 yes Dirk-Willem van Gulik + i386-unknown-freebsd2.2.8 no Jim Jagielski + i386-whatever-freebsd3.0 no Ken Coar + i386-whatever-freebsd3.0 no Dirk-Willem van Gulik i686-pc-freebsd3.1no Ralf S. Engelschall - i586-unknown-linux2 yes Ralf S. Engelschall, Lars Eilebrecht - i686-unknown-linux2 yes Lars Eilebrecht - i686-whatever-linux2 yes Ken Coar + i586-unknown-linux2 no Ralf S. Engelschall, Lars Eilebrecht + i686-unknown-linux2 no Lars Eilebrecht + i686-whatever-linux2 no Ken Coar i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass i386-unknown-netBSD-1.2.1 N/A Lars Eilebrecht - i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht + i386-unknown-netBSD-1.3.2 no Lars Eilebrecht i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie - i386-sni-svr4 yes Martin Kraemer + i386-sni-svr4 no Martin Kraemer m68k-apple-aux3.1.1 no Jim Jagielski m88k-dg-dgux5.4R2.01 no Sameer parekh m88k-next-nextno Rob Hartill mips-sgi-irix5.3 no Mark Imbrianco - mips-sgi-irix6.2 yes Lars Eilebrecht + mips-sgi-irix6.2 no Lars Eilebrecht mips-sgi-irix6.4 no Lars Eilebrecht - mips-sni-svr4 yes Martin Kraemer - OS/2 yes Brian Havard + mips-sni-svr4 no Martin Kraemer + OS/2 no Brian Havard rs6000-ibm-aix3.2.5 no Sameer Parekh - rs6000-ibm-aix4.1 yes Lars Eilebrecht + rs6000-ibm-aix4.1 no Lars Eilebrecht rs6000-ibm-aix4.2 no Bill Stoddard rs6000-ibm-aix4.3.2 no Bill Stoddard - sparc-sun-solaris2.5 yes Lars Eilebrecht - sparc-sun-solaris2.6 yes Lars Eilebrecht - sparc-sun-solaris2.7 yes Cliff Skolnick - sparc-sun-sunos4.1.4 yes Lars Eilebrecht, Michael Douglass + sparc-sun-solaris2.5 no Lars Eilebrecht + sparc-sun-solaris2.6 no Lars Eilebrecht + sparc-sun-solaris2.7 no Cliff Skolnick + sparc-sun-sunos4.1.4 no Lars Eilebrecht, Michael Douglass sparc-sun-sunos4.1.3_U1 no Sameer Parekh - sparc-unknown-linux yes Lars Eilebrecht + sparc-unknown-linux no Lars Eilebrecht mips-dec-ultrix4.4no Sameer Parekh - mips-unknown-linuxyes Lars Eilebrecht + mips-unknown-linuxno Lars Eilebrecht RELEASE SHOWSTOPPERS: RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: -* David Harris' note of leakage problems in adding/removing - modules, plus additional findings by Dean and Jim. Discussion - in thread following message-ID below. - Messa
cvs commit: apache-1.3/src/main http_main.c
fielding99/08/09 00:54:54
Modified:src/main http_main.c
Log:
Fix last warning fix -- uid_t is long on some platforms.
Revision ChangesPath
1.470 +3 -2 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- http_main.c 1999/08/08 13:31:50 1.469
+++ http_main.c 1999/08/09 07:54:52 1.470
@@ -3700,7 +3700,7 @@
#endif
setuid(ap_user_id) == -1)) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change to uid: %d", (int) ap_user_id);
+ "setuid: unable to change to uid: %ld", (long) ap_user_id);
clean_child_exit(APEXIT_CHILDFATAL);
}
#endif
@@ -4885,7 +4885,8 @@
/* Only try to switch if we're running as root */
if (!geteuid() && setuid(ap_user_id) == -1) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change to uid: %d", (int)
ap_user_id);
+ "setuid: unable to change to uid: %ld",
+ (long) ap_user_id);
exit(1);
}
#endif
cvs commit: apache-1.3/src/os/unix os.c
fielding99/08/09 00:38:50 Modified:.INSTALL src CHANGES Configure src/helpers GuessOS src/include ap_config.h src/os/unix os.c Log: Improved compilation and DSO support on Sequent DYNIX/ptx. PR: 4735 Submitted by: Ian Turner <[EMAIL PROTECTED]> Reviewed by: Roy Fielding Revision ChangesPath 1.59 +1 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /home/cvs/apache-1.3/INSTALL,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- INSTALL 1999/07/30 09:53:07 1.58 +++ INSTALL 1999/08/09 07:38:32 1.59 @@ -82,7 +82,7 @@ - Linux - SunOS - UnixWare - Mac OS X Server - FreeBSD - Solaris - AIX - Mac OS - OpenBSD - IRIX - SCO - OpenStep/Mach - - NetBSD- HPUX - ReliantUNIX + - NetBSD- HPUX - ReliantUNIX - DYNIX/ptx - BSDI - Digital Unix - DGUX o Entirely unsupported platforms are: 1.1413+10 -5 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1412 retrieving revision 1.1413 diff -u -r1.1412 -r1.1413 --- CHANGES 1999/08/09 00:04:30 1.1412 +++ CHANGES 1999/08/09 07:38:36 1.1413 @@ -1,5 +1,11 @@ Changes with Apache 1.3.8 + *) PORT: Improved compilation and DSO support on Sequent DYNIX/ptx. + [Ian Turner <[EMAIL PROTECTED]>] PR#4735 + + *) Local struct mmap in http_core.c conflicted with system structure + name on DYNIX -- changed to mmap_rec. [Roy Fielding] PR#4735 + *) Added updated mod_digest as modules/experimental/mod_auth_digest. [Ronald Tschalär <[EMAIL PROTECTED]>] @@ -13,17 +19,16 @@ *) RewriteLock/RewriteMap didn't work properly with virtual hosts. [Dmitry Khrustalev <[EMAIL PROTECTED]>] PR#3874 - *) Support for compaq/tandem/com. - [Ottati, Michael" <[EMAIL PROTECTED]>, dirkx] + *) PORT: Support for compaq/tandem/com. + [Michael Ottati <[EMAIL PROTECTED]>, dirkx] *) Added SHA1 password encryption support to easy migration from - Netscape servers. See support/SHA1 for more information; based - on the code contributed by Clinton Wong <[EMAIL PROTECTED]>. + Netscape servers. See support/SHA1 for more information. Caused the separation of ap_md5.c into md5, sha1 and a general ap_checkpass.c with just a validate_passwd routine. Added a couple of flags to support/htpasswd. Some reuse of the to64() function; hence renamed to ap_to64(). - [dirkx] + [Dirk-Willem van Gulik, Clinton Wong <[EMAIL PROTECTED]>] *) Change for EBCDIC platforms (TPF and BS2000) to correctly deal with ASCII/EBCDIC conversions in "ident" query. 1.367 +59 -3 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.366 retrieving revision 1.367 diff -u -r1.366 -r1.367 --- Configure 1999/08/06 22:15:54 1.366 +++ Configure 1999/08/09 07:38:37 1.367 @@ -699,11 +699,42 @@ OS='Paragon OSF/1' CFLAGS="$CFLAGS -DPARAGON" ;; -*DYNIX*) +*-sequent-ptx2.*.*) DEF_WANTHSREGEX=yes - OS='SEQUENT' - CFLAGS="$CFLAGS -DSEQUENT" + OS='SEQUENT DYNIX/ptx v2.*.*' + CFLAGS="$CFLAGS -DSEQUENT=20 -Wc,-pw" + LIBS="$LIBS -lsocket -linet -lnsl -lc -lseq" ;; +*-sequent-ptx4.0.*) + DEF_WANTHSREGEX=yes + OS='SEQUENT DYNIX/ptx v4.0.*' + CFLAGS="$CFLAGS -DSEQUENT=40 -Wc,-pw" + LIBS="$LIBS -lsocket -linet -lnsl -lc" + ;; +*-sequent-ptx4.[123].*) + DEF_WANTHSREGEX=yes + OS='SEQUENT DYNIX/ptx v4.1.*/v4.2.*' + CFLAGS="$CFLAGS -DSEQUENT=41 -Wc,-pw" + LIBS="$LIBS -lsocket -lnsl -lc" + ;; +*-sequent-ptx4.4.*) + DEF_WANTHSREGEX=yes + OS='SEQUENT DYNIX/ptx v4.4.*' + CFLAGS="$CFLAGS -DSEQUENT=44 -Wc,-pw" + LIBS="$LIBS -lsocket -lnsl -lc" + ;; +*-sequent-ptx4.5.*) + DEF_WANTHSREGEX=yes + OS='SEQUENT DYNIX/ptx v4.5.*' + CFLAGS="$CFLAGS -DSEQUENT=45 -Wc,-pw" + LIBS="$LIBS -lsocket -lnsl -lc" + ;; +*-sequent-ptx5.0.*) + DEF_WANTHSREGEX=yes + OS='S
cvs commit: apache-1.3/src/main http_core.c
fielding99/08/09 00:29:30
Modified:src/main http_core.c
Log:
Local struct mmap conflicts with system structure name on DYNIX,
and is pretty damn confusing anyway. Changed to mmap_rec.
PR: 4735
Revision ChangesPath
1.271 +3 -3 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- http_core.c 1999/07/03 07:59:48 1.270
+++ http_core.c 1999/08/09 07:29:29 1.271
@@ -2977,14 +2977,14 @@
static int do_nothing(request_rec *r) { return OK; }
#ifdef USE_MMAP_FILES
-struct mmap {
+struct mmap_rec {
void *mm;
size_t length;
};
static void mmap_cleanup(void *mmv)
{
-struct mmap *mmd = mmv;
+struct mmap_rec *mmd = mmv;
if (munmap(mmd->mm, mmd->length) == -1) {
ap_log_error(APLOG_MARK, APLOG_ERR, NULL,
@@ -3147,7 +3147,7 @@
#ifdef USE_MMAP_FILES
}
else {
- struct mmap *mmd;
+ struct mmap_rec *mmd;
mmd = ap_palloc(r->pool, sizeof(*mmd));
mmd->mm = mm;
cvs commit: apache-1.3/src Configuration.tmpl
fielding99/08/08 23:25:25 Modified:src Configuration.tmpl Log: Move mod_auth_digest to where it makes sense. If there is a problem with the ordering here, then we should move all the auth modules and not just the latest one. Revision ChangesPath 1.120 +13 -12apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- Configuration.tmpl1999/08/08 22:45:10 1.119 +++ Configuration.tmpl1999/08/09 06:25:24 1.120 @@ -322,17 +322,6 @@ AddModule modules/standard/mod_userdir.o -## "digest" implements HTTP Digest Authentication rather than the less -## secure Basic Auth used by the other modules. This is an updated -## version of mod_digest, but it is not well tested and is therefore -## marked experimental. -## Note: if you add this module in then you might also need the -## truerand library (available for example from -## ftp://research.att.com/dist/mab/librand.shar) - see the Rule -## DEV_RANDOM above for more info. - -# AddModule modules/experimental/mod_auth_digest.o - ## The proxy module enables the server to act as a proxy for outside ## http and ftp services. It's not as complete as it could be yet. ## NOTE: You do not want this module UNLESS you are running a proxy; @@ -370,9 +359,21 @@ # AddModule modules/standard/mod_auth_db.o ## "digest" implements HTTP Digest Authentication rather than the less -## secure Basic Auth used by the other modules. +## secure Basic Auth used by the other modules. This is the old version. # AddModule modules/standard/mod_digest.o + +## "auth_digest" implements HTTP/1.1 Digest Authentication (RFC 2617) +## rather than the less secure Basic Auth used by the other modules. +## This is an updated version of mod_digest, but it is not as well tested +## and is therefore marked experimental. Use either the one above, or +## this one below, but not both digest modules. +## Note: if you add this module in then you might also need the +## truerand library (available for example from +## ftp://research.att.com/dist/mab/librand.shar) - see the Rule +## DEV_RANDOM above for more info. + +# AddModule modules/experimental/mod_auth_digest.o ## Optional response header manipulation modules. ##
cvs commit: apache-1.3/src/main http_protocol.c
fielding99/07/30 20:30:19
Modified:src CHANGES
src/main http_protocol.c
Log:
Replace the Vary fixup code with a single-pass, single-copy
implementation that only adds the cost of a single ap_make_array
when there is no Vary field.
Revision ChangesPath
1.1406+1 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1405
retrieving revision 1.1406
diff -u -r1.1405 -r1.1406
--- CHANGES 1999/07/31 00:37:22 1.1405
+++ CHANGES 1999/07/31 03:30:16 1.1406
@@ -10,7 +10,7 @@
*) Fix SIGSEGV on some systems because the Vary fix below included
a call to table_do with a variable argument list that was not
- NULL terminated. [Roy Fielding]
+ NULL terminated. Replaced with better implementation. [Roy Fielding]
Changes with Apache 1.3.7 [not released]
1.275 +56 -85apache-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.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- http_protocol.c 1999/07/31 00:37:25 1.274
+++ http_protocol.c 1999/07/31 03:30:18 1.275
@@ -1446,27 +1446,55 @@
&& strstr(ua, "MSIE 3")));
}
-/*
- * qsort comparison routine for fixup_vary().
+/* This routine is called by ap_table_do and merges all instances of
+ * the passed field values into a single array that will be further
+ * processed by some later routine. Originally intended to help split
+ * and recombine multiple Vary fields, though it is generic to any field
+ * consisting of comma/space-separated tokens.
*/
-static int compare_vary(const void *va, const void *vb)
+static int uniq_field_values(void *d, const char *key, const char *val)
{
-return strcasecmp(*(const char **)va, *(const char **)vb);
-}
+array_header *values;
+char *start;
+char *e;
+char **strpp;
+int i;
-/*
- * ap_table_get() only picks up the first occurrence of a key,
- * which means that if there's a Vary in r->headers_out and another
- * in r->err_headers_out, one might get ignored. This routine
- * is called by ap_table_do and merges all instances of Vary into
- * a temporary list in r->notes.
- */
-static int merge_vary_fields(void *d, const char *key, const char *val)
-{
-request_rec *r;
+values = (array_header *)d;
+
+e = ap_pstrdup(values->pool, val);
-r = (request_rec *)d;
-ap_table_merge(r->notes, "Vary-list", val);
+do {
+/* Find a non-empty fieldname */
+
+while (*e == ',' || ap_isspace(*e)) {
+++e;
+}
+if (*e == '\0') {
+break;
+}
+start = e;
+while (*e != '\0' && *e != ',' && !ap_isspace(*e)) {
+++e;
+}
+if (*e != '\0') {
+*e++ = '\0';
+}
+
+/* Now add it to values if it isn't already represented.
+ * Could be replaced by a ap_array_strcasecmp() if we had one.
+ */
+for (i = 0, strpp = (char **) values->elts; i < values->nelts;
+ ++i, ++strpp) {
+if (*strpp && strcasecmp(*strpp, start) == 0) {
+break;
+}
+}
+if (i == values->nelts) { /* if not found */
+ *(char **)ap_push_array(values) = start;
+}
+} while (*e != '\0');
+
return 1;
}
@@ -1477,80 +1505,23 @@
*/
static void fixup_vary(request_rec *r)
{
-const char *vary;
-array_header *arr;
-char *start;
-char *e;
-char **ecur;
-char **eend;
-char **ekeep;
+array_header *varies;
-/* Don't do any unnecessary manipulations..
- */
-if (ap_table_get(r->headers_out, "Vary") == NULL) {
- return;
-}
-ap_table_do((int (*)(void *, const char *, const char
*))merge_vary_fields,
- (void *) r, r->headers_out, "Vary", NULL);
-vary = ap_table_get(r->notes, "Vary-list");
-
-/* XXX: we could make things a lot better, by having r->vary,
- * which is an array of char * -- which modules append to as they
- * find things which the request varies on. This is probably
- * better than a table, because a table would require O(n^2)
- * string comparisons... another option would be to use a table
- * but indicate that folks should use ap_table_add...
-
cvs commit: apache-1.3/src/main http_protocol.c
fielding99/07/30 17:37:27 Modified:src CHANGES src/main http_protocol.c Log: Fix SIGSEGV on some systems because the Vary fixup included a call to table_do with a variable argument list that was not NULL terminated. Other optimizations will follow. Revision ChangesPath 1.1405+13 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1404 retrieving revision 1.1405 diff -u -r1.1404 -r1.1405 --- CHANGES 1999/07/29 22:58:09 1.1404 +++ CHANGES 1999/07/31 00:37:22 1.1405 @@ -1,6 +1,18 @@ Changes with Apache 1.3.8 -Changes with Apache 1.3.7 + *) Change for EBCDIC platforms (TPF and BS2000) to correctly deal + with ASCII/EBCDIC conversions in "ident" query. + [David McCreedy <[EMAIL PROTECTED]>] + + *) Get rid of redefinition warning on MAC_OS_X_SERVER platform. + Change "Power Macintosh" to Power* so if uname prints "Power Book" + we're still happy on Rhapsody platforms. [Wilfredo Sanchez] + + *) Fix SIGSEGV on some systems because the Vary fix below included + a call to table_do with a variable argument list that was not + NULL terminated. [Roy Fielding] + +Changes with Apache 1.3.7 [not released] *) The "Vary" response header field is now sanitised right before the header is sent back to the client. Multiple "Vary" fields 1.274 +1 -1 apache-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.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- http_protocol.c 1999/07/29 22:22:04 1.273 +++ http_protocol.c 1999/07/31 00:37:25 1.274 @@ -1491,7 +1491,7 @@ return; } ap_table_do((int (*)(void *, const char *, const char *))merge_vary_fields, - (void *) r, r->headers_out, "Vary"); + (void *) r, r->headers_out, "Vary", NULL); vary = ap_table_get(r->notes, "Vary-list"); /* XXX: we could make things a lot better, by having r->vary,
cvs commit: apache-1.3/src/main http_protocol.c
fielding99/07/19 03:16:04
Modified:src CHANGES
src/main http_protocol.c
Log:
Fix handling of case when a client has sent "Expect: 100-continue"
and we are going to respond with an error, but get stuck waiting to
discard the body in the pointless hope of preserving the connection.
This remains less than satisfactory, since what we really should be
doing is sending the response immediately and discarding the request
body as some form of post-response cleanup. Something to consider.
PR: 4499, 3806
Submitted by: Roy Fielding, Joe Orton <[EMAIL PROTECTED]>
Revision ChangesPath
1.1397+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1396
retrieving revision 1.1397
diff -u -r1.1396 -r1.1397
--- CHANGES 1999/07/10 18:27:26 1.1396
+++ CHANGES 1999/07/19 10:15:53 1.1397
@@ -1,5 +1,10 @@
Changes with Apache 1.3.7
+ *) Fix handling of case when a client has sent "Expect: 100-continue"
+ and we are going to respond with an error, but get stuck waiting to
+ discard the body in the pointless hope of preserving the connection.
+ [Roy Fielding, Joe Orton <[EMAIL PROTECTED]>] PR#4499, PR#3806
+
*) Fix 'configure' to work correctly with SysV-based versions of
'tr' (consistent with Configure's use as well). [Jim Jagielski]
1.272 +9 -5 apache-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.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- http_protocol.c 1999/07/03 07:59:49 1.271
+++ http_protocol.c 1999/07/19 10:15:58 1.272
@@ -1881,14 +1881,18 @@
if ((rv = ap_setup_client_block(r, REQUEST_CHUNKED_PASS)))
return rv;
-/* If we are discarding the request body, then we must already know
- * the final status code, therefore disable the sending of 100 continue.
+/* In order to avoid sending 100 Continue when we already know the
+ * final response status, and yet not kill the connection if there is
+ * no request body to be read, we need to duplicate the test from
+ * ap_should_client_block() here negated rather than call it directly.
*/
-r->expecting_100 = 0;
-
-if (ap_should_client_block(r)) {
+if ((r->read_length == 0) && (r->read_chunked || (r->remaining > 0))) {
char dumpbuf[HUGE_STRING_LEN];
+if (r->expecting_100) {
+r->connection->keepalive = -1;
+return OK;
+}
ap_hard_timeout("reading request body", r);
while ((rv = ap_get_client_block(r, dumpbuf, HUGE_STRING_LEN)) > 0)
continue;
cvs commit: apache-1.3/htdocs/manual/misc FAQ-E.html
fielding99/07/03 18:51:16 Modified:htdocs/manual/misc FAQ-E.html Log: Missed closing tag Submitted by: Joshua Slive <[EMAIL PROTECTED]> Reviewed by: Roy Fielding Revision ChangesPath 1.3 +2 -2 apache-1.3/htdocs/manual/misc/FAQ-E.html Index: FAQ-E.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-E.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FAQ-E.html1999/07/03 22:12:49 1.2 +++ FAQ-E.html1999/07/04 01:51:16 1.3 @@ -31,7 +31,7 @@ Apache Server Frequently Asked Questions - $Revision: 1.2 $ ($Date: 1999/07/03 22:12:49 $) + $Revision: 1.3 $ ($Date: 1999/07/04 01:51:16 $) The latest version of this FAQ is always available from the main @@ -564,7 +564,7 @@ Why do I get a "Forbidden" message - whenever I try to access a particular directory? + whenever I try to access a particular directory? This message is generally caused because either
cvs commit: apache-1.3/htdocs/manual/misc FAQ-A.html FAQ-E.html FAQ-F.html FAQ-I.html
fielding99/07/03 15:12:51 Modified:htdocs/manual/misc FAQ-A.html FAQ-E.html FAQ-F.html FAQ-I.html Log: Some answers to problems that often come up on the www.servers.unix newsgroup. Submitted by: Joshua Slive <[EMAIL PROTECTED]> Reviewed by: Roy Fielding Revision ChangesPath 1.2 +2 -2 apache-1.3/htdocs/manual/misc/FAQ-A.html Index: FAQ-A.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-A.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FAQ-A.html1999/06/24 15:02:51 1.1 +++ FAQ-A.html1999/07/03 22:12:49 1.2 @@ -31,7 +31,7 @@ Apache Server Frequently Asked Questions - $Revision: 1.1 $ ($Date: 1999/06/24 15:02:51 $) + $Revision: 1.2 $ ($Date: 1999/07/03 22:12:49 $) The latest version of this FAQ is always available from the main @@ -182,7 +182,7 @@ How thoroughly tested is Apache? - Apache is run on over 1.2 million Internet servers (as of July 1998). It has + Apache is run on over 3 million Internet servers (as of June 1999). It has been tested thoroughly by both developers and users. The Apache Group maintains rigorous standards before releasing new versions of their server, and our server runs without a hitch on over one half of all 1.2 +27 -1 apache-1.3/htdocs/manual/misc/FAQ-E.html Index: FAQ-E.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-E.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FAQ-E.html1999/06/24 15:02:52 1.1 +++ FAQ-E.html1999/07/03 22:12:49 1.2 @@ -31,7 +31,7 @@ Apache Server Frequently Asked Questions - $Revision: 1.1 $ ($Date: 1999/06/24 15:02:52 $) + $Revision: 1.2 $ ($Date: 1999/07/03 22:12:49 $) The latest version of this FAQ is always available from the main @@ -108,6 +108,9 @@ My .htaccess files are being ignored. + Why do I get a +"Forbidden" message whenever I try to +access a particular directory? @@ -559,6 +562,29 @@ + + Why do I get a "Forbidden" message + whenever I try to access a particular directory? + + This message is generally caused because either + +The underlying file system permissions do not allow the +User/Group under which Apache is running to access the necessary +files; or +The Apache configuration has some access restrictions in +place which forbid access to the files. + + You can determine which case applies to your situation by checking the + error log. + + + In the case where file system permission are at fault, remember + that not only must the directory and files in question be readable, + but also all parent directories must be at least searchable by the + web server in order for the content to be accessible. + + + 1.2 +17 -2 apache-1.3/htdocs/manual/misc/FAQ-F.html Index: FAQ-F.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-F.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FAQ-F.html1999/06/24 15:02:52 1.1 +++ FAQ-F.html1999/07/03 22:12:50 1.2 @@ -31,7 +31,7 @@ Apache Server Frequently Asked Questions - $Revision: 1.1 $ ($Date: 1999/06/24 15:02:52 $) + $Revision: 1.2 $ ($Date: 1999/07/03 22:12:50 $) The latest version of this FAQ is always available from the main @@ -209,7 +209,16 @@ server. To see if this is the case, try running the script standalone from an interactive session, rather than as a script under the server. If you get error messages, this is almost certainly the cause of the - "premature end of script headers" message. + "premature end of script headers" message. Even if the CGI + runs fine from the command line, remember that the environment and + permissions may be different when running under the web server. The + CGI can only access resources allowed for the User and + Group specified in + your Apache configuration. In addition, the environment will not be + the same as the one provided on the command line, but it can be + adjusted using the directives provided by mod_env. The second most common cause of this (aside from people not @@ -253,6 +262,12 @@ message are the RLimitCPU and RLimitMEM directives. You may get the message if the CGI script was killed due
cvs commit: apache-site top.html
fielding99/06/29 02:58:57 Modified:.top.html Log: Be consistent in docs. Revision ChangesPath 1.2 +7 -5 apache-site/top.html Index: top.html === RCS file: /export/home/cvs/apache-site/top.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- top.html 1999/06/26 10:01:42 1.1 +++ top.html 1999/06/29 09:58:57 1.2 @@ -27,14 +27,16 @@ Contact Info Credits - - ASF Projects: - Foundation - Apache Server + + + ASF Projects: + Apache Server http://jakarta.apache.org/";>Jakarta - http://java.apache.org/";>JServ/JSSI + http://java.apache.org/";>Java-Apache http://perl.apache.org/";>mod_perl http://php.apache.org/";>mod_php + Conferences + Foundation Related Projects
cvs commit: apache-site top.html
fielding99/06/26 03:01:42 Added: .top.html Log: This is a first draft of a new top-level that will encompass all of the Apache projects. This will be moved to index.html on June 29. Please do not discuss it outside the Apache mailing lists until June 30. Revision ChangesPath 1.1 apache-site/top.html Index: top.html === The Apache Software Foundation http://www.apache.org/";> http://www.apache.org/dyn/closer.cgi";>Mirrored Worldwide FAQ News & Status Contributing Contact Info Credits ASF Projects: Foundation Apache Server http://jakarta.apache.org/";>Jakarta http://java.apache.org/";>JServ/JSSI http://perl.apache.org/";>mod_perl http://php.apache.org/";>mod_php Related Projects The Apache Software Foundation exists to provide organizational, legal, and financial support for the Apache open-source software projects. Formerly known as the Apache Group, the Foundation has been incorporated as a membership-based, not-for-profit corporation in order to ensure that the Apache projects continue to exist beyond the participation of individual volunteers, to enable contributions of intellectual property and funds on a sound basis, and to provide a vehicle for limiting legal exposure while participating in open-source software projects. You are invited to participate in The Apache Software Foundation. We welcome contributions in many forms. Our membership consists of those individuals who have demonstrated a commitment to collaborative open-source software development through sustained participation and contributions within the Foundation's projects. In addition, many people and companies have contributed towards the success of the Apache projects. http://search.apache.org/"; method="POST">
cvs commit: apache-site .cvsignore
fielding99/04/23 17:41:16 Modified:..cvsignore Log: subdirs are fun Revision ChangesPath 1.9 +1 -0 apache-site/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-site/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore1999/03/18 02:25:15 1.8 +++ .cvsignore1999/04/24 00:41:16 1.9 @@ -5,6 +5,7 @@ docs docsx docs-1.2 +foundation from-cvs incoming java
cvs commit: apache-apr/pthreads/src Configure
fielding99/04/19 22:29:42 Modified:pthreads/src Configure Log: CFLAGS and library needed to compile pthreads on Solaris. Revision ChangesPath 1.9 +2 -2 apache-apr/pthreads/src/Configure Index: Configure === RCS file: /home/cvs/apache-apr/pthreads/src/Configure,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Configure 1999/03/17 17:00:35 1.8 +++ Configure 1999/04/20 05:29:41 1.9 @@ -542,8 +542,8 @@ *-solaris2*) PLATOSVERS=`echo $PLAT | sed 's/^.*solaris2.//'` OS="Solaris $PLATOSVERS" - CFLAGS="$CFLAGS -DSOLARIS2=$PLATOSVERS" - LIBS="$LIBS -lsocket -lnsl" + CFLAGS="$CFLAGS -DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS" + LIBS="$LIBS -lsocket -lnsl -lpthread" DBM_LIB="" case "$PLATOSVERS" in 2[01234]*)
cvs commit: apache-apr/apr/network_io/unix sendrecv.c
fielding99/04/18 19:57:49
Modified:apr/network_io/unix sendrecv.c
Log:
Fix the algorithm for apr_send. The same needs to be done for apr_read.
Why are these functions called send and recv when they have no relation
to the UNIX system functions send and recv? write_with_nonblocking_timeout
is what it does.
Revision ChangesPath
1.3 +27 -26apache-apr/apr/network_io/unix/sendrecv.c
Index: sendrecv.c
===
RCS file: /home/cvs/apache-apr/apr/network_io/unix/sendrecv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sendrecv.c1999/04/14 15:14:03 1.2
+++ sendrecv.c1999/04/19 02:57:48 1.3
@@ -60,37 +60,38 @@
#include "apr_network_io.h"
#include
-apr_ssize_t apr_send(apr_socket_t *sock, const char *buf, int len, time_t
sec)
+apr_ssize_t apr_send(apr_socket_t *sock, const char *buf, int len, time_t
sec)
{
-fd_set fdset;
-struct timeval tv;
-int err = EAGAIN;
-apr_int32_t rv;
+ssize_t rv;
-tv.tv_sec = sec;
-if (tv.tv_sec == 0) {
-return (write(sock->socketdes, buf, len));
-}
-rv = write(sock->socketdes, buf, len);
+do {
+rv = write(sock->socketdes, buf, len);
+} while (rv == -1 && errno == EINTR);
+
+if (rv == -1 && errno == EAGAIN && sec > 0) {
+struct timeval tv;
+fd_set fdset;
+int srv;
+
+do {
+FD_ZERO(&fdset);
+FD_SET(sock->socketdes, &fdset);
+tv.tv_sec = sec;
+tv.tv_usec = 0;
+
+srv = select(FD_SETSIZE, NULL, &fdset, NULL, &tv);
+} while (srv == -1 && errno == EINTR);
-if (rv == -1) {
-err = errno;
- if (err == EAGAIN || errno == EINTR) {
- FD_ZERO(&fdset);
- FD_SET(sock->socketdes, &fdset);
- tv.tv_usec = 0;
+if (srv < 1) {
+return (apr_ssize_t) -1;
+}
+else {
do {
- rv = select(FD_SETSIZE, NULL, &fdset, NULL, &tv);
- } while (rv == -1 && errno == EINTR);
-if (rv == -1 || rv == 0) {
- err = errno;
-return APR_FAILURE;
- }
- else {
- return write(sock->socketdes, buf, len);
- }
- }
+rv = write(sock->socketdes, buf, len);
+} while (rv == -1 && errno == EINTR);
+}
}
+return (apr_ssize_t) rv;
}
apr_ssize_t apr_recv(apr_socket_t *sock, char *buf, int len, time_t sec)
cvs commit: apache-apr/pthreads/src/os/unix os.h
fielding99/04/08 15:42:21 Modified:pthreads/src/os/unix os.h Log: Add prototypes for ap_spawnvp(). Revision ChangesPath 1.4 +2 -0 apache-apr/pthreads/src/os/unix/os.h Index: os.h === RCS file: /home/cvs/apache-apr/pthreads/src/os/unix/os.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- os.h 1999/02/07 06:30:14 1.3 +++ os.h 1999/04/08 22:42:20 1.4 @@ -75,6 +75,7 @@ #define INLINE extern ap_inline INLINE int ap_os_is_path_absolute(const char *file); +INLINE int ap_spawnvp(const char *file, char *const argv[]); #include "os-inline.c" @@ -84,6 +85,7 @@ * as normal */ extern int ap_os_is_path_absolute(const char *file); +extern int ap_spawnvp(const char *file, char *const argv[]); #endif /* Other ap_os_ routines not used by this platform */
cvs commit: apache-apr/include apr_file_io.h apr_general.h
fielding99/04/07 19:36:28 Modified:include apr_file_io.h apr_general.h Log: ssize_t is the correct return value for read/write. Default to the ANSI C values instead of a funky fixed bit size. Revision ChangesPath 1.9 +2 -2 apache-apr/include/apr_file_io.h Index: apr_file_io.h === RCS file: /home/cvs/apache-apr/include/apr_file_io.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- apr_file_io.h 1999/04/07 20:42:09 1.8 +++ apr_file_io.h 1999/04/08 02:36:26 1.9 @@ -102,8 +102,8 @@ apr_file_t *apr_open(char *, apr_int32_t, apr_fileperms_t); apr_status_t apr_close(apr_file_t *); -apr_size_t apr_read(apr_file_t *, void *, apr_size_t); -apr_size_t apr_write(apr_file_t *, void *, apr_size_t); +apr_ssize_t apr_read(apr_file_t *, void *, apr_size_t); +apr_ssize_t apr_write(apr_file_t *, void *, apr_size_t); apr_file_t *apr_dupfile(apr_file_t *); apr_status_t apr_getfileinfo(char *, apr_file_t *); 1.7 +3 -2 apache-apr/include/apr_general.h Index: apr_general.h === RCS file: /home/cvs/apache-apr/include/apr_general.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apr_general.h 1999/04/07 20:42:09 1.6 +++ apr_general.h 1999/04/08 02:36:26 1.7 @@ -66,8 +66,9 @@ typedef long apr_int64_t; typedef unsigned long apr_uint64_t; -typedef apr_int32_t apr_size_t; +typedef size_tapr_size_t; +typedef ssize_t apr_ssize_t; -typedef apr_int32_t apr_off_t; +typedef off_t apr_off_t; #endif /* ! APR_GENERAL_H */
cvs commit: apache-1.3 STATUS
fielding99/03/20 15:55:09 Modified:.STATUS Log: Stupid bacteria. Revision ChangesPath 1.658 +1 -8 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.657 retrieving revision 1.658 diff -u -r1.657 -r1.658 --- STATUS1999/03/20 18:55:45 1.657 +++ STATUS1999/03/20 23:55:08 1.658 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/03/20 18:55:45 $] + Last modified at [$Date: 1999/03/20 23:55:08 $] Release: @@ -59,13 +59,6 @@ RELEASE SHOWSTOPPERS: - -* mod_access/3821: check_dir_access(), reads a->order[31] - => either an if-clause should be added or the M_INVALID changed - -* mod_so/3493: os/unix/os.c dlclose()s objects before module cleanups - => this is a subtle thing related to pool cleanups, I think. - RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
cvs commit: apache-1.3/src/include ap_mmn.h httpd.h
fielding99/03/20 15:43:24 Modified:src CHANGES src/include ap_mmn.h httpd.h Log: M_INVALID needs a value within the scope of METHODS so that unknown methods can be access controlled. MMP must be bumped because this may break binary compatibility for third-party modules. PR: 3821 Revision ChangesPath 1.1287+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1286 retrieving revision 1.1287 diff -u -r1.1286 -r1.1287 --- CHANGES 1999/03/20 21:51:38 1.1286 +++ CHANGES 1999/03/20 23:43:21 1.1287 @@ -1,5 +1,8 @@ Changes with Apache 1.3.5 + *) M_INVALID needed a value within the scope of METHODS so that unknown + methods can be access controlled. [Roy Fielding] PR#3821 + *) Added PassAllEnv; makes server's entire environment available to CGIs and SSIs executed within directive's scope. [Ken Coar] 1.32 +3 -2 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ap_mmn.h 1999/03/10 17:42:40 1.31 +++ ap_mmn.h 1999/03/20 23:43:23 1.32 @@ -213,14 +213,15 @@ *definition of method in request_rec. * 19990108.6 - SIGPIPE is now ignored by the core server. * 19990108.7 - ap_isxdigit added + * 19990320 - METHODS and M_INVALID symbol values modified */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 19990108 +#define MODULE_MAGIC_NUMBER_MAJOR 19990320 #endif -#define MODULE_MAGIC_NUMBER_MINOR 7 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ /* Useful for testing for features. */ 1.272 +2 -2 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.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- httpd.h 1999/03/07 15:05:35 1.271 +++ httpd.h 1999/03/20 23:43:24 1.272 @@ -555,9 +555,9 @@ #define M_MOVE 12 #define M_LOCK 13 #define M_UNLOCK14 +#define M_INVALID 15 -#define METHODS 15 -#define M_INVALID 31 +#define METHODS 16 #define CGI_MAGIC_TYPE "application/x-httpd-cgi" #define INCLUDES_MAGIC_TYPE "text/x-server-parsed-html"
cvs commit: apache-site .cvsignore
fielding99/03/17 18:25:17 Modified:..cvsignore Log: something Brian added, I guess. Revision ChangesPath 1.8 +1 -0 apache-site/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-site/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore1998/06/10 18:51:41 1.7 +++ .cvsignore1999/03/18 02:25:15 1.8 @@ -1,3 +1,4 @@ +.welcome.ftp bugs data dist
cvs commit: apache-1.3/conf mime.types
fielding99/03/14 15:58:59 Modified:conf mime.types Log: Never define a new x-type. Use the type defined by most image viewers on the Win32 platform. Revision ChangesPath 1.23 +1 -1 apache-1.3/conf/mime.types Index: mime.types === RCS file: /home/cvs/apache-1.3/conf/mime.types,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mime.types1999/03/14 22:12:36 1.22 +++ mime.types1999/03/14 23:58:59 1.23 @@ -197,6 +197,7 @@ audio/x-realaudiora audio/x-wav wav chemical/x-pdb pdb xyz +image/bmpbmp image/cgm image/g3fax image/gifgif @@ -213,7 +214,6 @@ image/vnd.svf image/vnd.xiff image/x-cmu-raster ras -image/x-ms-bmp bmp image/x-portable-anymap pnm image/x-portable-bitmap pbm image/x-portable-graymap pgm
cvs commit: apache-1.3/src CHANGES
fielding99/03/08 13:07:00 Modified:.STATUS config.layout src CHANGES Log: Add Apple's Mac OS X Server Layout "Rhapsody". Submitted by: Wilfredo Sanchez <[EMAIL PROTECTED]> Reviewed by: Roy Fielding Revision ChangesPath 1.643 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.642 retrieving revision 1.643 diff -u -r1.642 -r1.643 --- STATUS1999/03/08 20:50:04 1.642 +++ STATUS1999/03/08 21:06:57 1.643 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/03/08 20:50:04 $] + Last modified at [$Date: 1999/03/08 21:06:57 $] Release: @@ -61,10 +61,6 @@ ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz Message-ID: <[EMAIL PROTECTED]> Status: Lars +1 (on concept) - -* Fred's PATCH: Add Mac OS X Server Layout file layout -Message-ID: <[EMAIL PROTECTED]> -Status: Roy +1, Dirkx +0, Lars +0 * Jim Patterson's patch to make mod_info work on Win32 Message-ID: PR#1442 1.4 +17 -0 apache-1.3/config.layout Index: config.layout === RCS file: /home/cvs/apache-1.3/config.layout,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config.layout 1999/01/05 05:14:49 1.3 +++ config.layout 1999/03/08 21:06:57 1.4 @@ -60,3 +60,20 @@ logfiledir:logs proxycachedir: proxy + +# Apple's Mac OS X Server Layout + +prefix:/Local/Library/WebServer +exec_prefix: /usr +bindir:$exec_prefix/bin +sbindir: $exec_prefix/sbin +libexecdir:/System/Library/Apache/Modules +mandir:$exec_prefix/share/man +sysconfdir:$prefix/Configuration +datadir: $prefix +includedir: /System/Library/Frameworks/Apache.framework/Versions/1.3/Headers +localstatedir: /private/var +runtimedir:$prefix/Logs +logfiledir:$prefix/Logs +proxycachedir: $prefix/ProxyCache + 1.1268+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1267 retrieving revision 1.1268 diff -u -r1.1267 -r1.1268 --- CHANGES 1999/03/08 20:50:06 1.1267 +++ CHANGES 1999/03/08 21:06:59 1.1268 @@ -1,5 +1,8 @@ Changes with Apache 1.3.5 + *) Add Apple's Mac OS X Server Layout "Rhapsody" to config.layout. + [Wilfredo Sanchez] + *) Add cgidir, htdocsdir, iconsdir variables to Makefile.tmpl in order to make platform installations easier. [Wilfredo Sanchez]
cvs commit: apache-1.3/src CHANGES
fielding99/03/08 12:50:09
Modified:.Makefile.tmpl STATUS
src CHANGES
Log:
Add cgidir, htdocsdir, iconsdir variables to Makefile.tmpl in order
to make platform installations easier.
Submitted by: Wilfredo Sanchez <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision ChangesPath
1.66 +23 -20apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Makefile.tmpl 1999/02/10 12:27:22 1.65
+++ Makefile.tmpl 1999/03/08 20:50:04 1.66
@@ -112,6 +112,9 @@
mandir = @mandir@
sysconfdir = @sysconfdir@
datadir = @datadir@
+iconsdir= $(datadir)/icons
+htdocsdir = $(datadir)/htdocs
+cgidir = $(datadir)/cgi-bin
includedir = @includedir@
localstatedir = @localstatedir@
runtimedir = @runtimedir@
@@ -246,9 +249,9 @@
$(MKDIR) $(root)$(mandir)/man1
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
- $(MKDIR) $(root)$(datadir)/htdocs
- $(MKDIR) $(root)$(datadir)/icons
- $(MKDIR) $(root)$(datadir)/cgi-bin
+ $(MKDIR) $(root)$(htdocsdir)
+ $(MKDIR) $(root)$(iconsdir)
+ $(MKDIR) $(root)$(cgidir)
$(MKDIR) $(root)$(includedir)
$(MKDIR) $(root)$(runtimedir)
$(MKDIR) $(root)$(logfiledir)
@@ -376,31 +379,31 @@
# icons and distributed CGI scripts.
install-data:
@echo "===> [data: Installing initial data files]"
- [EMAIL PROTECTED] [ -f $(root)$(datadir)/htdocs/index.html ]; then \
- echo "[PRESERVING EXISTING DATA SUBDIR:
$(root)$(datadir)/htdocs/]"; \
+ [EMAIL PROTECTED] [ -f $(root)$(htdocsdir)/index.html ]; then \
+ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]";
\
else \
- echo "Copying tree $(TOP)/htdocs/ ->
$(root)$(datadir)/htdocs/"; \
+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
- (cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \
- find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ;
\
- find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
+ (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
+ find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+ find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
fi
- [EMAIL PROTECTED] [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
- echo "[PRESERVING EXISTING DATA SUBDIR:
$(root)$(datadir)/cgi-bin/]"; \
+ [EMAIL PROTECTED] [ -f $(root)$(cgidir)/printenv ]; then \
+ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
else \
for script in printenv test-cgi; do \
cat $(TOP)/cgi-bin/$${script} |\
sed -e 's;^#!/.*perl;#!$(PERL);' \
> $(TOP)/$(SRC)/.apaci.install.tmp; \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*]
$(root)$(datadir)/cgi-bin/$${script}"; \
- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp
$(root)$(datadir)/cgi-bin/$${script}; \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*]
$(root)$(cgidir)/$${script}"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp
$(root)$(cgidir)/$${script}; \
done; \
fi
- @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+ @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
- (cd $(root)$(datadir)/icons/ && $(TAR) -xf -); \
- find $(root)$(datadir)/icons/ -type d -exec chmod a+rx {} \; ;\
- find $(root)$(datadir)/icons/ -type f -exec chmod a+r {} \;
+ (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
+ find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
+ find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \;
@echo "<=== [data]"
# create the initial configuration by providing default files
@@ -424,9 +427,9 @@
echo ""; \
cat $(TOP)/conf/$${conf}-dist ) |\
sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
-
cvs commit: apache-1.3/src CHANGES
fielding99/03/08 12:03:21 Modified:.STATUS configure src CHANGES Log: Do not append the target name to the directory path if the path already contains "apache". Submitted by: Ralf S. Engelschall Reviewed by: Roy Fielding, Lars Eilebrecht Revision ChangesPath 1.641 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.640 retrieving revision 1.641 diff -u -r1.640 -r1.641 --- STATUS1999/03/08 15:53:20 1.640 +++ STATUS1999/03/08 20:03:16 1.641 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/03/08 15:53:20 $] + Last modified at [$Date: 1999/03/08 20:03:16 $] Release: @@ -61,10 +61,6 @@ ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz Message-ID: <[EMAIL PROTECTED]> Status: Lars +1 (on concept) - -* Ralf's patch to fix append of target name to layout paths -Message-ID: <[EMAIL PROTECTED]> -Status: Ralf +1, Roy +1, Lars +1 * Fred's PATCH: Add cgidir, htdocsdir, iconsdir variables in Makefile.tmpl Message-ID: <[EMAIL PROTECTED]> 1.74 +13 -4 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- configure 1999/01/16 22:00:41 1.73 +++ configure 1999/03/08 20:03:17 1.74 @@ -946,10 +946,19 @@ eval "$var=\"$val\"" # expand value eval "val=\$$var" -# add target suffix when requested -if [ ".`echo $val | grep $thetarget`" = . ]; then -eval "autosuffix=\$autosuffix_$var" -if [ "x$autosuffix" = "xyes" ]; then +# automatically add target suffix to path when it's +# requested (path has a trailing plus in config.layout) and +# looks reasonable (i.e. when "apache" or target-name +# still not part of path) +eval "autosuffix=\$autosuffix_$var" +if [ "x$autosuffix" = "xyes" ]; then +addtarget=no +if [ "x`echo $val | grep apache`" = "x" ]; then +if [ "x`echo $val | grep $thetarget`" = "x" ]; then +addtarget=yes +fi +fi +if [ "x$addtarget" = "xyes" ]; then eval "$var=\"\$$var/$thetarget\"" fi fi 1.1266+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1265 retrieving revision 1.1266 diff -u -r1.1265 -r1.1266 --- CHANGES 1999/03/08 15:43:57 1.1265 +++ CHANGES 1999/03/08 20:03:19 1.1266 @@ -1,5 +1,8 @@ Changes with Apache 1.3.5 + *) In configure, do not append the target name to the directory path if + the path already contains "apache". [Ralf S. Engelschall] + *) SIGPIPE is now ignored by the server core. The request write routines (ap_rputc, ap_rputs, ap_rvputs, ap_rwrite, ap_rprintf, ap_rflush) now correctly check for output errors and mark the connection as aborted.
cvs commit: apache-1.3 STATUS
fielding99/03/08 07:53:21 Modified:.STATUS Log: Yikes, the sun! Revision ChangesPath 1.640 +12 -25apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.639 retrieving revision 1.640 diff -u -r1.639 -r1.640 --- STATUS1999/03/07 18:03:41 1.639 +++ STATUS1999/03/08 15:53:20 1.640 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/03/07 18:03:41 $] + Last modified at [$Date: 1999/03/08 15:53:20 $] Release: @@ -53,30 +53,6 @@ Available Patches: -* Roy's [PATCH] always ignore SIGPIPE - Changes the default behavior to always ignore SIGPIPE. - Will also need a minor MMN bump when committed. - MID: <[EMAIL PROTECTED]> - Status: Roy +1 - -* Ken's [PATCH] Merge RefererIgnore into mod_log_config - Allows mod_log_agent and mod_log_referer to be dropped from - distribution. - MID: <[EMAIL PROTECTED]> - Status: Ken +1, Lars +1 (untested) - -* Ralf's [PATCH] Shared Memory Pools -Message-ID: <[EMAIL PROTECTED]> -Status: Roy?: Not sure if this is intended for 1.3.x or just feedback -Ralf: The stuff in general _IS_ for 1.3.x but the posted - patch was just a first cut to get feedback. An updated - one is posted in a few days. And I'm actually still - waiting for a review from Dean for the shared memory - hard-core stuff. When someone else is also interested - please review the shared memory deep-level code. -Doug: +1 on concept (untested) -Lars: +1 on concept - * Fred's [PATCH: srm.conf and access.conf refer to httpd.conf Message-ID: <[EMAIL PROTECTED]> Status: Jim +1 @@ -136,6 +112,17 @@ Status: Big change -- needs review. In progress: + +* Ralf's [PATCH] Shared Memory Pools +Message-ID: <[EMAIL PROTECTED]> +Status: Ralf: The stuff in general _IS_ for 1.3.x but the posted + patch was just a first cut to get feedback. An updated + one is posted in a few days. And I'm actually still + waiting for a review from Dean for the shared memory + hard-core stuff. When someone else is also interested + please review the shared memory deep-level code. +Doug: +1 on concept (untested) +Lars: +1 on concept * Marc's [PATCH] PR#3323: recursive includes Message-ID: <[EMAIL PROTECTED]>
cvs commit: apache-1.3/src/modules/standard mod_cgi.c
fielding99/03/08 07:44:04
Modified:src CHANGES
src/include ap_mmn.h
src/main http_main.c http_protocol.c
src/modules/proxy proxy_http.c
src/modules/standard mod_cgi.c
Log:
SIGPIPE is now ignored by the server core. The request write routines
(ap_rputc, ap_rputs, ap_rvputs, ap_rwrite, ap_rprintf, ap_rflush) now
correctly check for output errors and mark the connection as aborted.
Replaced many direct (unchecked) calls to ap_b* routines with the
analogous ap_r* calls. Removed the pointless handling of EAGAIN errors.
Revision ChangesPath
1.1265+6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1264
retrieving revision 1.1265
diff -u -r1.1264 -r1.1265
--- CHANGES 1999/03/07 18:03:38 1.1264
+++ CHANGES 1999/03/08 15:43:57 1.1265
@@ -1,5 +1,11 @@
Changes with Apache 1.3.5
+ *) SIGPIPE is now ignored by the server core. The request write routines
+ (ap_rputc, ap_rputs, ap_rvputs, ap_rwrite, ap_rprintf, ap_rflush) now
+ correctly check for output errors and mark the connection as aborted.
+ Replaced many direct (unchecked) calls to ap_b* routines with the
+ analogous ap_r* calls. [Roy Fielding]
+
*) Enhanced mod_rewrite's mapfile handling: The in-core cache for text and
DBM format mapfiles now uses a 4-way hash table with LRU functionality.
Furthermore map lookups for non-existent keys are now cached as well.
1.30 +2 -1 apache-1.3/src/include/ap_mmn.h
Index: ap_mmn.h
===
RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ap_mmn.h 1999/03/07 15:05:35 1.29
+++ ap_mmn.h 1999/03/08 15:43:59 1.30
@@ -211,6 +211,7 @@
*ap_find_list_item()
* 19990108.5 - added ap_sub_req_method_uri() and added const to
the
*definition of method in request_rec.
+ * 19990108.6 - SIGPIPE is now ignored by the core server.
*/
#define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */
@@ -218,7 +219,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 19990108
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 5 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward
compat */
/* Useful for testing for features. */
1.425 +20 -27apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- http_main.c 1999/02/22 16:50:25 1.424
+++ http_main.c 1999/03/08 15:44:00 1.425
@@ -1021,10 +1021,9 @@
static APACHE_TLS int volatile alarm_pending = 0;
static void timeout(int sig)
-{/* Also called on SIGPIPE */
+{
void *dirconf;
-signal(SIGPIPE, SIG_IGN);/* Block SIGPIPE */
if (alarms_blocked) {
alarm_pending = 1;
return;
@@ -1042,20 +1041,10 @@
else
dirconf = current_conn->server->lookup_defaults;
if (!current_conn->keptalive) {
- if (sig == SIGPIPE) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
- current_conn->server,
- "[client %s] stopped connection before %s completed",
- current_conn->remote_ip,
- timeout_name ? timeout_name : "request");
- }
- else {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
- current_conn->server,
- "[client %s] %s timed out",
- current_conn->remote_ip,
- timeout_name ? timeout_name : "request");
- }
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
+ current_conn->server, "[client %s] %s timed out",
+ current_conn->remote_ip,
+ timeout_name ? timeout_name : "request");
}
if (timeout_req) {
@@ -2757,6 +2746,11 @@
if (sigaction(SIGXFSZ, &sa, NULL) < 0)
ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf,
"sigaction(SIGXFSZ)");
#endif
+#ifdef SIGPIPE
+sa.sa_handler = SIG_IGN;
+if (sigaction(SIGPIPE, &sa, NULL) < 0)
+ ap_log_error(APLOG
cvs commit: apache-1.3 STATUS
fielding99/03/07 08:56:50 Modified:.STATUS Log: mention my patch Revision ChangesPath 1.638 +7 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.637 retrieving revision 1.638 diff -u -r1.637 -r1.638 --- STATUS1999/03/07 15:05:29 1.637 +++ STATUS1999/03/07 16:56:49 1.638 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/03/07 15:05:29 $] + Last modified at [$Date: 1999/03/07 16:56:49 $] Release: @@ -52,6 +52,12 @@ TCN additions and when the RVSA algorithm is used. Available Patches: + +* Roy's [PATCH] always ignore SIGPIPE + Changes the default behavior to always ignore SIGPIPE. + Will also need a minor MMN bump when committed. + MID: <[EMAIL PROTECTED]> + Status: Roy +1 * Ken's [PATCH] Merge RefererIgnore into mod_log_config Allows mod_log_agent and mod_log_referer to be dropped from
cvs commit: apache-1.3/src/main http_core.c
fielding99/03/07 07:35:18
Modified:src CHANGES
src/main http_core.c
Log:
Added informative error messages for failed munmap() and fseek() calls
in http_core.c.
Submitted by: John Bley <[EMAIL PROTECTED]>, Roy Fielding
Revision ChangesPath
1.1263+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1262
retrieving revision 1.1263
diff -u -r1.1262 -r1.1263
--- CHANGES 1999/03/07 15:05:33 1.1262
+++ CHANGES 1999/03/07 15:35:14 1.1263
@@ -18,6 +18,9 @@
*) Fixed a few compiler nits. [John Bley <[EMAIL PROTECTED]>]
+ *) Added informative error messages for failed munmap() and fseek() calls
+ in http_core.c. [John Bley, Roy Fielding]
+
*) Added some informative error messages for some failed malloc()
calls. [John Bley <[EMAIL PROTECTED]>, Jim Jagielski]
1.253 +14 -4 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- http_core.c 1999/03/07 13:13:52 1.252
+++ http_core.c 1999/03/07 15:35:17 1.253
@@ -1070,7 +1070,7 @@
if (error_number == 401 &&
line[0] != '/' && line[0] != '"') { /* Ignore it... */
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, NULL,
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, cmd->server,
"cannot use a full URL in a 401 ErrorDocument "
"directive --- ignoring!");
}
@@ -2937,7 +2937,11 @@
{
struct mmap *mmd = mmv;
-munmap(mmd->mm, mmd->length);
+if (munmap(mmd->mm, mmd->length) == -1) {
+ap_log_error(APLOG_MARK, APLOG_ERR, NULL,
+ "Failed to munmap memory of length %ld at 0x%lx",
+ (long) mmd->length, (long) mmd->mm);
+}
}
#endif
@@ -3066,8 +3070,14 @@
else {
long offset, length;
while (ap_each_byterange(r, &offset, &length)) {
- fseek(f, offset, SEEK_SET);
- ap_send_fd_length(f, r, length);
+ if (fseek(f, offset, SEEK_SET) == -1) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
+ "Failed to fseek for byterange (%ld, %ld)",
+ offset, length);
+ }
+ else {
+ ap_send_fd_length(f, r, length);
+ }
}
}
}
cvs commit: apache-1.3/src/support httpd.exp
fielding99/03/07 07:05:37 Modified:.STATUS htdocs/manual/misc API.html src ApacheCore.def CHANGES src/include ap_mmn.h http_request.h httpd.h src/main http_request.c src/support httpd.exp Log: Added ap_sub_req_method_uri() for doing a subrequest with a method other than GET, and const'd the definition of method in request_rec. Submitted by: Greg Stein <[EMAIL PROTECTED]> Reviewed by: Roy Fielding, Dean Gaudet, Doug MacEachern Revision ChangesPath 1.637 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.636 retrieving revision 1.637 diff -u -r1.636 -r1.637 --- STATUS1999/03/06 19:25:12 1.636 +++ STATUS1999/03/07 15:05:29 1.637 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/03/06 19:25:12 $] + Last modified at [$Date: 1999/03/07 15:05:29 $] Release: @@ -136,10 +136,6 @@ * Ronald Tschalär's major update of mod_digest Message-ID: <[EMAIL PROTECTED]> Status: Big change -- needs review. - -* Greg Stein's ap_sub_req_method_uri() - Message-ID: <[EMAIL PROTECTED]> - Status: Doug +1, Lars +1 (concept) In progress: 1.18 +8 -6 apache-1.3/htdocs/manual/misc/API.html Index: API.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/API.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- API.html 1998/09/17 14:14:52 1.17 +++ API.html 1999/03/07 15:05:32 1.18 @@ -360,8 +360,9 @@ order to figure out what icon to use. Such handlers can construct a sub-request, using the - functions ap_sub_req_lookup_file and - ap_sub_req_lookup_uri; this constructs a new + functions ap_sub_req_lookup_file, + ap_sub_req_lookup_uri, and + ap_sub_req_method_uri; these construct a new request_rec structure and processes it as you would expect, up to but not including the point of actually sending a response. (These functions skip over the access @@ -370,7 +371,7 @@ (Server-side includes work by building sub-requests and then actually invoking the response handler for them, via the - function run_sub_request). + function ap_run_sub_req). Handling requests, declining, and returning error @@ -704,7 +705,8 @@ for the main request this is a subpool of connection->pool; for subrequests it is a subpool of the parent request's pool. - exists until the end of the request (i.e., destroy_sub_req, or + exists until the end of the request (i.e., +ap_destroy_sub_req, or in child_main after process_request has finished) note that r itself is allocated from r->pool; i.e., @@ -818,7 +820,7 @@ One final note --- sub-requests have their own resource pools, which are sub-pools of the resource pool for the main request. The polite way to reclaim the resources associated with a sub request which you -have allocated (using the ap_sub_req_lookup_... functions) +have allocated (using the ap_sub_req_... functions) is ap_destroy_sub_req, which frees the resource pool. Before calling this function, be sure to copy anything that you care about which might be allocated in the sub-request's resource pool into @@ -830,7 +832,7 @@ request, and it will be freed anyway when the main request pool is cleared. It is only when you are allocating many, many sub-requests for a single main request that you should seriously consider the -ap_destroy... functions). +ap_destroy_... functions). Configuration, commands and the like 1.13 +1 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ApacheCore.def1999/02/09 17:17:04 1.12 +++ ApacheCore.def1999/03/07 15:05:33 1.13 @@ -343,4 +343,5 @@ ap_group_id @336 ap_standalone @337 ap_server_confname @338 + ap_sub_req_method_uri @339 1.1262+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1261 retrieving revision 1.1262 diff -u -r1.1261 -r1.1262 --- CHANGES 1999/03/07 14:05:31 1.1261 +++ CHANGES 1999/03/07 15:05:33 1.1262 @@ -1,5 +1,9
cvs commit: apache-1.3/src/main alloc.c
fielding99/03/07 06:05:34
Modified:src CHANGES
src/include alloc.h
src/main alloc.c
Log:
Use proper pid_t type for saving PIDs in alloc.c.
Submitted by: John Bley <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision ChangesPath
1.1261+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1260
retrieving revision 1.1261
diff -u -r1.1260 -r1.1261
--- CHANGES 1999/03/07 13:13:50 1.1260
+++ CHANGES 1999/03/07 14:05:31 1.1261
@@ -1,5 +1,7 @@
Changes with Apache 1.3.5
+ *) Use proper pid_t type for saving PIDs in alloc.c. [John Bley]
+
*) Replaced use of WIN32 define with HAVE_DRIVE_LETTERS to indicate
when the OS allows a DOS drive letter within pathnames. [Brian Havard]
1.67 +1 -1 apache-1.3/src/include/alloc.h
Index: alloc.h
===
RCS file: /home/cvs/apache-1.3/src/include/alloc.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- alloc.h 1999/01/03 12:04:36 1.66
+++ alloc.h 1999/03/07 14:05:33 1.67
@@ -342,7 +342,7 @@
};
typedef struct child_info child_info;
-API_EXPORT(void) ap_note_subprocess(pool *a, int pid,
+API_EXPORT(void) ap_note_subprocess(pool *a, pid_t pid,
enum kill_conditions how);
API_EXPORT(int) ap_spawn_child(pool *, int (*)(void *, child_info *),
void *, enum kill_conditions,
1.106 +9 -7 apache-1.3/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- alloc.c 1999/01/03 12:04:37 1.105
+++ alloc.c 1999/03/07 14:05:34 1.106
@@ -1998,8 +1998,8 @@
struct process_chain *next;
};
-API_EXPORT(void) ap_note_subprocess(pool *a, int pid, enum kill_conditions
how)
-{
+API_EXPORT(void) ap_note_subprocess(pool *a, pid_t pid, enum kill_conditions
+how) {
struct process_chain *new =
(struct process_chain *) ap_palloc(a, sizeof(struct process_chain));
@@ -2022,11 +2022,11 @@
#define BINMODE
#endif
-static int spawn_child_core(pool *p, int (*func) (void *, child_info *),
+static pid_t spawn_child_core(pool *p, int (*func) (void *, child_info *),
void *data,enum kill_conditions kill_how,
int *pipe_in, int *pipe_out, int *pipe_err)
{
-int pid;
+pid_t pid;
int in_fds[2];
int out_fds[2];
int err_fds[2];
@@ -2220,7 +2220,8 @@
FILE **pipe_err)
{
int fd_in, fd_out, fd_err;
-int pid, save_errno;
+pid_t pid;
+int save_errno;
ap_block_alarms();
@@ -2280,7 +2281,7 @@
HANDLE hPipeOutputReadDup = NULL;
HANDLE hPipeErrorReadDup = NULL;
HANDLE hCurrentProcess;
-int pid = 0;
+pid_t pid = 0;
child_info info;
@@ -2452,7 +2453,8 @@
#else
int fd_in, fd_out, fd_err;
-int pid, save_errno;
+pid_t pid;
+int save_errno;
ap_block_alarms();
cvs commit: apache-1.3/src/ap ap_execve.c
fielding99/03/07 05:51:20
Modified:src/ap ap_execve.c
Log:
Added error messages for malloc calls.
Submitted by: John Bley <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision ChangesPath
1.12 +10 -2 apache-1.3/src/ap/ap_execve.c
Index: ap_execve.c
===
RCS file: /home/cvs/apache-1.3/src/ap/ap_execve.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ap_execve.c 1999/01/01 19:04:36 1.11
+++ ap_execve.c 1999/03/07 13:51:19 1.12
@@ -126,8 +126,10 @@
}
va_end(adummy);
-if ((argv = (char **) malloc((argc + 2) * sizeof(*argv))) == NULL)
+if ((argv = (char **) malloc((argc + 2) * sizeof(*argv))) == NULL) {
+ fprintf(stderr, "Ouch! Out of memory in ap_execle()!\n");
return -1;
+}
/* Pass two --- copy the argument strings into the result space */
va_start(adummy, argv0);
@@ -222,8 +224,10 @@
else {
int i = count_args(argv) + 1; /* +1 for leading SHELL_PATH */
- if ((script_argv = malloc(sizeof(*script_argv) * i)) == NULL)
+ if ((script_argv = malloc(sizeof(*script_argv) * i)) == NULL) {
+ fprintf(stderr, "Ouch! Out of memory in ap_execve()!\n");
return -1;
+ }
script_argv[0] = SHELL_PATH;
@@ -345,6 +349,10 @@
newargv = (char **) malloc((p - lbuf + 1)
+ (i + sargc + 1) * sizeof(*newargv));
+ if (newargv == NULL) {
+ fprintf(stderr, "Ouch! Out of memory in hashbang()!\n");
+ return NULL;
+ }
ws = &((char *) newargv)[(i + sargc + 1) * sizeof(*newargv)];
/* Copy entries to allocated memory */
cvs commit: apache-1.3/src/os/win32 os.h
fielding99/03/07 05:13:56
Modified:src CHANGES
src/main http_core.c http_request.c
src/modules/standard mod_include.c mod_userdir.c
src/os/os2 os.h
src/os/win32 os.h
Log:
Replaced use of WIN32 define with HAVE_DRIVE_LETTERS to indicate
when the OS allows a DOS drive letter within pathnames.
Submitted by: Brian Havard <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision ChangesPath
1.1260+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1259
retrieving revision 1.1260
diff -u -r1.1259 -r1.1260
--- CHANGES 1999/03/04 19:28:38 1.1259
+++ CHANGES 1999/03/07 13:13:50 1.1260
@@ -1,5 +1,8 @@
Changes with Apache 1.3.5
+ *) Replaced use of WIN32 define with HAVE_DRIVE_LETTERS to indicate
+ when the OS allows a DOS drive letter within pathnames. [Brian Havard]
+
*) Add %V to mod_log_config, this logs the hostname according to the
UseCanonicalName setting (this is the pre-1.3.4 behaviour of
%v). Useful for mass vhosting. [Tony Finch <[EMAIL PROTECTED]>]
1.252 +1 -1 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- http_core.c 1999/02/24 09:33:37 1.251
+++ http_core.c 1999/03/07 13:13:52 1.252
@@ -348,7 +348,7 @@
* See directory_walk().
*/
-#if defined(OS2) || defined(WIN32)
+#ifdef HAVE_DRIVE_LETTERS
#define IS_SPECIAL(entry_core) \
((entry_core)->r != NULL \
|| ((entry_core)->d[0] != '/' && (entry_core)->d[1] != ':'))
1.145 +5 -5 apache-1.3/src/main/http_request.c
Index: http_request.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- http_request.c1999/01/09 21:37:56 1.144
+++ http_request.c1999/03/07 13:13:52 1.145
@@ -178,8 +178,8 @@
char *end = &path[strlen(path)];
char *last_cp = NULL;
int rv;
-#ifdef WIN32
-BOOL bStripSlash=TRUE;
+#ifdef HAVE_DRIVE_LETTERS
+char bStripSlash=1;
#endif
if (r->finfo.st_mode) {
@@ -187,12 +187,12 @@
return OK;
}
-#ifdef WIN32
+#ifdef HAVE_DRIVE_LETTERS
/* If the directory is x:\, then we don't want to strip
* the trailing slash since x: is not a valid directory.
*/
if (strlen(path) == 3 && path[1] == ':' && path[2] == '/')
-bStripSlash = FALSE;
+bStripSlash = 0;
/* If UNC name == //machine/share/, do not
@@ -211,7 +211,7 @@
}
if (iCount == 4)
-bStripSlash = FALSE;
+bStripSlash = 0;
}
if (bStripSlash)
1.111 +1 -1 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mod_include.c 1999/01/01 19:05:09 1.110
+++ mod_include.c 1999/03/07 13:13:54 1.111
@@ -628,7 +628,7 @@
*/
static int is_only_below(const char *path)
{
-#if WIN32
+#ifdef HAVE_DRIVE_LETTERS
if (path[1] == ':')
return 0;
#endif
1.39 +1 -1 apache-1.3/src/modules/standard/mod_userdir.c
Index: mod_userdir.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_userdir.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_userdir.c 1999/01/01 19:05:15 1.38
+++ mod_userdir.c 1999/03/07 13:13:54 1.39
@@ -262,7 +262,7 @@
if (userdir[0] == '\0' || ap_os_is_path_absolute(userdir)) {
if (x) {
-#ifdef WIN32
+#ifdef HAVE_DRIVE_LETTERS
/*
* Crummy hack. Need to figure out whether we have been
* redirected to a URL or to a file on some drive. Since I
1.12 +1 -0 apache-1.3/src/os/os2/os.h
Index: os.h
===
RCS file: /home/cvs/apache-1.3/src/os/os2/os.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
---
cvs commit: apache-1.3/src/test test_find.c test_parser.c
fielding99/02/11 08:24:12
Modified:src/main util.c
src/test test_parser.c
Added: src/test test_find.c
Log:
Replace the simple implementation of ap_find_list_item() with a
much more efficient but complex implementation.
Revision ChangesPath
1.152 +87 -10apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- util.c1999/02/10 13:36:50 1.151
+++ util.c1999/02/11 16:24:09 1.152
@@ -1132,24 +1132,101 @@
* an HTTP field value list. Returns 1 if found, 0 if not found.
* This would be much more efficient if we stored header fields as
* an array of list items as they are received instead of a plain string.
- * We could make it more efficient by duplicating the loop/switch above
- * within this function, replacing the assignments with compares.
*/
API_EXPORT(int) ap_find_list_item(pool *p, const char *line, const char *tok)
{
-const char *nxt;
-char *item;
+const unsigned char *pos;
+const unsigned char *ptr = (const unsigned char *)line;
+int good = 0, addspace = 0, in_qpair = 0, in_qstr = 0, in_com = 0;
if (!line || !tok)
return 0;
-nxt = line;
+do { /* loop for each item in line's list */
-while ((item = ap_get_list_item(p, &nxt)) != NULL) {
-if (strcmp(item, tok) == 0)
-return 1;
-}
-return 0;
+/* Find first non-comma, non-whitespace byte */
+
+while (*ptr == ',' || ap_isspace(*ptr))
+++ptr;
+
+if (*ptr)
+good = 1; /* until proven otherwise for this item */
+else
+break; /* no items left and nothing good found */
+
+/* We skip extra whitespace and any whitespace around a '=', '/',
+ * or ';' and lowercase normal characters not within a comment,
+ * quoted-string or quoted-pair.
+ */
+for (pos = (const unsigned char *)tok;
+ *ptr && (in_qpair || in_qstr || in_com || *ptr != ',');
+ ++ptr) {
+
+if (in_qpair) {
+in_qpair = 0;
+if (good)
+good = (*pos++ == *ptr);
+}
+else {
+switch (*ptr) {
+case '\\': in_qpair = 1;
+ if (addspace == 1)
+ good = good && (*pos++ == ' ');
+ good = good && (*pos++ == *ptr);
+ addspace = 0;
+ break;
+case '"' : if (!in_com)
+ in_qstr = !in_qstr;
+ if (addspace == 1)
+ good = good && (*pos++ == ' ');
+ good = good && (*pos++ == *ptr);
+ addspace = 0;
+ break;
+case '(' : if (!in_qstr)
+ ++in_com;
+ if (addspace == 1)
+ good = good && (*pos++ == ' ');
+ good = good && (*pos++ == *ptr);
+ addspace = 0;
+ break;
+case ')' : if (in_com)
+ --in_com;
+ good = good && (*pos++ == *ptr);
+ addspace = 0;
+ break;
+case ' ' :
+case '\t': if (addspace || !good)
+ break;
+ if (in_com || in_qstr)
+ good = (*pos++ == *ptr);
+ else
+ addspace = 1;
+ break;
+case '=' :
+case '/' :
+case ';' : if (!(in_com || in_qstr))
+ addspace = -1;
+ good = good && (*pos++ == *ptr);
+ break;
+default : if (!good)
+ break;
+ if (addspace == 1)
+ good = (*pos++
cvs commit: apache-1.3/src/test test_parser.c
fielding99/02/10 05:36:52
Modified:src/main util.c
src/test test_parser.c
Log:
Change ap_get_list_item to treat comments like a quoted string
rather than strip them. This corresponds to the expectation that
future HTTP fields will only use comments when they are useful.
Revision ChangesPath
1.151 +24 -28apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- util.c1999/02/09 16:57:24 1.150
+++ util.c1999/02/10 13:36:50 1.151
@@ -1039,10 +1039,10 @@
}
/* Retrieve an HTTP header field list item, as separated by a comma,
- * while stripping insignificant whitespace/comments and lowercasing anything
- * not in a quoted string. The return value is a new string containing
- * the converted list item (empty if it was all comments or NULL if none)
- * and the address of field is shifted to the next non-comma, non-whitespace.
+ * while stripping insignificant whitespace and lowercasing anything not in
+ * a quoted string or comment. The return value is a new string containing
+ * the converted list item (or NULL if none) and the address pointed to by
+ * field is shifted to the next non-comma, non-whitespace.
*/
API_EXPORT(char *) ap_get_list_item(pool *p, const char **field)
{
@@ -1061,9 +1061,9 @@
token = ap_palloc(p, tok_len + 1);
/* Scan the token again, but this time copy only the good bytes.
- * We skip extra whitespace and any whitespace around a '=' or ';',
- * strip comments, and lowercase normal characters not within a
- * quoted-string or quoted-pair. The result may be an empty string.
+ * We skip extra whitespace and any whitespace around a '=', '/',
+ * or ';' and lowercase normal characters not within a comment,
+ * quoted-string or quoted-pair.
*/
for (ptr = (const unsigned char *)tok_start, pos = (unsigned char
*)token;
*ptr && (in_qpair || in_qstr || in_com || *ptr != ',');
@@ -1071,57 +1071,53 @@
if (in_qpair) {
in_qpair = 0;
-if (!in_com)
-*pos++ = *ptr;
+*pos++ = *ptr;
}
else {
switch (*ptr) {
case '\\': in_qpair = 1;
- if (in_com)
- break;
if (addspace == 1)
*pos++ = ' ';
*pos++ = *ptr;
addspace = 0;
break;
-case '"' : if (in_com)
- break;
- in_qstr = !in_qstr;
+case '"' : if (!in_com)
+ in_qstr = !in_qstr;
if (addspace == 1)
*pos++ = ' ';
*pos++ = *ptr;
addspace = 0;
break;
-case '(' : if (in_qstr)
- *pos++ = *ptr;
- else
+case '(' : if (!in_qstr)
++in_com;
+ if (addspace == 1)
+ *pos++ = ' ';
+ *pos++ = *ptr;
+ addspace = 0;
break;
case ')' : if (in_com)
--in_com;
- else
- *pos++ = *ptr;
+ *pos++ = *ptr;
+ addspace = 0;
break;
case ' ' :
-case '\t': if (in_com || addspace)
+case '\t': if (addspace)
break;
- if (in_qstr)
+ if (in_com || in_qstr)
*pos++ = *ptr;
else
addspace = 1;
break;
case '=' :
-case ';' : if (in_com)
- break;
- if (!in_qstr)
+case '/' :
+case ';' : if (!(in_com || in_qstr))
addspace = -1;
cvs commit: apache-1.3/src/support ab.1 apachectl.1
fielding99/02/10 04:27:28
Modified:.Makefile.tmpl STATUS
src CHANGES
Removed: src/support ab.1 apachectl.1
Log:
Moved man pages for ab and apachectrl to section 8.
Submitted by: Wilfredo Sanchez, Roy Fielding
Reviewed by: Ralf S. Engelschall, Dirk-Willem van Gulik
Revision ChangesPath
1.65 +3 -3 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Makefile.tmpl 1999/02/10 12:09:33 1.64
+++ Makefile.tmpl 1999/02/10 12:27:22 1.65
@@ -312,7 +312,7 @@
install-support:
@echo "===> [support: Installing Apache support programs and scripts]"
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/ab $(root)$(sbindir)/ab
- $(INSTALL_DATA) $(TOP)/$(SRC)/support/ab.1 $(root)$(mandir)/man1/ab.1
+ $(INSTALL_DATA) $(TOP)/$(SRC)/support/ab.8 $(root)$(mandir)/man8/ab.8
@if [ ".$(TARGET)" = .httpd ]; then \
apachectl='apachectl'; \
else \
@@ -323,8 +323,8 @@
-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
< $(TOP)/$(SRC)/support/apachectl >
$(TOP)/$(SRC)/.apaci.install.tmp && \
$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp
$(root)$(sbindir)/$${apachectl}; \
- echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1
$(root)$(mandir)/man1/$${apachectl}.1"; \
- $(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1
$(root)$(mandir)/man1/$${apachectl}.1
+ echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/htpasswd
$(root)$(bindir)/htpasswd
$(INSTALL_DATA) $(TOP)/$(SRC)/support/htpasswd.1
$(root)$(mandir)/man1/htpasswd.1
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/htdigest
$(root)$(bindir)/htdigest
1.620 +1 -5 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.619
retrieving revision 1.620
diff -u -r1.619 -r1.620
--- STATUS1999/02/10 12:09:34 1.619
+++ STATUS1999/02/10 12:27:22 1.620
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/02/10 12:09:34 $]
+ Last modified at [$Date: 1999/02/10 12:27:22 $]
Release:
@@ -83,10 +83,6 @@
* Ralf's patch to fix append of target name to layout paths
Message-ID: <[EMAIL PROTECTED]>
Status: Ralf +1, Roy +1
-
-* Fred's PATCH: man page section numbers
-Message-ID: <[EMAIL PROTECTED]>
-Status: Ralf +1, Roy +1, Dirkx +1
* Fred's PATCH: Add cgidir, htdocsdir, iconsdir variables in
Makefile.tmpl
Message-ID: <[EMAIL PROTECTED]>
1.1248+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1247
retrieving revision 1.1248
diff -u -r1.1247 -r1.1248
--- CHANGES 1999/02/10 12:09:36 1.1247
+++ CHANGES 1999/02/10 12:27:25 1.1248
@@ -1,5 +1,8 @@
Changes with Apache 1.3.5
+ *) Moved man pages for ab and apachectrl to section 8.
+ [Wilfredo Sanchez, Roy Fielding]
+
*) Added -S option to install.sh so that options can be passed to
strip on some platforms. [Ralf S. Engelschall, Wilfredo Sanchez]
cvs commit: apache-1.3/src/helpers install.sh
fielding99/02/10 04:09:38
Modified:.Makefile.tmpl STATUS
src CHANGES
src/helpers install.sh
Log:
Added -S option to install.sh so that options can be passed to
strip on some platforms.
Submitted by: Ralf S. Engelschall, Wilfredo Sanchez
Reviewed by: Roy Fielding, Dirk-Willem van Gulik, Jim Jagielski
Revision ChangesPath
1.64 +19 -7 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Makefile.tmpl 1999/01/15 20:06:56 1.63
+++ Makefile.tmpl 1999/02/10 12:09:33 1.64
@@ -81,10 +81,16 @@
RM = rm -f
MKDIR = $(TOP)/$(AUX)/mkdir.sh
INSTALL = $(TOP)/$(AUX)/install.sh -c
-INSTALL_PROGRAM = $(INSTALL) -s -m 755
-INSTALL_DSO = $(INSTALL) -m 755
-INSTALL_SCRIPT = $(INSTALL) -m 755
-INSTALL_DATA= $(INSTALL) -m 644
+IFLAGS_PROGRAM = -m 755 -s
+IFLAGS_CORE = -m 755
+IFLAGS_DSO = -m 755
+IFLAGS_SCRIPT = -m 755
+IFLAGS_DATA = -m 644
+INSTALL_PROGRAM = $(INSTALL) $(IFLAGS_PROGRAM)
+INSTALL_CORE= $(INSTALL) $(IFLAGS_CORE)
+INSTALL_DSO = $(INSTALL) $(IFLAGS_DSO)
+INSTALL_SCRIPT = $(INSTALL) $(IFLAGS_SCRIPT)
+INSTALL_DATA= $(INSTALL) $(IFLAGS_DATA)
PERL= @PERL@
TAR = @TAR@
TAROPT = @TAROPT@
@@ -253,12 +259,18 @@
# shared object files.
install-programs:
@echo "===> [programs: Installing Apache $(TARGET) program and shared
objects]"
- $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET)
+ [EMAIL PROTECTED] [ ".`grep '^[ ]*AddModule.*mod_so\.o'
$(TOP)/$(SRC)/Configuration.apaci`" != . ]; then \
+ echo "$(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET)"; \
+ $(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
+ else \
+ echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET)"; \
+ $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
+ fi
[EMAIL PROTECTED] [ ".`grep 'SUBTARGET=target_shared'
$(TOP)/$(SRC)/Makefile`" != . ]; then \
SHLIB_SUFFIX_NAME="`grep '^SHLIB_SUFFIX_NAME='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`"; \
SHLIB_SUFFIX_LIST="`grep '^SHLIB_SUFFIX_LIST='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`"; \
- echo "$(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).ep
$(root)$(libexecdir)/lib$(TARGET).ep"; \
- $(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).ep
$(root)$(libexecdir)/lib$(TARGET).ep; \
+ echo "$(INSTALL_CORE) $(TOP)/$(SRC)/lib$(TARGET).ep
$(root)$(libexecdir)/lib$(TARGET).ep"; \
+ $(INSTALL_CORE) $(TOP)/$(SRC)/lib$(TARGET).ep
$(root)$(libexecdir)/lib$(TARGET).ep; \
echo "$(INSTALL_DSO)
$(TOP)/$(SRC)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}"; \
$(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}; \
if [ ".$${SHLIB_SUFFIX_LIST}" != . ]; then \
1.619 +1 -5 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -r1.618 -r1.619
--- STATUS1999/02/10 11:48:42 1.618
+++ STATUS1999/02/10 12:09:34 1.619
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/02/10 11:48:42 $]
+ Last modified at [$Date: 1999/02/10 12:09:34 $]
Release:
@@ -83,10 +83,6 @@
* Ralf's patch to fix append of target name to layout paths
Message-ID: <[EMAIL PROTECTED]>
Status: Ralf +1, Roy +1
-
-* Ralf's adjusted version of Fred's Add strip flags variables
-Message-ID: <[EMAIL PROTECTED]>
-Status: Ralf +1, Dirkx +1, Fred +1, Jim +1
* Fred's PATCH: man page section numbers
Message-ID: <[EMAIL PROTECTED]>
1.1247+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1246
retrieving revision 1.1247
diff -u -r1.1246 -r1.1247
--- CHANGES 1999/02/10 11:48:43 1.1246
+++ CHANGES 1999/02/10 12:09:36 1.1247
@@ -1,5 +1,8 @@
Changes with Apache 1.3.5
cvs commit: apache-1.3/src CHANGES Configure
fielding99/02/10 03:48:46 Modified:.STATUS src CHANGES Configure Log: Tweak modules Makefile generated by Configure so that it handles the test case of no modules being selected. Submitted by: [EMAIL PROTECTED] Reviewed by: Roy Fielding, Jim Jagielski Revision ChangesPath 1.618 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.617 retrieving revision 1.618 diff -u -r1.617 -r1.618 --- STATUS1999/02/09 20:20:22 1.617 +++ STATUS1999/02/10 11:48:42 1.618 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/02/09 20:20:22 $] + Last modified at [$Date: 1999/02/10 11:48:42 $] Release: @@ -52,10 +52,6 @@ Allows use of C-style backslash escapes in mod_log_config format strings MID: <[EMAIL PROTECTED]> Status: - -* [EMAIL PROTECTED]'s Configure(modules/Makefile) patch for no modules -MID: <[EMAIL PROTECTED]> -Status: Roy +1, Jim +1 * John Bley's [PATCH] malloc checks MID: <[EMAIL PROTECTED]> 1.1246+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1245 retrieving revision 1.1246 diff -u -r1.1245 -r1.1246 --- CHANGES 1999/02/09 20:20:25 1.1245 +++ CHANGES 1999/02/10 11:48:43 1.1246 @@ -1,5 +1,8 @@ Changes with Apache 1.3.5 + *) Tweak modules Makefile generated by Configure so that it handles + the test case of no modules being selected. [EMAIL PROTECTED] + *) Added a sectioning directive that allows the user to assign authentication control to any HTTP method that is *not* given in the argument list; i.e., the logical negation 1.330 +3 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- Configure 1999/02/07 23:26:49 1.329 +++ Configure 1999/02/10 11:48:44 1.330 @@ -1905,10 +1905,12 @@ default: all all clean distclean depend :: - @for i in \$(MODULES); do \\ + @for i in \$(MODULES) ""; do \\ + if [ "x\$\$i" != "x" ]; then \\ echo "===> \$(SDP)modules/\$\$i"; \\ (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\ echo "<=== \$(SDP)modules/\$\$i"; \\ + fi; \\ done EOF
cvs commit: apache-1.3/src/main http_core.c
fielding99/02/09 12:20:27 Modified:.STATUS htdocs/manual/mod core.html directives.html src CHANGES src/main http_core.c Log: Added a sectioning directive that allows the user to assign authentication control to any HTTP method that is *not* given in the argument list; i.e., the logical negation of the directive. This is particularly useful for controlling access on methods unknown to the Apache core, but perhaps known by some module or CGI script. Submitted by: Roy Fielding and Tony Finch <[EMAIL PROTECTED]> Revision ChangesPath 1.617 +1 -13 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.616 retrieving revision 1.617 diff -u -r1.616 -r1.617 --- STATUS1999/02/09 18:00:18 1.616 +++ STATUS1999/02/09 20:20:22 1.617 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/02/09 18:00:18 $] + Last modified at [$Date: 1999/02/09 20:20:22 $] Release: @@ -60,18 +60,6 @@ * John Bley's [PATCH] malloc checks MID: <[EMAIL PROTECTED]> Status: Jim -0 (maybe the messages could be more detailed?) - -* Tony Finch's [PATCH] -Message-ID: <[EMAIL PROTECTED]> -Status: Roy [looks good, but we might be able to do better by using - the same function as Limit and just checking cmd] - -* Dean's [PATCH] etag continued (take 2) - Adds strong comparison functions to other checks. -MID: <[EMAIL PROTECTED]> -Status: Roy needs to fix ap_find_opaque_token() because it doesn't -do the right HTTP parsing anyway, so this will probably be -folded in at the same time. * Cliff's [PATCH] 500 errors not giving error-notes (related to PR #3455) Message-ID: <[EMAIL PROTECTED]> 1.145 +32 -1 apache-1.3/htdocs/manual/mod/core.html Index: core.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/core.html,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- core.html 1999/02/06 11:00:57 1.144 +++ core.html 1999/02/09 20:20:23 1.145 @@ -49,6 +49,7 @@ KeepAlive KeepAliveTimeout <Limit> +<LimitExcept> LimitRequestBody LimitRequestFields LimitRequestFieldsize @@ -659,7 +660,8 @@ The directory sections typically occur in the access.conf file, but they may appear in any configuration file. <Directory> directives cannot -nest, and cannot appear in a <Limit> section. +nest, and cannot appear in a <Limit> or +<LimitExcept> section. See also: How Directory, @@ -1337,6 +1339,35 @@ If GET is used it will also restrict HEAD requests. If you wish to limit all methods, do not include any <Limit> directive at all. + + + +<LimitExcept> directive + +Syntax: + <LimitExcept method method ... > ... </LimitExcept> +Context: any +Status: core +Compatibility: Available in Apache 1.3.5 and later + +<LimitExcept> and </LimitExcept> are used to enclose a group of +access control directives which will then apply to any HTTP access method +not listed in the arguments; i.e., it is the opposite of a +<Limit> section and can be used to control both +standard and nonstandard/unrecognized methods. See the documentation for +<Limit> for more details. 1.55 +1 -0 apache-1.3/htdocs/manual/mod/directives.html Index: directives.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- directives.html 1999/02/06 11:00:57 1.54 +++ directives.html 1999/02/09 20:20:23 1.55 @@ -123,6 +123,7 @@ KeepAliveTimeout LanguagePriority <Limit> +<LimitExcept> LimitRequestBody LimitRequestFields LimitRequestFieldsize 1.1245+7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1244 retrieving revision 1.1245 diff -u -r1.1244 -r1.1245 --- CHANGES 1999/02/09 18:00:22 1.1244 +++ CHANGES 1999/02/09 20:20:25 1.1245 @@ -1,5 +1,12 @@ Changes with Apache 1.3.5 + *) Added a sectioning directive that allows + the user to assign authentication control to any HTTP method that + is *not* given in the argument list; i.e., the logical nega
cvs commit: apache-1.3/src Makefile_win32.txt Makefile_win32_debug.txt
fielding99/02/09 10:07:56 Modified:src Makefile_win32.txt Makefile_win32_debug.txt Log: Update the other two Win32 Makefiles for the htpasswd change. Revision ChangesPath 1.2 +3 -0 apache-1.3/src/Makefile_win32.txt Index: Makefile_win32.txt === RCS file: /home/cvs/apache-1.3/src/Makefile_win32.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile_win32.txt1999/01/05 07:09:02 1.1 +++ Makefile_win32.txt1999/02/09 18:07:55 1.2 @@ -33,6 +33,9 @@ cd ap nmake /nologo CFG="ap - Win32 Release" -f ap.mak cd .. + cd support + nmake /nologo CFG="htpasswd - Win32 Release" -f htpasswd.mak + cd .. cd main nmake /nologo CFG="gen_uri_delims - Win32 Release" -f gen_uri_delims.mak nmake /nologo CFG="gen_test_char - Win32 Release" -f gen_test_char.mak 1.2 +3 -0 apache-1.3/src/Makefile_win32_debug.txt Index: Makefile_win32_debug.txt === RCS file: /home/cvs/apache-1.3/src/Makefile_win32_debug.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile_win32_debug.txt 1999/01/05 07:09:02 1.1 +++ Makefile_win32_debug.txt 1999/02/09 18:07:56 1.2 @@ -33,6 +33,9 @@ cd ap nmake /nologo CFG="ap - Win32 Debug" -f ap.mak cd .. + cd support + nmake /nologo CFG="htpasswd - Win32 Debug" -f htpasswd.mak + cd .. cd main nmake /nologo CFG="gen_uri_delims - Win32 Debug" -f gen_uri_delims.mak nmake /nologo CFG="gen_test_char - Win32 Debug" -f gen_test_char.mak
cvs commit: apache-1.3/src/support apachectl
fielding99/02/09 10:00:37 Modified:.STATUS src CHANGES src/support apachectl Log: Prevent apachectl from complaining if the PIDFILE exists but does not contain a process id, as might occur if the server is being rapidly restarted. Submitted by: Wilfredo Sanchez <[EMAIL PROTECTED]> Reviewed by: Roy Fielding, Jim Jagielski Revision ChangesPath 1.616 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.615 retrieving revision 1.616 diff -u -r1.615 -r1.616 --- STATUS1999/02/09 17:17:01 1.615 +++ STATUS1999/02/09 18:00:18 1.616 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/02/09 17:17:01 $] + Last modified at [$Date: 1999/02/09 18:00:18 $] Release: @@ -65,10 +65,6 @@ Message-ID: <[EMAIL PROTECTED]> Status: Roy [looks good, but we might be able to do better by using the same function as Limit and just checking cmd] - -* Fred's Bug with graceful restarts? Ignore empty pid file -Message-ID: <[EMAIL PROTECTED]> -Status: Roy +1, Jim +1 * Dean's [PATCH] etag continued (take 2) Adds strong comparison functions to other checks. 1.1244+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1243 retrieving revision 1.1244 diff -u -r1.1243 -r1.1244 --- CHANGES 1999/02/09 17:17:04 1.1243 +++ CHANGES 1999/02/09 18:00:22 1.1244 @@ -1,5 +1,9 @@ Changes with Apache 1.3.5 + *) Prevent apachectl from complaining if the PIDFILE exists but + does not contain a process id, as might occur if the server is + being rapidly restarted. [Wilfredo Sanchez] + *) Win32: Add global symbols missing from ApacheCore.def. [Carl Olsen] *) Entity tag comparisons for If-Match and If-None-Match were not being 1.13 +1 -1 apache-1.3/src/support/apachectl Index: apachectl === RCS file: /home/cvs/apache-1.3/src/support/apachectl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- apachectl 1999/01/01 19:05:32 1.12 +++ apachectl 1999/02/09 18:00:34 1.13 @@ -50,7 +50,7 @@ # check for pidfile if [ -f $PIDFILE ] ; then PID=`cat $PIDFILE` - if kill -0 $PID; then + if [ ! "x$PID" = "x" ] && kill -0 $PID; then STATUS="httpd (pid $PID) running" RUNNING=1 else
cvs commit: apache-1.3/src ApacheCore.def CHANGES
fielding99/02/09 09:17:07 Modified:.STATUS src ApacheCore.def CHANGES Log: Add global symbols missing from ApacheCore.def. Submitted by: Carl Olsen <[EMAIL PROTECTED]> Reviewed by: Roy Fielding Revision ChangesPath 1.615 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.614 retrieving revision 1.615 diff -u -r1.614 -r1.615 --- STATUS1999/02/06 14:14:35 1.614 +++ STATUS1999/02/09 17:17:01 1.615 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/02/06 14:14:35 $] + Last modified at [$Date: 1999/02/09 17:17:01 $] Release: @@ -85,10 +85,6 @@ * Ralf's [PATCH] Shared Memory Pools Message-ID: <[EMAIL PROTECTED]> Status: Not sure if this is intended for 1.3.x or just feedback - -* Carl Olsen's [PATCH] Added function exports to ApacheCore.def -Message-ID: <[EMAIL PROTECTED]> -Status: Roy +1 [update before commit] * Fred's [PATCH: srm.conf and access.conf refer to httpd.conf Message-ID: <[EMAIL PROTECTED]> 1.12 +14 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ApacheCore.def1999/02/09 16:57:19 1.11 +++ ApacheCore.def1999/02/09 17:17:04 1.12 @@ -329,4 +329,18 @@ ap_validate_password @322 ap_size_list_item @323 ap_get_list_item @324 + ap_scoreboard_fname @325 + ap_pid_fname @326 + ap_excess_requests_per_child @327 + ap_threads_per_child @328 + ap_max_requests_per_child @329 + ap_daemons_to_start @330 + ap_daemons_min_free @331 + ap_daemons_max_free @332 + ap_daemons_limit @333 + ap_user_name @334 + ap_user_id @335 + ap_group_id @336 + ap_standalone @337 + ap_server_confname @338 1.1243+2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1242 retrieving revision 1.1243 diff -u -r1.1242 -r1.1243 --- CHANGES 1999/02/09 16:57:20 1.1242 +++ CHANGES 1999/02/09 17:17:04 1.1243 @@ -1,5 +1,7 @@ Changes with Apache 1.3.5 + *) Win32: Add global symbols missing from ApacheCore.def. [Carl Olsen] + *) Entity tag comparisons for If-Match and If-None-Match were not being performed correctly -- weak tags might cause false positives. Also, strong comparison wasn't properly enforced in all cases.
cvs commit: apache-1.3/src/support httpd.exp
fielding99/02/09 08:57:26 Modified:src ApacheCore.def CHANGES src/include ap_mmn.h httpd.h src/main http_protocol.c util.c src/support httpd.exp Log: Refix the entity tag comparisons for If-Range, If-Match and If-None-Match. Comparisons need to be case sensitive and in all but one case (cache update) need to be strong comparisons, taking into account the possibility that any of the current Etag or the one(s) received from the client may be weak. Changed name of ap_find_list_item() to ap_size_list_item() to be consistent with other find routines and added new (simple) ap_find_list_item(), whose implementation will eventually be replaced with something more efficient. PR: 2065, 3657 Submitted by: Roy Fielding, Ken Coar, Dean Gaudet Revision ChangesPath 1.11 +2 -2 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ApacheCore.def1999/02/08 15:12:15 1.10 +++ ApacheCore.def1999/02/09 16:57:19 1.11 @@ -324,9 +324,9 @@ ap_make_etag @317 ap_array_pstrcat @318 ap_os_is_filename_valid @319 - ap_find_opaque_token @320 + ap_find_list_item @320 ap_MD5Encode @321 ap_validate_password @322 - ap_find_list_item @323 + ap_size_list_item @323 ap_get_list_item @324 1.1242+11 -5 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1241 retrieving revision 1.1242 diff -u -r1.1241 -r1.1242 --- CHANGES 1999/02/09 16:38:07 1.1241 +++ CHANGES 1999/02/09 16:57:20 1.1242 @@ -1,16 +1,22 @@ Changes with Apache 1.3.5 + *) Entity tag comparisons for If-Match and If-None-Match were not being + performed correctly -- weak tags might cause false positives. Also, + strong comparison wasn't properly enforced in all cases. + [Roy Fielding, Ken Coar, Dean Gaudet] PR#2065, 3657 + *) OS/2: Supply OS/2 error code instead of errno on semaphore errors. [Brian Havard] *) Work around a bug in Lynx regarding its sending "Negotiate: trans" even though it doesn't understand TCN. [Koen Holtman, Roy Fielding] - *) Added ap_find_list_item() and ap_get_list_item() to util.c for parsing - an HTTP header field value to extract the next list item, taking into - account the possible presence of nested comments, quoted-pairs, - and quoted-strings. ap_get_list_item() also removes insignificant - whitespace and lowercases non-quoted tokens. [Roy Fielding] PR#2065 + *) Added ap_size_list_item(), ap_get_list_item(), and ap_find_list_item() + to util.c for parsing an HTTP header field value to extract the next + list item, taking into account the possible presence of nested comments, + quoted-pairs, and quoted-strings. ap_get_list_item() also removes + insignificant whitespace and lowercases non-quoted tokens. + [Roy Fielding] PR#2065 *) proxy: The various calls to ap_proxyerror() can return HTTP/1.1 status code different from 500. This allows the proxy to, e.g., return 1.28 +3 -2 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ap_mmn.h 1999/02/09 12:29:52 1.27 +++ ap_mmn.h 1999/02/09 16:57:22 1.28 @@ -207,7 +207,8 @@ * 19990108.1 - add ap_MD5Encode() for MD5 password handling. * 19990108.2 - add ap_validate_password() and change ap_MD5Encode() *to use a stronger algorithm. - * 19990108.3 - add ap_find_list_item() and ap_get_list_item() + * 19990108.4 - add ap_size_list_item(), ap_get_list_item(), and + *ap_find_list_item() */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */ @@ -215,7 +216,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 19990108 #endif -#define MODULE_MAGIC_NUMBER_MINOR 3 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 4 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ /* Useful for testing for features. */ 1.269 +3 -1 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/ap
cvs commit: apache-1.3/src CHANGES
fielding99/02/09 08:38:11 Modified:src CHANGES Log: Note the OS/2 change Revision ChangesPath 1.1241+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1240 retrieving revision 1.1241 diff -u -r1.1240 -r1.1241 --- CHANGES 1999/02/09 12:29:48 1.1240 +++ CHANGES 1999/02/09 16:38:07 1.1241 @@ -1,5 +1,8 @@ Changes with Apache 1.3.5 + *) OS/2: Supply OS/2 error code instead of errno on semaphore errors. + [Brian Havard] + *) Work around a bug in Lynx regarding its sending "Negotiate: trans" even though it doesn't understand TCN. [Koen Holtman, Roy Fielding]
cvs commit: apache-1.3/src/main gen_test_char.c http_protocol.c util.c
fielding99/02/09 04:30:05
Modified:src CHANGES
src/include ap_mmn.h httpd.h
src/main gen_test_char.c http_protocol.c util.c
Log:
Reverse prior commit of ap_find_opaque_token() so that it can be replaced
by a slightly different method using ap_get_list_item().
Revision ChangesPath
1.1240+0 -3 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1239
retrieving revision 1.1240
diff -u -r1.1239 -r1.1240
--- CHANGES 1999/02/08 15:12:16 1.1239
+++ CHANGES 1999/02/09 12:29:48 1.1240
@@ -65,9 +65,6 @@
the NDBM library looks like Berkeley-DB based.
[Ralf S. Engelschall] PR#3773
- *) Fix checking of ETags and other opaque 'tokens' by adding
- ap_find_opaque_token(). PR#2065, 3657 [Ken Coar]
-
*) Add ability to handle DES or MD5 authentication passwords.
[Ryan Bloom <[EMAIL PROTECTED]>]
1.27 +3 -6 apache-1.3/src/include/ap_mmn.h
Index: ap_mmn.h
===
RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ap_mmn.h 1999/02/08 15:12:18 1.26
+++ ap_mmn.h 1999/02/09 12:29:52 1.27
@@ -203,13 +203,10 @@
*scan_script_header -> ap_scan_script_header_err
* - reordered entries in request_rec that were waiting
*for a non-binary-compatible release.
- * 19990108.1 - add ap_find_opaque_token() for things like ETags
- * (1.3.5-dev) which can contain opaque quoted strings, and
- *ap_MD5Encode() for MD5 password handling.
+ * (1.3.5-dev)
+ * 19990108.1 - add ap_MD5Encode() for MD5 password handling.
* 19990108.2 - add ap_validate_password() and change
ap_MD5Encode()
- * (1.3.5-dev) to use a stronger algorithm (which is incompatible
- *with the one introduced [but not released] with
- *19990108-1).
+ *to use a stronger algorithm.
* 19990108.3 - add ap_find_list_item() and ap_get_list_item()
*/
1.268 +0 -2 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.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- httpd.h 1999/02/08 15:12:18 1.267
+++ httpd.h 1999/02/09 12:29:53 1.268
@@ -936,8 +936,6 @@
API_EXPORT(char *) ap_get_list_item(pool *p, const char **field);
API_EXPORT(char *) ap_get_token(pool *p, const char **accept_line, int
accept_white);
API_EXPORT(int) ap_find_token(pool *p, const char *line, const char *tok);
-API_EXPORT(int) ap_find_opaque_token(pool *p, const char *line,
- const char *tok);
API_EXPORT(int) ap_find_last_token(pool *p, const char *line, const char
*tok);
API_EXPORT(int) ap_is_url(const char *u);
1.6 +1 -9 apache-1.3/src/main/gen_test_char.c
Index: gen_test_char.c
===
RCS file: /home/cvs/apache-1.3/src/main/gen_test_char.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gen_test_char.c 1999/01/27 12:16:01 1.5
+++ gen_test_char.c 1999/02/09 12:29:56 1.6
@@ -8,7 +8,6 @@
#define T_ESCAPE_PATH_SEGMENT(0x02)
#define T_OS_ESCAPE_PATH (0x04)
#define T_HTTP_TOKEN_STOP(0x08)
-#define T_HTTP_OPAQUETOKEN_STOP (0x10)
int main(int argc, char *argv[])
{
@@ -21,15 +20,13 @@
"#define T_ESCAPE_PATH_SEGMENT (%u)\n"
"#define T_OS_ESCAPE_PATH(%u)\n"
"#define T_HTTP_TOKEN_STOP (%u)\n"
-"#define T_HTTP_OPAQUETOKEN_STOP (%u)\n"
"\n"
"static const unsigned char test_char_table[256] = {\n"
"0,",
T_ESCAPE_SHELL_CMD,
T_ESCAPE_PATH_SEGMENT,
T_OS_ESCAPE_PATH,
- T_HTTP_TOKEN_STOP,
- T_HTTP_OPAQUETOKEN_STOP);
+ T_HTTP_TOKEN_STOP);
/* we explicitly dealt with NUL above
* in case some strchr() do bogosity with it */
@@ -55,11 +52,6 @@
/* these are the "tspecials" from RFC2068 */
if (ap_iscntrl(c) || strchr(" \t()<>@,;:\\/[]?={}", c)) {
flags |= T_HTTP_TOKEN_STOP;
- }
-
- /* some tokens (like etags) are opaque strings; stop at the end */
- if (ap_iscntrl(c) || strchr(" ,", c)) {
- fla
cvs commit: apache-1.3/src/test test_parser.c
fielding99/02/08 07:12:22 Modified:src ApacheCore.def CHANGES src/include ap_mmn.h httpd.h src/main util.c src/modules/standard mod_negotiation.c src/support httpd.exp Added: src/test test_parser.c Log: Added ap_find_list_item() and ap_get_list_item() to util.c for parsing an HTTP header field value to extract the next list item, taking into account the possible presence of nested comments, quoted-pairs, and quoted-strings. ap_get_list_item() also removes insignificant whitespace and lowercases non-quoted tokens. Work around a bug in Lynx regarding its sending "Negotiate: trans" even though it doesn't understand TCN. PR: 2065 Revision ChangesPath 1.10 +2 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ApacheCore.def1999/02/03 16:22:27 1.9 +++ ApacheCore.def1999/02/08 15:12:15 1.10 @@ -327,4 +327,6 @@ ap_find_opaque_token @320 ap_MD5Encode @321 ap_validate_password @322 + ap_find_list_item @323 + ap_get_list_item @324 1.1239+9 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1238 retrieving revision 1.1239 diff -u -r1.1238 -r1.1239 --- CHANGES 1999/02/07 20:53:44 1.1238 +++ CHANGES 1999/02/08 15:12:16 1.1239 @@ -1,5 +1,14 @@ Changes with Apache 1.3.5 + *) Work around a bug in Lynx regarding its sending "Negotiate: trans" + even though it doesn't understand TCN. [Koen Holtman, Roy Fielding] + + *) Added ap_find_list_item() and ap_get_list_item() to util.c for parsing + an HTTP header field value to extract the next list item, taking into + account the possible presence of nested comments, quoted-pairs, + and quoted-strings. ap_get_list_item() also removes insignificant + whitespace and lowercases non-quoted tokens. [Roy Fielding] PR#2065 + *) proxy: The various calls to ap_proxyerror() can return HTTP/1.1 status code different from 500. This allows the proxy to, e.g., return "403 Forbidden" for ProxyBlock'ed URL's. [Martin Kraemer] 1.26 +4 -3 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ap_mmn.h 1999/02/03 16:22:31 1.25 +++ ap_mmn.h 1999/02/08 15:12:18 1.26 @@ -203,13 +203,14 @@ *scan_script_header -> ap_scan_script_header_err * - reordered entries in request_rec that were waiting *for a non-binary-compatible release. - * 19990108-1 - add ap_find_opaque_token() for things like ETags + * 19990108.1 - add ap_find_opaque_token() for things like ETags * (1.3.5-dev) which can contain opaque quoted strings, and *ap_MD5Encode() for MD5 password handling. - * 19990108-2 - add ap_validate_password() and change ap_MD5Encode() + * 19990108.2 - add ap_validate_password() and change ap_MD5Encode() * (1.3.5-dev) to use a stronger algorithm (which is incompatible *with the one introduced [but not released] with *19990108-1). + * 19990108.3 - add ap_find_list_item() and ap_get_list_item() */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */ @@ -217,7 +218,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 19990108 #endif -#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 3 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ /* Useful for testing for features. */ 1.267 +2 -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.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- httpd.h 1999/02/05 09:14:56 1.266 +++ httpd.h 1999/02/08 15:12:18 1.267 @@ -932,6 +932,8 @@ API_EXPORT(char *) ap_getword_conf(pool *p, const char **line); API_EXPORT(char *) ap_getword_conf_nc(pool *p, char **line); +API_EXPORT(const char *) ap_f
cvs commit: apache-1.3/src/modules/standard mod_negotiation.c
fielding99/02/06 06:36:27
Modified:src CHANGES
src/modules/standard mod_negotiation.c
Log:
Fix ordering of language variants for the case where the traditional
negotiation algorithm is being used with multiple language variants
and no Accept-Language is given.
PR: 3299, 3688
Submitted by: James Treacy <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding, Koen Holtman
Revision ChangesPath
1.1237+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1236
retrieving revision 1.1237
diff -u -r1.1236 -r1.1237
--- CHANGES 1999/02/06 11:58:43 1.1236
+++ CHANGES 1999/02/06 14:36:25 1.1237
@@ -1,5 +1,9 @@
Changes with Apache 1.3.5
+ *) Fix ordering of language variants for the case where the traditional
+ negotiation algorithm is being used with multiple language variants
+ and no Accept-Language. [James Treacy <[EMAIL PROTECTED]>] PR#3299, 3688
+
*) Do not round the TCN quality calculation to 5 decimal places,
unlike RFC 2296, because the calculation might need 12 decimal places
to get the right result. [Roy Fielding]
1.96 +4 -8 apache-1.3/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- mod_negotiation.c 1999/02/06 11:58:45 1.95
+++ mod_negotiation.c 1999/02/06 14:36:27 1.96
@@ -1884,17 +1884,13 @@
return 1;
}
-/* if language qualities were equal, try the LanguagePriority
- * stuff
- */
-/* XXX: TODO: there is a slight discrepancy between how this
- * behaves and how it described in the documentation
- */
-if (best->lang_index != -1 && variant->lang_index > best->lang_index) {
+/* if language qualities were equal, try the LanguagePriority stuff */
+if (best->lang_index != -1 &&
+(variant->lang_index == -1 || variant->lang_index >
best->lang_index)) {
return 0;
}
if (variant->lang_index != -1 &&
-(variant->lang_index < best->lang_index || best->lang_index == -1)) {
+(best->lang_index == -1 || variant->lang_index < best->lang_index)) {
*p_bestq = q;
return 1;
}
cvs commit: apache-1.3/htdocs/manual/mod mod_negotiation.html
fielding99/02/06 06:00:34 Modified:.STATUS htdocs/manual content-negotiation.html htdocs/manual/mod mod_negotiation.html Log: Update docs according to new negotiation ordering. Note that we still don't have any documentation of TCN/RVSA effects. Revision ChangesPath 1.613 +4 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.612 retrieving revision 1.613 diff -u -r1.612 -r1.613 --- STATUS1999/02/06 08:51:22 1.612 +++ STATUS1999/02/06 14:00:31 1.613 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/02/06 08:51:22 $] + Last modified at [$Date: 1999/02/06 14:00:31 $] Release: @@ -43,6 +43,9 @@ Documentation that needs writing: +* manual/content-negotiation.html lacks any information about the + TCN additions and when the RVSA algorithm is used. + Available Patches: * Tony Finch's [PATCH] mod_log_config: support for reliably parsable logs @@ -90,10 +93,6 @@ * Fred's [PATCH: srm.conf and access.conf refer to httpd.conf Message-ID: <[EMAIL PROTECTED]> Status: - -* Koen Holtman's [PATCH] mod_negotiation some loose ends -Message-ID: <[EMAIL PROTECTED]> -Status: Roy is looking at it. * Jun-ichiro itojun Hagino's [PATCH] IPv6 enable patch ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz 1.20 +92 -75apache-1.3/htdocs/manual/content-negotiation.html Index: content-negotiation.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/content-negotiation.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- content-negotiation.html 1998/12/04 17:37:06 1.19 +++ content-negotiation.html 1999/02/06 14:00:32 1.20 @@ -70,12 +70,17 @@ Accept-Language, Accept-Charset and Accept-Encoding request headers. -The terms used in content negotiation are: a resource is an -item which can be requested of a server, which might be selected as -the result of a content negotiation algorithm. If a resource is -available in several formats, these are called representations -or variants. The ways in which the variants for a particular -resource vary are called the dimensions of negotiation. +A resource is a conceptual entity identified by a URI +(RFC 2396). An HTTP server like Apache provides access to +representations of the resource(s) within its namespace, +with each representation in the form of a sequence of bytes with a +defined media type, character set, encoding, etc. Each resource may be +associated with zero, one, or more than one representation +at any given time. If multiple representations are available, +the resource is referred to as negotiable and each of its +representations is termed a variant. The ways in which the +variants for a negotiable resource vary are called the +dimensions of negotiation. Negotiation in Apache @@ -86,9 +91,9 @@ Using a type map (i.e., a *.var file) which - names the files containing the variants explicitly - Or using a 'MultiViews' search, where the server does an implicit - filename pattern match, and chooses from among the results. + names the files containing the variants explicitly, or + Using a 'MultiViews' search, where the server does an implicit + filename pattern match and chooses from among the results. Using a type-map file @@ -98,25 +103,25 @@ named type-map (or, for backwards-compatibility with older Apache configurations, the mime type application/x-type-map). Note that to use this feature, -you've got to have a SetHandler some place which defines a +you must have a handler set in the configuration that defines a file suffix as type-map; this is best done with a - + AddHandler type-map var - -in srm.conf. See comments in the sample config files for -details. +in the server configuration file. See the comments in the sample config +file for more details. + Type map files have an entry for each available variant; these entries -consist of contiguous RFC822-format header lines. Entries for +consist of contiguous HTTP-format header lines. Entries for different variants are separated by blank lines. Blank lines are illegal within an entry. It is conventional to begin a map file with an entry for the combined entity as a whole (although this is not required, and if present will be ignored). An example map file is: - + URI: foo URI: foo.en.html @@ -124,13 +129,14 @@
cvs commit: apache-1.3/src/modules/standard mod_negotiation.c
fielding99/02/06 03:58:46
Modified:src CHANGES
src/modules/standard mod_negotiation.c
Log:
Remove charset=ISO-8859-1 fiddle from the RVSA comparison, since RVSA
doesn't need such fiddles.
Submitted by: Koen Holtman
Reviewed by: Roy Fielding
Revision ChangesPath
1.1236+3 -2 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1235
retrieving revision 1.1236
diff -u -r1.1235 -r1.1236
--- CHANGES 1999/02/06 11:00:09 1.1235
+++ CHANGES 1999/02/06 11:58:43 1.1236
@@ -6,8 +6,9 @@
*) Remove unused code to disable transparent negotiation when
negotiating on encoding only, as we now handle encoding too
- (though this is nonstandard for TCN), and fix bugs in debugging
- statements within mod_negotiation. [Koen Holtman]
+ (though this is nonstandard for TCN), remove charset=ISO-8859-1
+ fiddle from the fiddle-averse RVSA comparison, and fix bugs in
+ some debugging statements within mod_negotiation. [Koen Holtman]
*) Fixed a rare memory corruption possibility in mod_dir if the index
file is negotiable and no acceptable variant can be found.
1.95 +2 -15 apache-1.3/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- mod_negotiation.c 1999/02/06 11:00:15 1.94
+++ mod_negotiation.c 1999/02/06 11:58:45 1.95
@@ -1556,7 +1556,7 @@
}
/* For a given variant, find the 'q' value of the charset given
- * on the Accept-Charset line. If not charsets are listed,
+ * on the Accept-Charset line. If no charsets are listed,
* assume value of '1'.
*/
static void set_charset_quality(negotiation_state *neg, var_rec *variant)
@@ -1805,19 +1805,6 @@
*p_bestq = q;
return 1;
}
-/* If the best variant's charset is ISO-8859-1 and this variant has
- * the same charset quality, then we prefer this variant
- */
-if (variant->charset_quality == best->charset_quality &&
-(variant->content_charset != NULL &&
- *variant->content_charset != '\0' &&
- strcmp(variant->content_charset, "iso-8859-1") != 0) &&
-(best->content_charset == NULL ||
- *best->content_charset == '\0' ||
- strcmp(best->content_charset, "iso-8859-1") == 0)) {
-*p_bestq = q;
-return 1;
-}
}
return 0;
}
@@ -1835,7 +1822,7 @@
/* For non-transparent negotiation, server can choose how
* to handle the negotiation. We'll use the following in
* order: content-type, language, content-type level, charset,
- * content length.
+ * content encoding, content length.
*
* For each check, we have three possible outcomes:
* This variant is worse than current best: return 0
cvs commit: apache-1.3/src/modules/standard mod_negotiation.c
fielding99/02/06 03:00:18
Modified:src CHANGES
src/modules/standard mod_negotiation.c
Log:
Explain why we do not round the TCN quality calculation to 5 decimal places,
unlike RFC 2296, because the calculation might need 12 decimal places
to get the right result.
Revision ChangesPath
1.1235+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1234
retrieving revision 1.1235
diff -u -r1.1234 -r1.1235
--- CHANGES 1999/02/06 09:58:02 1.1234
+++ CHANGES 1999/02/06 11:00:09 1.1235
@@ -1,5 +1,9 @@
Changes with Apache 1.3.5
+ *) Do not round the TCN quality calculation to 5 decimal places,
+ unlike RFC 2296, because the calculation might need 12 decimal places
+ to get the right result. [Roy Fielding]
+
*) Remove unused code to disable transparent negotiation when
negotiating on encoding only, as we now handle encoding too
(though this is nonstandard for TCN), and fix bugs in debugging
1.94 +8 -7 apache-1.3/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- mod_negotiation.c 1999/02/06 09:58:04 1.93
+++ mod_negotiation.c 1999/02/06 11:00:15 1.94
@@ -1763,13 +1763,14 @@
variant->charset_quality *
variant->lang_quality;
- /* Make sure that variants with a very low nonzero q value
-* do not get rounded down to 0
+ /* RFC 2296 calls for the result to be rounded to 5 decimal places,
+* but we don't do that because it serves no useful purpose other
+* than to ensure that a remote algorithm operates on the same
+* precision as ours. That is silly, since what we obviously want
+* is for the algorithm to operate on the best available precision
+* regardless of who runs it. Since the above calculation may
+* result in significant variance at 1e-12, rounding would be bogus.
*/
- if (q <= 0.0f)
- q = 0.0f;
- else if (q < 0.1f)
- q = 0.1f;
#ifdef NEG_DEBUG
fprintf(stderr, "Variant: file=%s type=%s lang=%s sourceq=%1.3f "
@@ -1789,7 +1790,7 @@
variant->definite);
#endif
-if (q == 0.0f) {
+if (q <= 0.0f) {
return 0;
}
if (q > bestq) {
cvs commit: apache-1.3/src/modules/standard mod_negotiation.c
fielding99/02/06 01:58:05
Modified:src CHANGES
src/modules/standard mod_negotiation.c
Log:
Remove unused code to disable transparent negotiation when
negotiating on encoding only, as we now handle encoding too
(though this is nonstandard for TCN), and fix bugs in debugging
statements within mod_negotiation.
Submitted by: Koen Holtman
Reviewed by: Roy Fielding
Revision ChangesPath
1.1234+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1233
retrieving revision 1.1234
diff -u -r1.1233 -r1.1234
--- CHANGES 1999/02/06 08:51:24 1.1233
+++ CHANGES 1999/02/06 09:58:02 1.1234
@@ -1,5 +1,10 @@
Changes with Apache 1.3.5
+ *) Remove unused code to disable transparent negotiation when
+ negotiating on encoding only, as we now handle encoding too
+ (though this is nonstandard for TCN), and fix bugs in debugging
+ statements within mod_negotiation. [Koen Holtman]
+
*) Fixed a rare memory corruption possibility in mod_dir if the index
file is negotiable and no acceptable variant can be found.
[Dean Gaudet, Roy Fielding, Martin Kraemer]
1.93 +20 -17apache-1.3/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- mod_negotiation.c 1999/01/03 12:04:38 1.92
+++ mod_negotiation.c 1999/02/06 09:58:04 1.93
@@ -585,7 +585,7 @@
*/
}
-#if NEG_DEBUG
+#ifdef NEG_DEBUG
fprintf(stderr, "dont_fiddle_headers=%d use_rvsa=%d ua_supports_trans=%d
"
"send_alternates=%d, may_choose=%d\n",
neg->dont_fiddle_headers, neg->use_rvsa,
@@ -1776,7 +1776,7 @@
"mimeq=%1.3f langq=%1.3f charq=%1.3f encq=%1.3f "
"q=%1.5f definite=%d\n",
(variant->file_name ? variant->file_name : ""),
-(variant->mime_name ? variant->mime_name : ""),
+(variant->mime_type ? variant->mime_type : ""),
(variant->content_languages
? ap_array_pstrcat(neg->pool, variant->content_languages, ',')
: ""),
@@ -1784,7 +1784,8 @@
variant->mime_type_quality,
variant->lang_quality,
variant->charset_quality,
-variant->encoding_qual q,
+variant->encoding_quality,
+q,
variant->definite);
#endif
@@ -1853,6 +1854,22 @@
* acceptable by type, charset, encoding or language.
*/
+#ifdef NEG_DEBUG
+fprintf(stderr, "Variant: file=%s type=%s lang=%s sourceq=%1.3f "
+ "mimeq=%1.3f langq=%1.3f langidx=%d charq=%1.3f encq=%1.3f \n",
+(variant->file_name ? variant->file_name : ""),
+(variant->mime_type ? variant->mime_type : ""),
+(variant->content_languages
+ ? ap_array_pstrcat(neg->pool, variant->content_languages, ',')
+ : ""),
+variant->source_quality,
+variant->mime_type_quality,
+variant->lang_quality,
+variant->lang_index,
+variant->charset_quality,
+variant->encoding_quality);
+#endif
+
if (variant->encoding_quality == 0.0f ||
variant->lang_quality == 0.0f ||
variant->source_quality == 0.0f ||
@@ -2437,7 +2454,6 @@
int alg_result; /* result of variant selection algorithm */
int res;
int j;
-int unencoded_variants = 0;
/* Decide if resource is transparently negotiable */
@@ -2465,20 +2481,7 @@
*/
if (strchr(variant->file_name, '/'))
neg->is_transparent = 0;
-
-if (!variant->content_encoding)
-unencoded_variants++;
}
-
-/* If there are less than 2 unencoded variants, we always
- * switch to server-driven negotiation, regardless of whether
- * we are contacted by a client capable of transparent
- * negotiation. We do this because our current TCN
- * implementation does not deal well with the case of having 0
- * or 1 unencoded variants.
- */
-if (unencoded_variants < 2)
-neg->is_transparent = 0;
}
if (neg->is_transparent) {
cvs commit: apache-1.3/src/modules/standard mod_dir.c
fielding99/02/06 00:51:27
Modified:.STATUS
src CHANGES
src/modules/standard mod_dir.c
Log:
Fix a rare memory corruption possibility in mod_dir if the index
file is negotiable and no acceptable variant can be found.
The alternative solutions of using a copy-over version of ap_overlay_tables
worked, but had other drawbacks, so we'll just keep it simple for now.
Submitted by: Dean Gaudet
Reviewed by: Roy Fielding, Martin Kraemer
Revision ChangesPath
1.612 +1 -15 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -r1.611 -r1.612
--- STATUS1999/02/06 08:18:45 1.611
+++ STATUS1999/02/06 08:51:22 1.612
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/02/06 08:18:45 $]
+ Last modified at [$Date: 1999/02/06 08:51:22 $]
Release:
@@ -94,20 +94,6 @@
* Koen Holtman's [PATCH] mod_negotiation some loose ends
Message-ID: <[EMAIL PROTECTED]>
Status: Roy is looking at it.
-
-* Core dump with Language Negotiation?!?
-
- o Roy's [PATCH] Adds ap_copyover_table()
-Message-ID: <[EMAIL PROTECTED]>
-Status: Roy +1, Dirkx +1
-
- o Martin and Dean's [PATCH] Adds copy semantics to ap_overlap_tables().
-Message-ID: <[EMAIL PROTECTED]>
-Status:
-
- o Dean's minimal [PATCH] Adds ap_pool_join()
-MID: <[EMAIL PROTECTED]>
-Status: Dean +1, Roy +1
* Jun-ichiro itojun Hagino's [PATCH] IPv6 enable patch
ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz
1.1233+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1232
retrieving revision 1.1233
diff -u -r1.1232 -r1.1233
--- CHANGES 1999/02/06 03:20:32 1.1232
+++ CHANGES 1999/02/06 08:51:24 1.1233
@@ -1,5 +1,9 @@
Changes with Apache 1.3.5
+ *) Fixed a rare memory corruption possibility in mod_dir if the index
+ file is negotiable and no acceptable variant can be found.
+ [Dean Gaudet, Roy Fielding, Martin Kraemer]
+
*) Win32: Add new config directive, ScriptInterpreterSource, to enable
searching the Win32 registry for script interpreters.
[Bill Stoddard]
1.54 +1 -1 apache-1.3/src/modules/standard/mod_dir.c
Index: mod_dir.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_dir.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mod_dir.c 1999/01/01 19:05:08 1.53
+++ mod_dir.c 1999/02/06 08:51:26 1.54
@@ -179,13 +179,13 @@
if (ap_is_HTTP_REDIRECT(rr->status) ||
(rr->status == HTTP_NOT_ACCEPTABLE && num_names == 1)) {
+ap_pool_join(r->pool, rr->pool);
error_notfound = rr->status;
r->notes = ap_overlay_tables(r->pool, r->notes, rr->notes);
r->headers_out = ap_overlay_tables(r->pool, r->headers_out,
rr->headers_out);
r->err_headers_out = ap_overlay_tables(r->pool,
r->err_headers_out,
rr->err_headers_out);
-ap_destroy_sub_req(rr);
return error_notfound;
}
cvs commit: apache-1.3 STATUS
fielding99/02/06 00:18:45 Modified:.STATUS Log: Back in action, minus a few billion bacteria Revision ChangesPath 1.611 +70 -9 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.610 retrieving revision 1.611 diff -u -r1.610 -r1.611 --- STATUS1999/02/03 16:22:25 1.610 +++ STATUS1999/02/06 08:18:45 1.611 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/02/03 16:22:25 $] + Last modified at [$Date: 1999/02/06 08:18:45 $] Release: @@ -11,7 +11,7 @@ 1.3.1: Tagged and rolled on July 19. Announced and released. 1.3.0: Tagged and rolled on June 1. Announced and released on the 6th. -2.0 : In pre-alpha development, see apache-2.0 repository +2.0 : In pre-alpha development, see apache-2.0 and apache-apr repository RELEASE SHOWSTOPPERS: @@ -45,10 +45,75 @@ Available Patches: -* Roy's [PATCH] Core dump with Language Negotiation?!? +* Tony Finch's [PATCH] mod_log_config: support for reliably parsable logs + Allows use of C-style backslash escapes in mod_log_config format strings +MID: <[EMAIL PROTECTED]> +Status: + +* [EMAIL PROTECTED]'s Configure(modules/Makefile) patch for no modules +MID: <[EMAIL PROTECTED]> +Status: Roy +1 + +* John Bley's [PATCH] malloc checks +MID: <[EMAIL PROTECTED]> +Status: + +* Tony Finch's [PATCH] +Message-ID: <[EMAIL PROTECTED]> +Status: Roy [looks good, but we might be able to do better by using + the same function as Limit and just checking cmd] + +* Fred's Bug with graceful restarts? Ignore empty pid file +Message-ID: <[EMAIL PROTECTED]> +Status: Roy +1 + +* Dean's [PATCH] etag continued (take 2) + Adds strong comparison functions to other checks. +MID: <[EMAIL PROTECTED]> +Status: Roy needs to fix ap_find_opaque_token() because it doesn't +do the right HTTP parsing anyway, so this will probably be +folded in at the same time. + +* Cliff's [PATCH] 500 errors not giving error-notes (related to PR #3455) +Message-ID: <[EMAIL PROTECTED]> +Status: Roy -1 [only because the strncmp may do a NULL compare, +easy to fix and then I'd +1] + +* Ralf's [PATCH] Shared Memory Pools +Message-ID: <[EMAIL PROTECTED]> +Status: Not sure if this is intended for 1.3.x or just feedback + +* Carl Olsen's [PATCH] Added function exports to ApacheCore.def +Message-ID: <[EMAIL PROTECTED]> +Status: Roy +1 [update before commit] + +* Fred's [PATCH: srm.conf and access.conf refer to httpd.conf +Message-ID: <[EMAIL PROTECTED]> +Status: + +* Koen Holtman's [PATCH] mod_negotiation some loose ends +Message-ID: <[EMAIL PROTECTED]> +Status: Roy is looking at it. + +* Core dump with Language Negotiation?!? + + o Roy's [PATCH] Adds ap_copyover_table() Message-ID: <[EMAIL PROTECTED]> -Status: Roy +1 Dirkx +1 +Status: Roy +1, Dirkx +1 + + o Martin and Dean's [PATCH] Adds copy semantics to ap_overlap_tables(). +Message-ID: <[EMAIL PROTECTED]> +Status: + o Dean's minimal [PATCH] Adds ap_pool_join() +MID: <[EMAIL PROTECTED]> +Status: Dean +1, Roy +1 + +* Jun-ichiro itojun Hagino's [PATCH] IPv6 enable patch + ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz +Message-ID: <[EMAIL PROTECTED]> +Status: + * Tony Finch's [PATCH] to mod_log_config.c to get both the 1.3.3 behaviour of %v and the 1.3.4 behaviour as %V. Message-ID: <[EMAIL PROTECTED]> @@ -60,11 +125,7 @@ * Ralf's adjusted version of Fred's Add strip flags variables Message-ID: <[EMAIL PROTECTED]> -Status: Ralf +1 Dirkx +1 - -* Fred's PATCH: Add strip flags variables in Makefile.tmpl -Message-ID: <[EMAIL PROTECTED]> -Status: Ralf -0 (see above replacement) +Status: Ralf +1, Dirkx +1, Fred +1 * Fred's PATCH: man page section numbers Message-ID: <[EMAIL PROTECTED]>
cvs commit: apache-1.3 STATUS
fielding99/01/18 06:33:50 Modified:.STATUS Log: shed some light on this foggy morn Revision ChangesPath 1.605 +34 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.604 retrieving revision 1.605 diff -u -r1.604 -r1.605 --- STATUS1999/01/14 17:21:39 1.604 +++ STATUS1999/01/18 14:33:49 1.605 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/01/14 17:21:39 $] + Last modified at [$Date: 1999/01/18 14:33:49 $] Release: @@ -49,6 +49,39 @@ vhost-xxx.html document out of it. -- rse Available Patches: + +* Roy's [PATCH] Core dump with Language Negotiation?!? +Message-ID: <[EMAIL PROTECTED]> +Status: Roy +1 + +* Tony Finch's [PATCH] to mod_log_config.c to get both the 1.3.3 + behaviour of %v and the 1.3.4 behaviour as %V. +Message-ID: <[EMAIL PROTECTED]> +Status: + +* Ralf's patch to fix append of target name to layout paths +Message-ID: <[EMAIL PROTECTED]> +Status: Ralf +1, Roy +1 + +* Ralf's adjusted version of Fred's Add strip flags variables +Message-ID: <[EMAIL PROTECTED]> +Status: Ralf +1 + +* Fred's PATCH: Add strip flags variables in Makefile.tmpl +Message-ID: <[EMAIL PROTECTED]> +Status: Ralf -0 (see above replacement) + +* Fred's PATCH: man page section numbers +Message-ID: <[EMAIL PROTECTED]> +Status: Ralf +1, Roy +1 + +* Fred's PATCH: Add cgidir, htdocsdir, iconsdir variables in Makefile.tmpl +Message-ID: <[EMAIL PROTECTED]> +Status: Ralf +1 (on concept) + +* Fred's PATCH: Add Mac OS X Server Layout file layout +Message-ID: <[EMAIL PROTECTED]> +Status: Roy +1 * Jim Patterson's patch to make mod_info work on Win32 Message-ID: PR#1442
cvs commit: apache-1.3 INSTALL README.configure
fielding99/01/13 16:41:35 Modified:.INSTALL README.configure Log: Space-separated caps upset people who use speech output devices. Revision ChangesPath 1.51 +1 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /home/cvs/apache-1.3/INSTALL,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- INSTALL 1998/12/14 07:56:37 1.50 +++ INSTALL 1999/01/14 00:41:34 1.51 @@ -1,5 +1,5 @@ - A P A C H E I N S T A L L A T I O N + APACHE INSTALLATION NOTE: Windows users please read the documents README.NT and http://www.apache.org/docs/windows.html, (or the 1.16 +1 -1 apache-1.3/README.configure Index: README.configure === RCS file: /home/cvs/apache-1.3/README.configure,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- README.configure 1998/11/08 21:24:01 1.15 +++ README.configure 1999/01/14 00:41:34 1.16 @@ -1,5 +1,5 @@ - A P A C H E C O N F I G U R A T I O N + APACHE CONFIGURATION Apache 1.3 Autoconf-style Interface (APACI) ===
cvs commit: apache-1.3 STATUS
fielding99/01/12 22:55:21 Modified:.STATUS Log: bombs away Revision ChangesPath 1.602 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.601 retrieving revision 1.602 diff -u -r1.601 -r1.602 --- STATUS1999/01/12 04:47:49 1.601 +++ STATUS1999/01/13 06:55:21 1.602 @@ -1,11 +1,11 @@ 1.3 STATUS: - Last modified at [$Date: 1999/01/12 04:47:49 $] + Last modified at [$Date: 1999/01/13 06:55:21 $] Release: 1.3.5-dev: current. -1.3.4: Tagged and rolled on Jan. 9. Released on 11th. +1.3.4: Tagged and rolled on Jan. 9. Released on 11th, announced on 12th. 1.3.3: Tagged and rolled on Oct. 7. Released on 9th, announced on 10th. 1.3.2: Tagged and rolled on Sep. 21. Announced and released on 23rd. 1.3.1: Tagged and rolled on July 19. Announced and released.
cvs commit: apache-1.3 STATUS
fielding99/01/11 20:47:50 Modified:.STATUS Log: 1.3.4 released. I'll announce it tomorrow night, once the mirrors get a chance to update. I suggest we wait a week before cleaning out the old distribution files, so that the mirrors don't have to deal with a big change during a high load. Revision ChangesPath 1.601 +2 -18 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.600 retrieving revision 1.601 diff -u -r1.600 -r1.601 --- STATUS1999/01/11 05:55:56 1.600 +++ STATUS1999/01/12 04:47:49 1.601 @@ -1,27 +1,11 @@ 1.3 STATUS: - Last modified at [$Date: 1999/01/11 05:55:56 $] + Last modified at [$Date: 1999/01/12 04:47:49 $] Release: 1.3.5-dev: current. -1.3.4: Tagged and rolled on Jan. 9. Release planned for Monday, 11th. - NEED signature(s) on tarballs - Tarball Tested Platforms: - AIX 4.3 - A/UX 3.1.1 - BS2000 - Cobalt Linux 3.0 (mips) - Digital Unix 4.0a - FreeBSD 2.2.7-R - IRIX 6.2 - OS/2 - RedHat Linux 5.1, 4.2 - ReliantUNIX - Solaris 2.5.1, 2.6 - Windows 95 - Windows NT 4.0 SP4 - +1.3.4: Tagged and rolled on Jan. 9. Released on 11th. 1.3.3: Tagged and rolled on Oct. 7. Released on 9th, announced on 10th. 1.3.2: Tagged and rolled on Sep. 21. Announced and released on 23rd. 1.3.1: Tagged and rolled on July 19. Announced and released.
cvs commit: apache-site/dist .htaccess Announcement.html Announcement.txt HEADER.html README.html
fielding99/01/11 20:34:15 Modified:.index.html search.html dist .htaccess Announcement.html Announcement.txt HEADER.html README.html Log: Release 1.3.4 Revision ChangesPath 1.73 +9 -24 apache-site/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/index.html,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- index.html1998/11/13 16:36:46 1.72 +++ index.html1999/01/12 04:34:12 1.73 @@ -54,16 +54,16 @@ -Apache 1.3.3 Now Available +Apache 1.3.4 Now Available The Apache Group is pleased to announce the release of the - 1.3.3 version of the Apache HTTP server, including a Win32 build. - Apache 1.3.3 is the most stable version of Apache currently available; - everyone running 1.2.X servers or earlier should upgrade to 1.3, as we - will stop providing support for the 1.2.X tree, though we may make a - release of 1.2.7. At present, the Win32 port of Apache is not + 1.3.4 version of the Apache HTTP server, including a Win32 build. + Apache 1.3.4 is the best version of Apache currently available; + everyone running 1.2.X servers or earlier should upgrade to 1.3, as there + will not be any further 1.2.X releases. + At present, the Win32 port of Apache is not as stable as the UNIX version. Further releases of the 1.3.x tree will bring the Win32 port closer to parity. @@ -77,30 +77,15 @@ -Apache 1.2.6 - - - -Apache 1.2.6 is also available. This is a maintenance release, with -numerous bug fixes from 1.2.5, including a several HTTP/1.1 protocol -fixes necessary for correct interoperation with new clients. The 1.2 -series has been well tested and is a stable platform; however, all -active development is now being done on the 1.3 series of the server. -You can get 1.2.6 from the download directory. - - - - - The Number One HTTP Server On The Internet Apache has been the most popular web server on the Internet since -April of 1996. The November 1998 WWW server http://www.netcraft.com/Survey/";>site survey by Netcraft +April of 1996. The January 1999 WWW server http://www.netcraft.com/survey/";>site survey by Netcraft found that over 53% of the web sites on the Internet are using Apache -(57% if Apache derivatives are included), thus making it more widely +(58% if Apache derivatives are included), thus making it more widely used than all other web servers combined. 1.3 +1 -0 apache-site/search.html Index: search.html === RCS file: /export/home/cvs/apache-site/search.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- search.html 1998/06/07 16:27:40 1.2 +++ search.html 1999/01/12 04:34:12 1.3 @@ -47,6 +47,7 @@ Developers Site Source Bugtraq + Mod_perl 1.18 +4 -1 apache-site/dist/.htaccess Index: .htaccess === RCS file: /export/home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .htaccess 1998/10/13 06:49:50 1.17 +++ .htaccess 1999/01/12 04:34:13 1.18 @@ -10,11 +10,14 @@ 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.exe +AddDescription "1.3.4 compressed source" apache_1.3.4.tar.Z +AddDescription "1.3.4 gzipped source" apache_1.3.4.tar.gz +AddDescription "1.3.4 Win32 binary" apache_1_3_4.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 AddDescription "PGP signature" *.asc -AddDescription "Apache 1.3.3 Released" Announcement.txt +AddDescription "Apache 1.3.4 Released" Announcement.txt AddDescription "Binary distributions" /export/pub/apache/dist/binaries AddDescription "Contributed software" /export/pub/apache/dist/contrib AddDescription "Old source & binaries" /export/pub/apache/dist/old 1.13 +31 -22apache-site/dist/Announcement.html Index: Announcement.html === RCS file: /export/home/cvs/apache-site/dist/Announcement.html,v retrieving revision 1.12 retrieving revision 1.13 diff
cvs commit: apache-1.3 STATUS
fielding99/01/10 21:55:57 Modified:.STATUS Log: Looking good. I retagged apache.iwz, as requested. Revision ChangesPath 1.600 +14 -4 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.599 retrieving revision 1.600 diff -u -r1.599 -r1.600 --- STATUS1999/01/10 15:12:04 1.599 +++ STATUS1999/01/11 05:55:56 1.600 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/01/10 15:12:04 $] + Last modified at [$Date: 1999/01/11 05:55:56 $] Release: @@ -7,8 +7,20 @@ 1.3.4: Tagged and rolled on Jan. 9. Release planned for Monday, 11th. NEED signature(s) on tarballs - NEED binary and installation for Win32 Tarball Tested Platforms: + AIX 4.3 + A/UX 3.1.1 + BS2000 + Cobalt Linux 3.0 (mips) + Digital Unix 4.0a + FreeBSD 2.2.7-R + IRIX 6.2 + OS/2 + RedHat Linux 5.1, 4.2 + ReliantUNIX + Solaris 2.5.1, 2.6 + Windows 95 + Windows NT 4.0 SP4 1.3.3: Tagged and rolled on Oct. 7. Released on 9th, announced on 10th. 1.3.2: Tagged and rolled on Sep. 21. Announced and released on 23rd. @@ -20,8 +32,6 @@ RELEASE SHOWSTOPPERS: RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: - -* Update the Win32 install script * Randy's proposed changes for binbuild:
cvs commit: apache-devsite how-to-release.html
fielding99/01/10 00:21:01
Modified:.how-to-release.html
Log:
typo
Revision ChangesPath
1.54 +1 -1 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- how-to-release.html 1999/01/10 08:15:51 1.53
+++ how-to-release.html 1999/01/10 08:21:00 1.54
@@ -137,7 +137,7 @@
from ``Apache/1.X.Y-dev'' to
``Apache/1.X.Y''. Then also change
APACHE_RELEASE in the same file from
- ``1XXYYZZ000'' to
``1XXYY100''.
+ ``1XXYY000'' to
``1XXYY100''.
The format is something like
printf("%d%02d%02d%d%02d", major, minor, bugfix, final,
beta). Also update the Windows registry key:
cvs commit: apache-devsite how-to-release.html
fielding99/01/10 00:15:52
Modified:.how-to-release.html
Log:
Update to new APACHE_RELEASE format.
Revision ChangesPath
1.53 +4 -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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- how-to-release.html 1998/10/10 10:58:07 1.52
+++ how-to-release.html 1999/01/10 08:15:51 1.53
@@ -137,10 +137,10 @@
from ``Apache/1.X.Y-dev'' to
``Apache/1.X.Y''. Then also change
APACHE_RELEASE in the same file from
- ``1XXYYZZ'' to
``1XXYY99''.
+ ``1XXYYZZ000'' to
``1XXYY100''.
The format is something like
- printf("%d%02d%02d%02d", major, minor, bugfix,
- betaseq). Also update the Windows registry key:
+ printf("%d%02d%02d%d%02d", major, minor, bugfix, final,
+ beta). Also update the Windows registry key:
edit src/os/win32/registry.c and change the
VERSION from "1.X.Y dev" to the
string "1.X.Y".
@@ -256,7 +256,7 @@
Change SERVER_VERSION in src/include/httpd.h
from ``Apache/1.X.Y'' to
``Apache/1.X.(Y+1)-dev'' and change
- APACHE_RELEASE to 1XX(YY+1)01.
+ APACHE_RELEASE to 1XX(YY+1)000.
In the VERSION macro in
src/os/win32/registry.c, increase the version
number and re-insert the `` dev'' suffix (change the string
cvs commit: apache-1.3/src/os/win32 registry.c
fielding99/01/09 23:49:00
Modified:.STATUS
src CHANGES Configure
src/include httpd.h
src/os/win32 registry.c
Log:
Bump all of the version numbers to 1.3.5-dev
Revision ChangesPath
1.598 +7 -4 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -r1.597 -r1.598
--- STATUS1999/01/10 06:45:33 1.597
+++ STATUS1999/01/10 07:48:55 1.598
@@ -1,11 +1,14 @@
1.3 STATUS:
- Last modified at [$Date: 1999/01/10 06:45:33 $]
+ Last modified at [$Date: 1999/01/10 07:48:55 $]
Release:
-1.3.4: current.
- Tarball planned for Saturday afternoon PST, Roy is RM
- Release planned for Monday, January 11.
+1.3.5-dev: current.
+
+1.3.4: Tagged and rolled on Jan. 9. Release planned for Monday, 11th.
+ NEED signature(s) on tarballs
+ NEED binary and installation for Win32
+ Tarball Tested Platforms:
1.3.3: Tagged and rolled on Oct. 7. Released on 9th, announced on 10th.
1.3.2: Tagged and rolled on Sep. 21. Announced and released on 23rd.
1.1211+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1210
retrieving revision 1.1211
diff -u -r1.1210 -r1.1211
--- CHANGES 1999/01/10 05:55:01 1.1210
+++ CHANGES 1999/01/10 07:48:57 1.1211
@@ -1,3 +1,5 @@
+Changes with Apache 1.3.5
+
Changes with Apache 1.3.4
*) Renamed macros status_drops_connection to ap_status_drops_connection
1.322 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- Configure 1999/01/09 14:24:51 1.321
+++ Configure 1999/01/10 07:48:57 1.322
@@ -1565,7 +1565,7 @@
#select the special subtarget for shared core generation
SUBTARGET=target_shared
#determine additional suffixes for libhttpd.so
- V=1 R=3 P=4
+ V=1 R=3 P=5
if [ "$SHLIB_SUFFIX_DEPTH" = "0" ]; then
SHLIB_SUFFIX_LIST=""
fi
1.264 +2 -2 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.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- httpd.h 1999/01/10 06:45:35 1.263
+++ httpd.h 1999/01/10 07:48:59 1.264
@@ -415,7 +415,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.4" /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.5-dev"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -431,7 +431,7 @@
* Always increases along the same track as the source branch.
* For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'.
*/
-#define APACHE_RELEASE 10304100
+#define APACHE_RELEASE 10305000
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.14 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- registry.c1999/01/10 06:45:37 1.13
+++ registry.c1999/01/10 07:49:00 1.14
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.4"
+#define VERSION "1.3.5 dev"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
fielding99/01/09 22:45:38
Modified:.STATUS
src/include httpd.h
src/os/win32 registry.c
Log:
Ready to roll 1.3.4. Update to new APACHE_RELEASE definition.
Revision ChangesPath
1.597 +2 -15 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- STATUS1999/01/08 22:37:02 1.596
+++ STATUS1999/01/10 06:45:33 1.597
@@ -1,9 +1,9 @@
1.3 STATUS:
- Last modified at [$Date: 1999/01/08 22:37:02 $]
+ Last modified at [$Date: 1999/01/10 06:45:33 $]
Release:
-1.3.4-dev: current.
+1.3.4: current.
Tarball planned for Saturday afternoon PST, Roy is RM
Release planned for Monday, January 11.
@@ -45,8 +45,6 @@
Documentation that needs writing:
-* Document compilation on Win95 and NT
-
* Need a document explaining mod_rewrite/"UseCanonicalName off" based
virtualhosting. (If it exists already I can't find it easily.)
=> It still doesn't exists but I've already assembled the relevant
@@ -163,17 +161,6 @@
* Official retirement of 1.2; when? Ken suggests as of 1.3.4.
Status: Ken +1
-
-* Redefine APACHE_RELEASE. Add another 'bit' to signify whether
- it's a beta or final release. Maybe 'MMNNFFRBB' which means:
-MM: Major release #
- NN: Minor release #
- FF: "fix" level
- R: 0 if beta, 1 if final release
- BB: beta number
-
- See: <[EMAIL PROTECTED]>
- Status: Jim +1, Ben +1, Martin +1, Ralf +1
* Someone other than Dean has to do a security/correctness review on
psprintf(), bprintf(), and ap_snprintf(). In particular these routines
1.263 +4 -5 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.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- httpd.h 1999/01/09 00:21:33 1.262
+++ httpd.h 1999/01/10 06:45:35 1.263
@@ -415,7 +415,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.4-dev" /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.4" /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -427,12 +427,11 @@
API_EXPORT(void) ap_add_version_component(const char *component);
API_EXPORT(const char *) ap_get_server_built(void);
-/* Numeric release version identifier: major minor bugfix betaseq
+/* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
* Always increases along the same track as the source branch.
- * For a final release, 'betaseq' should be set to '99'.
- * For example, Apache 1.4.2 should be '1040299'
+ * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'.
*/
-#define APACHE_RELEASE 1030401
+#define APACHE_RELEASE 10304100
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.13 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- registry.c1998/10/07 10:18:18 1.12
+++ registry.c1999/01/10 06:45:37 1.13
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.4 dev"
+#define VERSION "1.3.4"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/htdocs/manual new_features_1_3.html
fielding99/01/09 22:20:49 Modified:htdocs/manual new_features_1_3.html Log: Update for 1.3.4 Revision ChangesPath 1.77 +12 -2 apache-1.3/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- new_features_1_3.html 1999/01/05 23:10:47 1.76 +++ new_features_1_3.html 1999/01/10 06:20:49 1.77 @@ -126,7 +126,7 @@ Unified Server Configuration Files -As of the release following Apache 1.3.3, the contents of the three +(Apache 1.3.4) The contents of the three server configuration files (httpd.conf, srm.conf, and access.conf) have been merged into a single httpd.conf file. @@ -153,7 +153,10 @@ src/Configure stuff in batch and additionally installs the package with a GNU-conforming directory layout. Any options from the old configuration scheme are available plus a lot -of new options for flexibly customizing Apache. +of new options for flexibly customizing Apache. +Note: The default installation layout has changed +for Apache 1.3.4. See the files README.configure and +INSTALL for more information. APache eXtenSion (APXS) support tool Now that Apache provides full support for loading modules under @@ -205,6 +208,13 @@ Module Enhancements +Improved mod_negotiation + +The optional content negotiation (MultiViews) module has been completely +overhauled for Apache 1.3.4, incorporating the latest HTTP/1.1 +revisions and the experimental Transparent Content Negotion features +of RFC 2295 and RFC 2296. + NEW - Spelling correction module This optional module corrects frequently occurring spelling and
cvs commit: apache-1.3/src CHANGES
fielding99/01/09 21:55:02 Modified:src CHANGES Log: Remove misleading part of entry due to later change. Revision ChangesPath 1.1210+1 -4 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1209 retrieving revision 1.1210 diff -u -r1.1209 -r1.1210 --- CHANGES 1999/01/08 23:46:39 1.1209 +++ CHANGES 1999/01/10 05:55:01 1.1210 @@ -271,10 +271,7 @@ procedure of mod_rewrite: very long keys were truncated. [Ralf S. Engelschall] - *) There is no longer a _default_ path layout for APACI configure. - This means the user _HAS_ to specifiy a path layout _explicitly_. - - Added a generic --with-layout=[FILE:]ID option. ID here is a layout + *) Added a generic --with-layout=[FILE:]ID option. ID here is a layout identifier, currently "Apache" and "GNU" are pre-defined in the file config.layout. Custom layouts are possible by using FILE:ID as the argument where the layout ID is taken from FILE.
