cvs commit: apachen/src/test - New directory
fielding97/11/03 18:40:51 apachen/src/test - New directory
cvs commit: apachen/src/main conf.h
fielding97/11/05 18:57:24 Modified:src/main conf.h Log: USE_PTHREAD_SERIALIZED_ACCEPT results in locking problems when the child that has the current lock gets killed by the parent. Restore USE_FCNTL_SERIALIZED_ACCEPT as the default for Solaris2, at least until we get one of the other locking mechanisms to work reliably. Reviewed by: Dean Gaudet Revision ChangesPath 1.152 +2 -5 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- conf.h1997/11/05 12:48:15 1.151 +++ conf.h1997/11/06 02:57:23 1.152 @@ -124,12 +124,9 @@ #undef NO_SETSID #define HAVE_SYS_RESOURCE_H #define bzero(a,b) memset(a,0,b) -/*#define USE_FCNTL_SERIALIZED_ACCEPT */ -/*#define USE_SYSVSEM_SERIALIZED_ACCEPT */ -#if SOLARIS2 250 +#if !defined(USE_SYSVSEM_SERIALIZED_ACCEPT) \ +!defined(USE_PTHREAD_SERIALIZED_ACCEPT) #define USE_FCNTL_SERIALIZED_ACCEPT -#else -#define USE_PTHREAD_SERIALIZED_ACCEPT #endif #define NEED_UNION_SEMUN #define HAVE_MMAP
cvs commit: apachen/src CHANGES
fielding97/11/05 19:03:10 Modified:src CHANGES Log: Document change to USE_FCNTL_SERIALIZED_ACCEPT on Solaris2. Revision ChangesPath 1.487 +6 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.486 retrieving revision 1.487 diff -u -r1.486 -r1.487 --- CHANGES 1997/11/05 12:48:11 1.486 +++ CHANGES 1997/11/06 03:03:08 1.487 @@ -1,5 +1,11 @@ Changes with Apache 1.3b3 + *) Restored USE_FCNTL_SERIALIZED_ACCEPT as the default for Solaris2, + since the PTHREAD mechanism was losing locks on Solaris 2.5.0. + You can now set -DUSE_SYSVSEM_SERIALIZED_ACCEPT or + -DUSE_PTHREAD_SERIALIZED_ACCEPT in Configuration if you want to + test the other two methods. [Roy Fielding] + *) OS/2 Port updated; it should be possible to build OS/2 from the same sources as Unix now. [Brian Havard [EMAIL PROTECTED]]
cvs commit: apachen/htdocs/manual/mod mod_expires.html
fielding97/11/11 13:58:16 Modified:htdocs/manual/mod mod_expires.html Log: Close them CODE elements Revision ChangesPath 1.6 +2 -2 apachen/htdocs/manual/mod/mod_expires.html Index: mod_expires.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_expires.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mod_expires.html 1997/11/11 21:35:08 1.5 +++ mod_expires.html 1997/11/11 21:58:15 1.6 @@ -254,7 +254,7 @@ BR ExpiresDefault access plus 4 weeks BR -ExpiresDefault access plus 30 days +ExpiresDefault access plus 30 days/CODE /DD /DL P @@ -264,7 +264,7 @@ DL DDCODEExpiresByType text/html access plus 1 month 15 days 2 hours BR -ExpiresByType image/gif modification plus 5 hours 3 minutes +ExpiresByType image/gif modification plus 5 hours 3 minutes/CODE /DD /DL
cvs commit: apachen/src/regex Makefile.tmpl
fielding97/11/15 17:20:39 Modified:src/regex Makefile.tmpl Log: Some make's cannot understand comments that start after a tab. This should fix the alphaosf build. Revision ChangesPath 1.2 +3 -2 apachen/src/regex/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/regex/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.tmpl 1997/11/05 12:48:25 1.1 +++ Makefile.tmpl 1997/11/16 01:20:38 1.2 @@ -50,8 +50,9 @@ REGEXHSRC=regex2.h $(REGSRC) $(REGEXH): $(REGEXHSRC) mkh sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) regex.h - #cmp -s regex.tmp regex.h 2/dev/null || cp regex.tmp regex.h - #rm -f regex.tmp + +#cmp -s regex.tmp regex.h 2/dev/null || cp regex.tmp regex.h +#rm -f regex.tmp # dependencies $(OBJPRODN) debug.o: utils.h regex.h regex2.h
cvs commit: apache-devsite guidelines.html
fielding98/01/11 17:53:37 Added: .guidelines.html Log: A start on a complete update of the Apache Project voting rules and guidelines. Revision ChangesPath 1.1 apache-devsite/guidelines.html Index: guidelines.html === HTML HEAD TITLEApache Project Guidelines and Voting Rules/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF CENTER IMG SRC=images/apache_logo.gif ALT= H1 ALIGN=CENTERApache Project Guidelines and Voting Rules/H1 PBDRAFT/B: These guidelines are not yet approved./P /CENTER P This document defines the rules and guidelines for the Apache Project. It includes definitions of how conflict is resolved by voting, who is able to vote, and the procedures to follow for proposing and making changes to the Apache products. /P P The objective here is to avoid unnecessary conflict over changes and continue to produce a quality system in a timely manner. Not all conflict can be avoided, but at least we can agree on the procedures for conflict to be resolved. /P P The following define some common terms: /P DL DTSTRONGApache Group/STRONG/DT DDThe group of volunteers who are responsible for managing the Apache Project. This includes deciding what is distributed as products of the Apache Project, maintaining the Project's shared resources, speaking on behalf of the Apache Project, resolving license disputes regarding Apache products, and establishing these rules and guidelines. PMembership in the Apache Group is by invitation only and must be approved by consensus of the active Apache Group members. A member is considered inactive by their own declaration or by not contributing in any form to the project for over six months. An inactive member can become active again by reversing whichever condition made them inactive (i.e., by reversing their earlier declaration or by once again contributing toward the project's work). Membership can be revoked by a unanimous vote of all the active members other than the member in question./DDP DTSTRONGApache Developers/STRONG/DT DDAll of the volunteers who are contributing time, code, documentation, or resources to the Apache Project. A developer that makes sustained, welcome contributions to the project for over six months is usually invited to join the Apache Group, though the exact timing of such invitations depends on many factors./DDP DTSTRONGmailing list/STRONG/DT DDThe Apache developers' primary mailing list for discussion of issues and changes related to the project (inew-httpd@apache.org/i). Subscription to the list is open, but only subscribers can post directly to the list./DDP DTSTRONGprivate list/STRONG/DT DDThe Apache Group's private mailing list for discussion of issues that are inappropriate for public discussion, such as legal, personal, or security issues prior to a published fix. Subscription to the list is only open to Apache Group members./DDP DTSTRONGCVS/STRONG/DT DDAll of the Apache products are maintained in shared information repositories using a href=devnotes.htmlCVS on idev.apache.org/i./a Only some of the Apache developers have write access to these repositories; everyone has read access via a href=anoncvs.txtanonymous CVS/a. Developers who want write access need to ask for it on the mailing list and, if approved, need to ask the admin of idev.apache.org/i for a user account./DD /DL HR SIZE=6 H2IMG SRC=images/apache_feather_bullet.gif alt=o STATUS/H2 P Each of the Apache Project's active source code repositories contain a file called STATUS which is used to keep track of the agenda and plans for work within that repository. The STATUS file includes information about release plans, a summary of code changes committed since the last release, a list of proposed changes that are under discussion, brief notes about items that individual developers are working on or want discussion about, and anything else that might be useful to help the group track progress. The active STATUS files are automatically posted to the mailing list three times each week. /P P Many issues will be encountered by the project, each resulting in zero or more proposed action items. Issues should be raised on the mailing list as soon as they are identified. Action items STRONGmust/STRONG be raised on the mailing list and added to the relevant STATUS file. All action items may be voted
cvs commit: apachen/src/main http_protocol.c
fielding98/01/22 20:11:33
Modified:src/main http_protocol.c
Log:
The other half of the fix for when die() happens we need to eat any
request body if one exists. The hack for ErrorDocument is removed
since it interferes with the fix and should not be needed anyway.
PR: 1399
Revision ChangesPath
1.178 +4 -4 apachen/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- http_protocol.c 1998/01/20 15:28:38 1.177
+++ http_protocol.c 1998/01/23 04:11:32 1.178
@@ -1391,13 +1391,13 @@
API_EXPORT(int) should_client_block(request_rec *r)
{
-if (r-read_length || is_HTTP_ERROR(r-status))
-return 0;
+/* First check if we have already read the request body */
-if (!r-read_chunked (r-remaining = 0))
+if (r-read_length || (!r-read_chunked (r-remaining = 0)))
return 0;
-if (r-proto_num = HTTP_VERSION(1,1)) { /* sending 100 Continue interim
response */
+if (r-proto_num = HTTP_VERSION(1,1)) {
+/* sending 100 Continue interim response */
bvputs(r-connection-client,
SERVER_PROTOCOL, , status_lines[0], \015\012\015\012,
NULL);
cvs commit: apache-devsite guidelines.html index.html
fielding98/01/25 01:08:34 Modified:.guidelines.html index.html Log: Completed draft of project guidelines. I would have added information about the role of release manager of a branch and how we decide when a release should be built, but I didn't want to start inventing policy until the stuff we already do is approved. Revision ChangesPath 1.7 +150 -160 apache-devsite/guidelines.html Index: guidelines.html === RCS file: /export/home/cvs/apache-devsite/guidelines.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- guidelines.html 1998/01/20 01:06:07 1.6 +++ guidelines.html 1998/01/25 09:08:33 1.7 @@ -13,13 +13,14 @@ CENTER IMG SRC=images/apache_logo.gif ALT= -H1 ALIGN=CENTERApache Project Guidelines and Voting Rules/H1 +H1 ALIGN=CENTERApache Project Guidelines/H1 PBDRAFT/B: These guidelines are not yet approved./P /CENTER P -This document defines the rules and guidelines for the Apache Project. +This document defines the guidelines for the +a href=http://dev.apache.org/;Apache Project/a. It includes definitions of how conflict is resolved by voting, who is able to vote, and the procedures to follow for proposing and making changes to the Apache products. @@ -32,9 +33,9 @@ to be resolved. /P -P -The following define some common terms: -/P +H2IMG SRC=images/apache_feather_bullet.gif ALT=o +People, Places, and Things/H2 + DL DTSTRONGApache Group/STRONG/DT DDThe group of volunteers who are responsible for managing the @@ -42,7 +43,7 @@ products of the Apache Project, maintaining the Project's shared resources, speaking on behalf of the Apache Project, resolving license disputes regarding Apache products, and establishing - these rules and guidelines. + these guidelines. PMembership in the Apache Group is by invitation only and must be approved by consensus of the active Apache Group members. @@ -76,16 +77,15 @@ DTSTRONGCVS/STRONG/DT DDAll of the Apache products are maintained in shared information - repositories using A HREF=devnotes.htmlCVS on + repositories using A HREF=devnotesCVS on EMdev.apache.org/EM/A. Only some of the Apache developers have write access to these repositories; everyone has read access via - A HREF=anoncvs.txtanonymous CVS/A. Developers who want write + A HREF=anoncvsanonymous CVS/A. Developers who want write access need to ask for it on the mailing list and, if approved, need to ask the admin of EMdev.apache.org/EM for a user account./DD /DL -HR SIZE=6 H2IMG SRC=images/apache_feather_bullet.gif ALT=o STATUS/H2 @@ -121,7 +121,7 @@ on that issue. All other votes are non-binding. All developers are encouraged to participate in decisions, but the decision itself is made by those who have been long-time contributors to the project. -In other words, the Apache Project is a meritocracy. +In other words, the Apache Project is a minimum-threshold meritocracy. /P P @@ -160,12 +160,15 @@ /DL P -An action item requiring emconsensus/em must receive +An action item requiring emconsensus approval/em must receive at least STRONG3 binding +1/STRONG votes and STRONGno vetos/STRONG. -An action item requiring emsimple approval/em must receive +An action item requiring emmajority approval/em must receive at least STRONG3 binding +1/STRONG votes and more STRONG+1/STRONG votes than STRONG-1/STRONG votes (EMi.e./EM, a majority with a minimum -quorum of three positive votes). +quorum of three positive votes). All other action items are considered +to have emlazy approval/em until someone votes STRONG-1/STRONG, +after which point they are decided by either consensus or a majority vote, +depending upon the type of action item. /P P @@ -178,38 +181,6 @@ Types of Action Items/H2 DL - DTSTRONGRelease Testing/STRONG/DT - DTSTRONGRelease Plan/STRONG/DT - DTSTRONGShowstoppers/STRONG/DT - - DTSTRONGCode Changes/STRONG/DT - DDCode changes require peer review and testing over a wide range - of server platforms. Therefore, all code changes must pass through - a formal patch vote, as described A HREF=#patchvotebelow/A. - All those participating in a patch vote must be willing and able - to test the patched system. STRONGHowever, see the section on - quot;A HREF=#ctrTo Commit, or Not to Commit?/Aquot; - below, which modifies this paragraph./STRONG/DD - - DTSTRONGDocumentation Changes/STRONG/DT - DDDocumentation changes are only voted on after (or during) the change. - The author of the changes must notify the mailing list, preferably
cvs commit: apache-devsite commitpolicies.html
fielding98/01/25 01:33:16 Removed: .commitpolicies.html Log: Obsoleted by guidelines.html
cvs commit: apache-2.0 STATUS
fielding98/01/31 18:11:46 Added: .STATUS Log: A new beginning. Revision ChangesPath 1.1 apache-2.0/STATUS Index: STATUS === Apache 2.0 STATUS: Release: 2.0 : In pre-alpha development see: http://www.arctic.org/~dgaudet/apache/2.0/process-model Plan: Everyone with plans on things they want to do for 2.0 should add them to the repository now. Use a descriptive filename. Other code will be copied over when 1.3.0 is finished. Showstoppers: Committed Code Changes: Available Patches: In progress: Needs patch: Open issues: Closed issues:
cvs commit: apache-2.0 STATUS
fielding98/02/05 11:23:29 Modified:.STATUS Log: 61 degress and partly sunny Revision ChangesPath 1.5 +2 -2 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- STATUS1998/02/04 03:26:29 1.4 +++ STATUS1998/02/05 19:23:28 1.5 @@ -23,7 +23,7 @@ Replace the current Unix compilation model (Configuration.tmpl, home-brew Configure script) with the autoconf toolset. - Status: Brian +1 + Status: Brian +1, Roy +1 Investigate replacing the current Unix compilation model (Configuration.tmpl home-brew Configure script) with the autoconf toolset. (this @@ -34,7 +34,7 @@ The autoconf toolset should include all three: autoconf, automake, and libtool. - Status: Brian +1, Jim +1 + Status: Brian +1, Jim +1, Roy +1 Closed issues:
cvs commit: apache-1.3/src/main http_main.c http_protocol.c
fielding98/02/08 16:45:59
Modified:src/main http_main.c http_protocol.c
Log:
Reverse last change. Vetoed because they are warnings and because
APLOG_NOTICE is always logged regardless of log level.
Revision ChangesPath
1.285 +1 -1 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.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- http_main.c 1998/02/08 18:16:01 1.284
+++ http_main.c 1998/02/09 00:45:56 1.285
@@ -845,7 +845,7 @@
}
if (!current_conn-keptalive)
- aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
+ aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING,
current_conn-server, errstr);
if (timeout_req) {
1.187 +3 -3 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.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- http_protocol.c 1998/02/07 02:29:18 1.186
+++ http_protocol.c 1998/02/09 00:45:57 1.187
@@ -1688,7 +1688,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_NOTICE, r-server,
+aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
send body lost connection to %s,
get_remote_host(r-connection,
r-per_dir_config,
@@ -1777,7 +1777,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_NOTICE, r-server,
+aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
send body lost connection to %s,
get_remote_host(r-connection,
r-per_dir_config,
@@ -1845,7 +1845,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_NOTICE, r-server,
+aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
send mmap lost connection to %s,
get_remote_host(r-connection,
r-per_dir_config,
cvs commit: apache-1.3/src/main http_main.c http_protocol.c
fielding98/02/08 17:09:42
Modified:src CHANGES
src/main http_main.c http_protocol.c
Log:
Improve the error_log message for lost connection so that
clueless wankers won't automatically think the server is at fault.
Revision ChangesPath
1.624 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -r1.623 -r1.624
--- CHANGES 1998/02/08 20:50:57 1.623
+++ CHANGES 1998/02/09 01:09:37 1.624
@@ -186,6 +186,9 @@
*) File does not exist error message was erroneously including the
errno. [Marc Slemko]
+ *) Improve the warning message generated when a client drops the
+ connection (hits stop button, etc.) during a send. [Roy Fielding]
+
*) Defining GPROF will disable profiling in the parent and enable it
in the children. If you're profiling under Linux this is pretty much
necessary because SIGPROF is lost across a fork(). [Dean Gaudet]
1.286 +4 -3 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.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- http_main.c 1998/02/09 00:45:56 1.285
+++ http_main.c 1998/02/09 01:09:39 1.286
@@ -834,9 +834,10 @@
else
dirconf = current_conn-server-lookup_defaults;
if (sig == SIGPIPE) {
- ap_snprintf(errstr, sizeof(errstr), %s lost connection to %s,
- timeout_name ? timeout_name : request,
- get_remote_host(current_conn, dirconf, REMOTE_NAME));
+ ap_snprintf(errstr, sizeof(errstr),
+ %s client stopped connection before %s completed,
+ get_remote_host(current_conn, dirconf, REMOTE_NAME),
+ timeout_name ? timeout_name : request);
}
else {
ap_snprintf(errstr, sizeof(errstr), %s timed out for %s,
1.188 +3 -3 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.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- http_protocol.c 1998/02/09 00:45:57 1.187
+++ http_protocol.c 1998/02/09 01:09:40 1.188
@@ -1689,7 +1689,7 @@
continue;
else {
aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
-send body lost connection to %s,
+ %s client stopped connection before send body
completed,
get_remote_host(r-connection,
r-per_dir_config,
REMOTE_NAME));
@@ -1778,7 +1778,7 @@
continue;
else {
aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
-send body lost connection to %s,
+ %s client stopped connection before send body
completed,
get_remote_host(r-connection,
r-per_dir_config,
REMOTE_NAME));
@@ -1846,7 +1846,7 @@
continue;
else {
aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
-send mmap lost connection to %s,
+ %s client stopped connection before send mmap
completed,
get_remote_host(r-connection,
r-per_dir_config,
REMOTE_NAME));
cvs commit: apache-site related_projects.html
fielding98/02/18 13:14:17 Modified:.related_projects.html Log: Feeling particularly anal today. When a single anchor is both an href and a destination, then use both href and name attributes. Revision ChangesPath 1.20 +12 -13apache-site/related_projects.html Index: related_projects.html === RCS file: /export/home/cvs/apache-site/related_projects.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- related_projects.html 1998/02/18 11:29:39 1.19 +++ related_projects.html 1998/02/18 21:14:16 1.20 @@ -44,8 +44,7 @@ HR -H3A HREF=http://www.apache-ssl.org/; -Apache-SSL/AA NAME=apachesslnbsp;/A/H3 +H3A NAME=apachessl HREF=http://www.apache-ssl.org/;Apache-SSL/A/H3 Apache-SSL is an encrypting web server, based on Apache and SSLeay, which implements A HREF=http://home.netscape.com/newsref/std/;Secure Sockets @@ -61,8 +60,8 @@ Inside the United States in order to use Apache with SSL commercially you may want to look at A HREF=#strongholdStronghold/A. PHR -H3A HREF=http://modules.apache.org/; -Apache Module Registry/AA NAME=moduleregnbsp;/A/H3 +H3A NAME=modulereg HREF=http://modules.apache.org/; +Apache Module Registry/A/H3 This project was developed to provide a central location to find and submit information about Apache modules projects and developers that @@ -70,7 +69,7 @@ Apache HTTP server. PHR -H3A HREF=http://www.php.net/;PHP Project/AA NAME=phpnbsp;/A/H3 +H3A NAME=php HREF=http://www.php.net/;PHP Project/A/H3 PHP implements an easy-to-learn HTML-embedded scripting language. It supports a number of RDBMS packages including Adabas-D, mSQL 1, @@ -78,8 +77,8 @@ Sybase as well as many others via standard ODBC. PHR -H3A HREF=http://perl.apache.org/; -Apache/Perl Integration Project/AA NAME=modperlnbsp;/A/H3 +H3A NAME=modperl HREF=http://perl.apache.org/; +Apache/Perl Integration Project/A/H3 PThe Apache/Perl integration project brings together the full power of the A HREF=http://www.perl.com/perl/;Perl/A programming language @@ -91,8 +90,8 @@ the penalty of Perl start-up time./P HR -H3A HREF=http://www.slink.com/ApacheOS2/; -Apache for OS/2/AA NAME=os2nbsp;/A/H3 +H3A NAME=os2 HREF=http://www.slink.com/ApacheOS2/; +Apache for OS/2/A/H3 The primary motivation for this port is to show that OS/2 is a viable and powerful server platform and to promote its use as such. The @@ -103,14 +102,14 @@ OS/2 from the standard distribution./STRONG PHR -H3A HREF=http://www.xs4all.nl/~albertv/apache; -Apache for Amiga/AA NAME=amiganbsp;/A/H3 +H3A NAME=amiga HREF=http://www.xs4all.nl/~albertv/apache; +Apache for Amiga/A/H3 Apache has now been ported to Amiga, and is maintained as a separate project. PHR -H3A HREF=http://java.apache.org/; -The Java-Apache Project/AA NAME=jservnbsp;/A/H3 +H3A NAME=jserv HREF=http://java.apache.org/; +The Java-Apache Project/A/H3 A project to fully integrate Java servlet technology.
cvs commit: apache-1.3 HTTP_Features.tsv
fielding98/03/09 18:03:47 Added: .HTTP_Features.tsv Log: The HTTP editorial group needs a checklist for what has been implemented in the latest release of Apache, since that will influence what is included in the eventual Draft Standard. Revision ChangesPath 1.1 apache-1.3/HTTP_Features.tsv Index: HTTP_Features.tsv === This tab-separated-value file is for use as a checklist for features against draft-ietf-http-v11-spec-rev-02.txt, since two independently developed and interoperable implementations are needed for each feature. For each entry, ? means not filled-in - means not applicable n means no y means yes Section Feature Implemented Tested 8.1 Persistent Connections ? ? 8.2.3 Automatic retrying of requests ? ? 8.2.4 Use of the 100 (Continue) status? ? 9.2 OPTIONS ? ? 9.3 GET ? ? 9.4 HEAD? ? 9.5 POST? ? 9.6 PUT ? ? 9.7 DELETE ? ? 9.8 TRACE ? ? 9.9 CONNECT ? ? 10.1.1100 Continue? ? 10.1.2101 Switching Protocols ? ? 10.2.1200 OK ? ? 10.2.2201 Created ? ? 10.2.3202 Accepted? ? 10.2.4203 Non-Authoritative Information ? ? 10.2.5204 No Content ? ? 10.2.6205 Reset Content ? ? 10.2.7206 Partial Content ? ? 10.2.8207 Partial Update OK ? ? 10.3.1300 Multiple Choices? ? 10.3.2301 Moved Permanently ? ? 10.3.3302 Found ? ? 10.3.4303 See Other ? ? 10.3.5304 Not Modified? ? 10.3.6305 Use Proxy ? ? 10.3.7307 Temporary Redirect ? ? 10.4.1400 Bad Request ? ? 10.4.2401 Unauthorized? ? 10.4.3402 Payment Required? ? 10.4.4403 Forbidden ? ? 10.4.5404 Not Found ? ? 10.4.6405 Method Not Allowed ? ? 10.4.7406 Not Acceptable ? ? 10.4.8407 Proxy Authentication Required ? ? 10.4.9408 Request Timeout ? ? 10.4.10 409 Conflict? ? 10.4.11 410 Gone? ? 10.4.12 411 Length Required ? ? 10.4.13 412 Precondition Failed ? ? 10.4.14 413 Request Entity Too Large? ? 10.4.15 414 Request-URI Too Long? ? 10.4.16 415 Unsupported Media Type ? ? 10.4.17 416 Requested range not satisfiable ? ? 10.4.18 417 Expectation Failed ? ? 10.5.1500 Internal Server Error ? ? 10.5.2501 Not Implemented ? ? 10.5.3502 Bad Gateway ? ? 10.5.4503 Service Unavailable ? ? 10.5.5504 Gateway Timeout ? ? 10.5.6505 HTTP Version Not Supported ? ? 10.5.7506 Partial Update Not Implemented ? ? 13.3.3Strong entity tags ? ? 13.3.3Weak entity tags? ? 14.1 Accept ? ? 14.2 Accept-Charset ? ? 14.3 Accept-Encoding ? ? 14.4 Accept-Language ? ? 14.5 Accept-Ranges ? ? 14.6 Age ? ? 14.7 Allow ? ? 14.8 Authorization ? ? 14.9 Cache-Control ? ? 14.10 Connection ? ? 14.11 Content-Encoding? ? 14.12 Content-Language? ? 14.13 Content-Length ? ? 14.14 Content-Location? ? 14.15 Content-MD5 ? ? 14.16 Content-Range ? ? 14.17 Content-Type? ? 14.18 Date? ? 14.19 ETag? ? 14.20 Expect ? ? 14.21 Expires ? ? 14.22 From? ? 14.23 Host? ? 14.24 If-Modified-Since ? ? 14.25 If-Match? ? 14.26 If-None-Match ? ? 14.27 If-Range? ? 14.28 If-Unmodified-Since ? ? 14.29 Last-Modified ? ? 14.30 Location? ? 14.31 Max-Forwards? ? 14.32 Pragma ? ? 14.33 Proxy-Authenticate ? ? 14.34 Proxy-Authorization ? ? 14.35 Range ? ? 14.36 Referer ? ? 14.37 Retry-After ? ? 14.38 Server ? ? 14.39 TE ? ? 14.40 Trailer ? ? 14.41 Transfer-Encoding ? ? 14.42 Upgrade ? ? 14.43 User-Agent ? ? 14.44 Vary? ? 14.45 Via ? ? 14.46 Warning ? ? 14.47 WWW
cvs commit: apache-1.3 STATUS
fielding98/03/25 20:47:55 Modified:.STATUS Log: Dark... rain... must be time for a STATUS update. Revision ChangesPath 1.209 +8 -15 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- STATUS1998/03/26 04:24:22 1.208 +++ STATUS1998/03/26 04:47:53 1.209 @@ -258,10 +258,10 @@ worth adding it by weighting on the advantages and disadvantages. Votes for including APACI (in general): - Ralf +1, Dean +1 + Ralf +1, Dean +1, Roy +1 Votes for commit variants: - CV1: Ralf +1, Dean +1 + CV1: Ralf +1, Dean +1, Roy +1 CV2: Ralf +0 Concepts: @@ -308,7 +308,7 @@ changes to be committed without prior review. * Guidelines for commit-then-review are documented at - http://dev.apache.org/guidelines.html#ctr + http://dev.apache.org/guidelines.html * The apache CVS module has been renamed to apache-1.2 and the apachen module to apache-1.3. apache-1.3 has been copied @@ -321,27 +321,20 @@ * Provide consistant prefixes; suggestions: Apache provided general functions (e.g., ap_cpystrn) - ap_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul +1 + ap_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul +1, Roy +1 Public API functions (e.g., palloc) - apapi_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul, Dean + apapi_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul, Dean, Roy appublic_xxx: appub_xxx: Private functions which we can't make static but should be (e.g., new_connection) apprivate_xxx: - appri_xxx: Brian +1, Dean + appri_xxx: Brian +1, Dean, Roy httpd_xxx: Ken +1 apint_xxx: Ralf +1 (int = internal) -* Ken's [POLL] apachen/patches directory - Shall we experiment with allowing patches to be distributed for - voting through cvs, by creating a directory under the source tree - and putting them there? Please vote. - [EMAIL PROTECTED] - Status: Ken +1, Randy 0, Dean 0, Jim +1, Paul 0, Martin +1, Ralf 0 - * Paul would like to see a 'gdbm' option because he uses it a lot. Dean notes that 'gdbm' include 'db' support so we need to watch the library ordering. @@ -397,7 +390,7 @@ field is r-content_languages. Heck it's not even mentioned in apache-devsite/mmn.txt when we got content_languages (note the s!). The proposal is to remove r-content_language: - Status: Dean +1, Paul +1 + Status: Dean +1, Paul +1, Roy +1 - child_exit() is redundant, it can be implemented via cleanups. It is not symmetric in the sense that there is no exit API method to go @@ -406,7 +399,7 @@ mod_mmap_static, and mod_php3 for example). The proposal is to remove the child_exit() method and document cleanups as the method of handling this need. - Status: Dean +1, Rasmus +1, Paul +1 + Status: Dean +1, Rasmus +1, Paul +1, Roy +1 Win32 specific issues:
cvs commit: apache-2.0 STATUS
fielding98/03/25 23:13:44 Modified:.STATUS Log: Add my comments/votes. Fixed the formatting and removed the kindler, gentler form of saying piss off to a proposal. Revision ChangesPath 1.30 +108 -92 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- STATUS1998/03/17 15:00:24 1.29 +++ STATUS1998/03/26 07:13:43 1.30 @@ -3,9 +3,6 @@ Release: 2.0 : In pre-alpha development - see: http://www.arctic.org/~dgaudet/apache/2.0/process-model -Dean says: This sounds like I'm working on implementing this -proposal. I'm not. Nobody is as far as I know. Plan: @@ -28,14 +25,17 @@ segments should persist until the refcount drops to zero. It would be cool if pools could be created in such segments to allow things like shared tables and arrays. + +1: Roy * Apache ports project - simple-to-install (a la CPAN) one-off tools, scripts (such as counters, guest books, et cetera) + +1: Roy * Improve mod_include SSI handling, perhaps by caching offsets to directives. Also, clean up the conditional syntax to allow formats that bear a faint resemblance to other usages (such as allowing =~ and !~) in other languages. + +1: Roy * Apache reusable code library, wherein we can put some of the stuff developed during the HTTP project that would be useful elsewhere. @@ -43,28 +43,29 @@ to have things like the arrays, tables, pools, and related primitives moved into a library of which httpd is just a client and other things can be too. + +1: Roy * Replace the current Unix compilation model (Configuration.tmpl, home-brew Configure script) with the autoconf toolset. - Status: Brian +1, Roy +1, Dean +1, Ralf +1 + +1: Brian, Roy, Dean, Ralf * Investigate replacing the current Unix compilation model (Configuration.tmpl home-brew Configure script) with the autoconf toolset. (this varies from the above such that if it's shown that the autoconf toolset can do what we want, with less headache than what we have, then we go for it) - Status: Jim +1, Ken +1, Marc +1, MarkC +1, Ben +1, Paul +1, Martin +1 + +1: Jim, Ken, Marc, MarkC, Ben, Paul, Martin * The autoconf toolset should include all three: autoconf, automake, and libtool. - Status: Brian +1, Jim +1, Roy +1, Dean +1, Ken +1, Ralf +1, Martin +1 + +1: Brian, Jim, Roy, Dean, Ken, Ralf, Martin * Whatever we do regarding autoconf, we should be able to configure to build objects other than in the source tree. autoconf allows for this... you can do mkdir obj; cd obj; ../configure. This is great for multiple platforms... or even on a single platform, one copy with profiling another without. -Status: Dean +1 + +1: Dean, Roy * One of the main restrictions on Apache has been that we must assume a very low-level common denominator for the OSs out there. For example, @@ -76,6 +77,11 @@ compile and run. Many of the ideas floating around for 2.0 would, by default, (drastically) change this. Is this a good idea? + [Roy: That overstates most of the changes proposed so far. In any +case, older systems will continue to be supported by older +versions of Apache -- it is not desirable to dull the cutting edge +just so people nowhere near the cutting edge won't get cut.] + FEATURE SET FOR 2.0 Here, we decide how many of the following feature ideas we will set for ourselves as work items for 2.0. We can't do everything we would want @@ -83,105 +89,115 @@ conservative with your votes. Items in no particular order. Feel free to add more, but try not to duplicate earlier items too much. + [Roy: The amount of time it will take to complete 2.0 will have +very little to do with how much change is attempted --- it depends +only on how many people can change things simultaneously, and thus +many suggested changes will actually speed-up the overall schedule +if they can help parallelize development or simplify the core code.] + * multithreading. - Status: Brian +1, Ken +1, Jim +1, Paul +1, Sameer +1, Marc +1, - Ralf +1, MarkC +1, Ben +1, Martin +1 - - Thread Abstraction - Status: Sameer +1, Marc +1, MarkC +1, Ben +1, Dean +1, Paul +1, - Martin +1 - Volunteers: ++1: Brian, Ken, Jim, Paul, Sameer, Marc, Ralf, MarkC, Ben, Martin, Roy + o Thread Abstraction ++1: Sameer
cvs commit: apache-1.3 STATUS
fielding98/03/25 23:56:33 Modified:.STATUS Log: Put guidelines to the vote. Revision ChangesPath 1.210 +12 -23apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- STATUS1998/03/26 04:47:53 1.209 +++ STATUS1998/03/26 07:56:32 1.210 @@ -2,17 +2,22 @@ Release: -2.0 : In pre-alpha development - see: http://www.arctic.org/~dgaudet/apache/2.0/process-model 1.3b6: in development 1.3b5: Tagged APACHE_1_3b5 and released -1.3b4: Internal version... not tagged or released. -1.3b3: Released and announced -1.3b1: There is no 1.3b1 -Current Modes: +2.0 : In pre-alpha development, see apache-2.0 repository -o Commit-Then-Review (see http://dev.apache.org/guidelines.html#ctr +Guidelines: + +o For the past few months we have been working on a commit-then-review + basis. It is now time to decide whether or not we want to work + under the guidelines in http://dev.apache.org/guidelines.html + or not, and if not, what changes are needed to make it right. + + Approve guidelines as written: + +1: Roy + +0: + -1: Plan: @@ -299,22 +304,6 @@ supply a dot-notation address. Closed issues: - -* Removal of inetd mode - Ken says he'll try to maintain it, since there are - people/places who need it - -* The decision has been made to experiment with allowing code - changes to be committed without prior review. - -* Guidelines for commit-then-review are documented at - http://dev.apache.org/guidelines.html - -* The apache CVS module has been renamed to apache-1.2 and the - apachen module to apache-1.3. apache-1.3 has been copied - to apache-2.0, but whether that's appropriate or not is - under discussion. A couple of people want that module to - start empty rather than full of 1.3's stuff. Open issues:
cvs commit: apache-1.3 STATUS
fielding98/03/30 20:41:06 Modified:.STATUS Log: strangely cold and sunny Revision ChangesPath 1.248 +7 -3 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- STATUS1998/03/30 22:02:08 1.247 +++ STATUS1998/03/31 04:41:02 1.248 @@ -61,6 +61,7 @@ * Martin's new URI parsing stuff (the source module main/util_uri.c) * New `%a' construct for LogFormat and CustomLog. PR#1885 * Ralf's `Rule HIDE' feature for hiding the symbol namespace + -- vetoed by Roy, will be removed Saturday (if not sooner) * Make \\ behave as expected. * Fix for poly directive in image maps. PR#1771 * Reduce memory usage, and speed up ServerAlias support. PR#1531 @@ -100,6 +101,7 @@ * Dean's API_EXPORT and CORE_EXPORT cleanup for core functions * Ralf's new ApacheBench support program (src/support/ab.c) * Ken's change HIDE default to yes, always include hide.h + -- vetoed by Roy, will be removed Saturday (if not sooner) * Ralf's major Configure cleanup * Ralf's additional manual pages for the support programs * Ben Hyde's Configure check for unknown command switch @@ -146,6 +148,8 @@ * proxy security fixes from 1.2.5 need to be brought forward +* HIDE has been vetoed -- no release until it is removed/replaced + Needs patch: * Dean's locale project @@ -175,19 +179,19 @@ currently os_xxx, migrate to ap_xxx: Brian Public API functions (e.g., palloc) - apapi_xxx: +1: Ken, Brian, Ralf, Martin, Paul, Roy, Jim + apapi_xxx: +1: Ken, Brian, Ralf, Martin, Paul, Jim appublic_xxx: appub_xxx: Private functions which we can't make static but should be (e.g., new_connection) apprivate_xxx: - appri_xxx: +1: Brian, Roy, Paul, Jim, Ken + appri_xxx: +1: Brian, Paul, Jim, Ken httpd_xxx: +1: apint_xxx: +1: Ralf (int = internal) Alternate proposal: - Everything should be ap_: +1 Dean, Randy + Everything should be ap_: +1 Dean, Randy, Roy Why? Because it's far easier to type, and damn it, I type these things far too much. Just using apapi_ for the few hours I did while writing apapi_vformatter is
cvs commit: apache-1.3 STATUS
fielding98/04/03 13:08:48 Modified:.STATUS Log: Woohoo, sunny today. Note patch from Arnt Gulbrandsen. Revision ChangesPath 1.260 +8 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- STATUS1998/04/03 16:07:10 1.259 +++ STATUS1998/04/03 21:08:47 1.260 @@ -61,7 +61,7 @@ * Martin's new URI parsing stuff (the source module main/util_uri.c) * New `%a' construct for LogFormat and CustomLog. PR#1885 * Ralf's `Rule HIDE' feature for hiding the symbol namespace - -- vetoed by Roy, will be removed Saturday (if not sooner) + -- vetoed by Roy, currently going with Ralf's replacement plan * Make \\ behave as expected. * Fix for poly directive in image maps. PR#1771 * Reduce memory usage, and speed up ServerAlias support. PR#1531 @@ -101,7 +101,7 @@ * Dean's API_EXPORT and CORE_EXPORT cleanup for core functions * Ralf's new ApacheBench support program (src/support/ab.c) * Ken's change HIDE default to yes, always include hide.h - -- vetoed by Roy, will be removed Saturday (if not sooner) + -- vetoed by Roy, currently going with Ralf's replacement plan * Ralf's major Configure cleanup * Ralf's additional manual pages for the support programs * Ben Hyde's Configure check for unknown command switch @@ -141,6 +141,12 @@ Available Patches: +* Arnt Gulbrandsen [EMAIL PROTECTED] 03 Apr 1998 21:28:17 +0200 + [EMAIL PROTECTED] mod_usertrack.c patch: + The patch provides per-domain cookies (which I use to share user-ids + among the *.troll.no web servers) and configurable cookie names. It + also marginally increases the efficiency of Apache when the server + runs with DNS lookups turned off. In progress:
cvs commit: apache-1.3 STATUS
fielding98/04/05 15:38:29 Modified:.STATUS Log: More votes, keep them from being hidden under meaningless comments [meaningful comments are a good thing] Revision ChangesPath 1.262 +8 -8 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- STATUS1998/04/03 21:27:07 1.261 +++ STATUS1998/04/05 22:38:26 1.262 @@ -138,6 +138,7 @@ * Ralf's fallback strategy for DSO by trying to guess flags from Perl * Ralf's add of the query (-q) option to apxs * Ralf's initial doc and Configuration.tmpl entry for mod_mmap_static +* OS/2 tweak to deal with multiple .exe targets. [Brian Havard] Available Patches: @@ -184,10 +185,8 @@ apache-1.3/src/test/rename/rename.cf file as the configuration for the renaming. The used prefix or prefixes are configureable in the file, too. But we have to additionally vote on them in the next point. - Votes: Ralf +1, Jim +1 (on the source-level renaming for - 1.3b6 and 1.3.0; how is still up for debate :) ), - Marc -0 (this is not the time nor the place, but I don't have - time to veto this crap so it will be pushed through) + Votes: +1: Ralf, Jim, Roy + 0: Marc * Use consistant prefixes for the renaming; suggestions: @@ -197,17 +196,17 @@ - Apache provided general functions (e.g., ap_cpystrn) ap_xxx: +0: Ken, Brian, Ralf, Martin, Paul, Roy, Jim - Public API functions (e.g., palloc) -ap_xxx: +1 Ralf +ap_xxx: +1 Ralf, Roy apapi_xxx: +1: Ken, Paul, Jim - Private functions which we can't make static (because of cross-object usage) but should be (e.g., new_connection) -apx_xxx +1: Ralf +apx_xxx +1: Ralf, Roy appri_xxx +1: Paul, Jim, Ken - Public API module structure variables (e.g., status_module) which are used special in Configure, mod_so, etc and have to be exported: ap_xxx +1: -apm_xxx +1: Ralf +apm_xxx +1: Ralf, Roy Notes: - Ralf: My opinion for my decisions are the following ones: @@ -314,7 +313,8 @@ * 206 vs. 200 issue on Content-Length See [EMAIL PROTECTED] Roy says current behavior is correct, but Alexei disagrees. - Marc sides with Alexei. + Marc sides with Alexei. [Roy: This summary is incorrect -- we were +talking about two different PRs] * Marc's socket options like source routing (kill them?) Marc, Dean, Martin say Yes
cvs commit: apache-1.3/src/main http_main.c http_protocol.c
fielding98/04/05 16:16:11
Modified:src CHANGES
src/main http_main.c http_protocol.c
Log:
Reduce logging level of normal warning messages to APLOG_INFO,
since we are now logging APLOG_WARNING by default.
Revision ChangesPath
1.757 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.756
retrieving revision 1.757
diff -u -r1.756 -r1.757
--- CHANGES 1998/04/05 21:34:37 1.756
+++ CHANGES 1998/04/05 23:16:08 1.757
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) Reduce logging level of normal warning messages to APLOG_INFO,
+ since we are now logging APLOG_WARNING by default. [Roy Fielding]
+
*) PORT: OS/2 tweak to deal with multiple .exe targets. [Brian Havard]
*) Add documentation file and src/Configuration.tmpl entry for the
1.319 +4 -4 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.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- http_main.c 1998/04/01 14:24:30 1.318
+++ http_main.c 1998/04/05 23:16:09 1.319
@@ -120,8 +120,8 @@
/* Set this non-zero if you are prepared to put up with more than one log
entry per second */
#define SEVERELY_VERBOSE 0
- /* APD1() to APD5() are macros to help us debug. Then can either
- * log to the screen or the error_log file. In release builds, this
+ /* APD1() to APD5() are macros to help us debug. They can either
+ * log to the screen or the error_log file. In release builds, these
* macros do nothing. In debug builds, they send messages at priority
* debug to the error log file, or if DEBUG_TO_CONSOLE is defined,
* to the console.
@@ -839,14 +839,14 @@
dirconf = current_conn-server-lookup_defaults;
if (!current_conn-keptalive) {
if (sig == SIGPIPE) {
- aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING,
+ aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
current_conn-server,
%s client stopped connection before %s completed,
get_remote_host(current_conn, dirconf, REMOTE_NAME),
timeout_name ? timeout_name : request);
}
else {
- aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING,
+ aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
current_conn-server,
%s timed out for %s,
timeout_name ? timeout_name : request,
1.208 +3 -3 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.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- http_protocol.c 1998/04/01 20:53:16 1.207
+++ http_protocol.c 1998/04/05 23:16:10 1.208
@@ -1627,7 +1627,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
+aplog_error(APLOG_MARK, APLOG_INFO, r-server,
%s client stopped connection before send body
completed,
get_remote_host(r-connection,
r-per_dir_config,
@@ -1725,7 +1725,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
+aplog_error(APLOG_MARK, APLOG_INFO, r-server,
%s client stopped connection before send body
completed,
get_remote_host(r-connection,
r-per_dir_config,
@@ -1793,7 +1793,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
+aplog_error(APLOG_MARK, APLOG_INFO, r-server,
%s client stopped connection before send mmap
completed,
get_remote_host(r-connection,
r-per_dir_config,
cvs commit: apache-1.3 STATUS
fielding98/04/06 18:26:39 Modified:.STATUS Log: A good way to ensure that we never come to a decision is to change the voting options without carrying-over the votes already cast, as was done when this was split into mutually contradictory alternatives. Merge them together so people can see what is the actual status. Revision ChangesPath 1.267 +38 -27apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- STATUS1998/04/06 08:31:40 1.266 +++ STATUS1998/04/07 01:26:38 1.267 @@ -153,7 +153,13 @@ * The proposed steps for the big symbol renaming change: + NOTE: Roy won't even start down this path until there is at least +three +1 votes for the prefix option(s) applied (see below). + Step 1: Roy +- completely remove HIDE stuff from + src/Configure, include/*, APACI, etc. + - tag the source tree $ cd apache-1.3 $ cvs tag PRE_AP_PREFIX_RENAME . @@ -164,7 +170,6 @@ $ cd apache-1.3 $ ./configure --prefix=/tmp/apache --enable-module=most ---disable-rule=HIDE - check symbols $ cd apache-1.3/src $ nm -g httpd |more @@ -177,7 +182,6 @@ $ ./configure --prefix=/tmp/apache --enable-module=most --enable-shared=max ---disable-rule=HIDE - check symbols $ cd apache-1.3/src $ nm -g httpd | egrep -v '_modules?$' | egrep -v 'apx?_' | grep -v '.o$' @@ -204,12 +208,12 @@ the prefix in rename.cf) and adjust/simplify src/Configure, mod_so.c accordingly etc. These APM_ symbols were commented in rename.cf for Roys step. + [Roy doesn't think this step is necessary] 2. change the prelinked_modules and preloaded_modules symbols to APX_ variants manually and adjust src/Configure accordingly. These APX_ symbols were commented in rename.cf for Roys step because these cannot be done automatically. - 3. completely remove HIDE stuff because that's now obsolete: - src/Configure, include/*, APACI, etc. + [Roy might do this himself if the changes are clear] - compile entire server (static variant) $ cd apache-1.3 $ ./configure --prefix=/tmp/apache @@ -273,30 +277,31 @@ * Cleanup the symbol space now in the source for 1.3b6 and thus for the 1.3.x release branch via the apache-1.3/src/test/rename/rename.cf file as the configuration for the - renaming. The used prefix or prefixes are configureable in the file, - too. But we have to additionally vote on them in the next point. - Votes: +1: Ralf, Jim, Roy - 0: Marc + renaming. The used prefix or prefixes are configureable in the file. + +1: Ralf, Jim, Roy +0: Marc [thinks this is the wrong time for such a big change] -* Use consistant prefixes for the renaming; suggestions: +* What prefixes to use for the renaming: - o Different prefixes to distinguish between -the type of functions: - - Apache provided general functions (e.g., ap_cpystrn) -ap_xxx: +0: Ken, Brian, Ralf, Martin, Paul, Roy, Jim +ap_xxx:+1: Ken, Brian, Ralf, Martin, Paul, Roy, Jim, Randy + - Public API functions (e.g., palloc) -ap_xxx: +1 Ralf, Roy +ap_xxx:+1: Ralf, Roy, Dean, Randy, Martin, Brian apapi_xxx: +1: Ken, Paul, Jim + - Private functions which we can't make static (because of cross-object usage) but should be (e.g., new_connection) -apx_xxx +1: Ralf, Roy, Jim -appri_xxx +1: Paul, Ken +ap_xxx:+1: Roy, Dean, Randy, Martin, Brian +apx_xxx: +1: Ralf, Roy, Jim +appri_xxx: +1: Paul, Ken + - Public API module structure variables (e.g., status_module) which are used special in Configure, mod_so, etc and have to be exported: -ap_xxx +1: -apm_xxx +1: Ralf, Roy, Jim +..._module:+1: Roy [status quo] +ap_xxx:+1: +apm_xxx: +1: Ralf, Jim Notes: - Ralf: My opinion for my decisions are the following ones: @@ -337,22 +342,17 @@ the user while still providing the private symbolspace. - o Alternate
cvs commit: apache-1.3 STATUS
fielding98/04/06 19:47:10 Modified:.STATUS Log: After testing, apx_whatever is too ugly for me to +1 it. Revision ChangesPath 1.268 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- STATUS1998/04/07 01:26:38 1.267 +++ STATUS1998/04/07 02:47:10 1.268 @@ -293,7 +293,7 @@ - Private functions which we can't make static (because of cross-object usage) but should be (e.g., new_connection) ap_xxx:+1: Roy, Dean, Randy, Martin, Brian -apx_xxx: +1: Ralf, Roy, Jim +apx_xxx: +1: Ralf, Jim appri_xxx: +1: Paul, Ken - Public API module structure variables (e.g.,
cvs commit: apache-1.3/src/test/rename README
fielding98/04/08 17:42:58 Modified:.ABOUT_APACHE STATUS src/test/rename README Log: swab the decks Revision ChangesPath 1.10 +10 -10apache-1.3/ABOUT_APACHE Index: ABOUT_APACHE === RCS file: /home/cvs/apache-1.3/ABOUT_APACHE,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ABOUT_APACHE 1998/01/14 04:03:29 1.9 +++ ABOUT_APACHE 1998/04/09 00:42:54 1.10 @@ -3,7 +3,7 @@ http://www.apache.org/ - January 1998 + April 1998 The Apache Project is a collaborative software development effort aimed at creating a robust, commercial-grade, featureful, and freely-available @@ -67,33 +67,33 @@ -Current Apache Group in alphabetical order as of 1 January 1998: +Current Apache Group in alphabetical order as of 8 April 1998: Brian Behlendorf Organic Online, California Ken Coar MeepZor Consulting, New England, USA - Mark J. CoxC2Net Europe, UK Ralf S. EngelschallMunich, Germany. - Roy T. FieldingUC Irvine, California Dean GaudetTransmeta Corporation, California Rob HartillInternet Movie DB, UK Jim Jagielski jaguNET ISP, Maryland Alexei Kosut Stanford University, California Martin Kraemer Munich, Germany Ben Laurie Freelance Consultant, UK - Chuck Murcko The Topsail Group, Pennsylvania Doug MacEachernTOG Research Institute, Massachusetts - Aram W. Mirzadeh Qosina Corporation, New York Sameer Parekh C2Net, California Paul SuttonC2Net Europe, UK Marc SlemkoCanada Randy Terbush Zyzzyva ISP, Nebraska Dirk-Willem van Gulik Freelance Consultant, Italy - Andrew Wilson Freelance Consultant, UK Apache Emeritae (old group members now off doing other things) + Mark J. CoxC2Net Europe, UK + Roy T. FieldingUC Irvine, California + Aram W. Mirzadeh Qosina Corporation, New York + Chuck Murcko The Topsail Group, Pennsylvania David Robinson Cambridge University, UK Robert S. Thau MIT, Massachusetts + Andrew Wilson Freelance Consultant, UK Other major contributors @@ -103,7 +103,7 @@ Kevin Hughes (creator of all those nifty icons), Henry Spencer (author of the regex library), Garey Smiley (OS/2 port), Howard Fear (mod_include), Florent Guillaume (language negotiation), - Ambarish Malpani (NT port). + Ambarish Malpani (NT port), Ben Hyde (multi-platform build tests). Many 3rd-party modules, frequently used and recommended, are also freely-available and linked from the related projects page: @@ -113,7 +113,7 @@ Hundreds of people have made individual contributions to the Apache project. Patch contributors are listed in the src/CHANGES file. -Frequent contributors have included Petr Lampa, Tom Tromey, +Frequent contributors have included Lars Eilebrecht, Petr Lampa, Tom Tromey, James H. Cloos Jr., Ed Korthof, Nathan Neulinger, Jason S. Clary, Jason A. Dour, Michael Douglass, Tony Sanders, Brian Tao, Michael Smith, Adam Sussman, Nathan Schrenk, Matthew Gray, and John Heidemann. @@ -179,7 +179,7 @@ In most cases, this new member has been actively contributing to the group's work for over six months, so it's usually an easy decision. -The above describes our past and current (as of January 1998) guidelines, +The above describes our past and current (as of April 1998) guidelines, which will probably change over time as the membership of the group changes and our development/coordination tools improve. 1.281 +13 -60apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.280 retrieving revision 1.281 diff -u -r1.280 -r1.281 --- STATUS1998/04/08 16:36:27 1.280 +++ STATUS1998/04/09 00:42:54 1.281 @@ -15,7 +15,7 @@ or not, and if not, what changes are needed to make it right. Approve guidelines as written: - +1: Roy, Dean, Paul, Jim, Martin, Ralf, Randy, Brian, Ken + +1: Dean, Paul, Jim, Martin, Ralf, Randy, Brian, Ken +0: -1: @@ -77,7 +77,7 @@ * Martin's new URI parsing stuff (the source module main/util_uri.c) * New `%a' construct for LogFormat and CustomLog. PR#1885 * Ralf's `Rule HIDE' feature
cvs commit: apache-1.3 HTTP_Features.tsv
fielding98/04/23 20:39:30 Modified:.HTTP_Features.tsv Log: As near as I can tell, this is accurate up to the current snapshot. AG needs a volunteer to submit the data officially (stupid form). I'll send it to the editors unofficially. Revision ChangesPath 1.3 +132 -103 apache-1.3/HTTP_Features.tsv Index: HTTP_Features.tsv === RCS file: /home/cvs/apache-1.3/HTTP_Features.tsv,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- HTTP_Features.tsv 1998/03/16 07:39:55 1.2 +++ HTTP_Features.tsv 1998/04/24 03:39:30 1.3 @@ -1,5 +1,5 @@ This tab-separated-value file is for use as a checklist -for features against draft-ietf-http-v11-spec-rev-02.txt, +for features against draft-ietf-http-v11-spec-rev-03.txt, since two independently developed and interoperable implementations are needed for each feature. For each entry, ? means not filled-in @@ -7,107 +7,136 @@ n means no y means yes Y means yes with the addition of a module that uses feature + +The contents should be placed in the form at http://www.agranat.com:1998/ +by someone who wants to be the contact for the Apache Group. Section Feature Implemented Tested -8.1 Persistent Connections y ? -8.2.3Automatic retrying of requests - ? -8.2.4Use of the 100 (Continue) statusn ? -9.2 OPTIONS y ? -9.3 GET y ? -9.4 HEADy ? -9.5 POSTy ? -9.6 PUT y ? -9.7 DELETE y ? -9.8 TRACE y ? -9.9 CONNECT y ? -10.1.1 100 Continuen ? -10.1.2 101 Switching Protocols n ? -10.2.1 200 OK y ? -10.2.2 201 Created ? ? -10.2.3 202 Accepted? ? -10.2.4 203 Non-Authoritative Information ? ? -10.2.5 204 No Content ? ? -10.2.6 205 Reset Content ? ? -10.2.7 206 Partial Content ? ? -10.2.8 207 Partial Update OK ? ? -10.3.1 300 Multiple Choices? ? -10.3.2 301 Moved Permanently ? ? -10.3.3 302 Found ? ? -10.3.4 303 See Other ? ? -10.3.5 304 Not Modified? ? -10.3.6 305 Use Proxy ? ? -10.3.7 307 Temporary Redirect ? ? -10.4.1 400 Bad Request ? ? -10.4.2 401 Unauthorized? ? -10.4.3 402 Payment Required? ? -10.4.4 403 Forbidden ? ? -10.4.5 404 Not Found ? ? -10.4.6 405 Method Not Allowed ? ? -10.4.7 406 Not Acceptable ? ? -10.4.8 407 Proxy Authentication Required ? ? -10.4.9 408 Request Timeout ? ? -10.4.10 409 Conflict? ? -10.4.11 410 Gone? ? -10.4.12 411 Length Required ? ? -10.4.13 412 Precondition Failed ? ? -10.4.14 413 Request Entity Too Large? ? -10.4.15 414 Request-URI Too Long? ? -10.4.16 415 Unsupported Media Type ? ? -10.4.17 416 Requested range not satisfiable ? ? -10.4.18 417 Expectation Failed ? ? -10.5.1 500 Internal Server Error ? ? -10.5.2 501 Not Implemented ? ? -10.5.3 502 Bad Gateway ? ? -10.5.4 503 Service Unavailable ? ? -10.5.5 504 Gateway Timeout ? ? -10.5.6 505 HTTP Version Not Supported ? ? -10.5.7 506 Partial Update Not Implemented ? ? -13.3.3 Strong entity tags ? ? -13.3.3 Weak entity tags? ? -14.1 Accept ? ? -14.2 Accept-Charset ? ? -14.3 Accept-Encoding ? ? -14.4 Accept-Language ? ? -14.5 Accept-Ranges ? ? -14.6 Age ? ? -14.7 Allow ? ? -14.8 Authorization ? ? -14.9 Cache-Control ? ? -14.10Connection ? ? -14.11Content-Encoding? ? -14.12Content-Language? ? -14.13Content-Length ? ? -14.14Content-Location? ? -14.15Content-MD5 ? ? -14.16Content-Range ? ? -14.17Content-Type? ? -14.18Date? ? -14.19ETag? ? -14.20Expect ? ? -14.21Expires ? ? -14.22From? ? -14.23Host? ? -14.24If-Modified-Since ? ? -14.25If-Match? ? -14.26
cvs commit: apache-site in_the_news.html
fielding98/06/23 17:22:26 Modified:.in_the_news.html Log: Speaking of falling behind ... let's at least give the press a clue to find those articles that are accurate. Revision ChangesPath 1.35 +32 -0 apache-site/in_the_news.html Index: in_the_news.html === RCS file: /export/home/cvs/apache-site/in_the_news.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- in_the_news.html 1998/05/31 10:21:30 1.34 +++ in_the_news.html 1998/06/24 00:22:25 1.35 @@ -23,6 +23,38 @@ HR P +STRONGIBM News, 22 June 1998: /STRONG +A HREF=http://www.ibm.com/News/1998/06/223.phtml; +STRONGCITEIBM ... Bundles leading-edge tools and technologies from +Apache and NetObjects into IBM WebSphere Application Server/CITE/STRONG/A +BLOCKQUOTEEM +IBM will ship the Apache HTTP server with the IBM WebSphere Application +Server, helping current Apache users to evolve to e-business solutions. +As part of the WebSphere Application Server package, IBM will provide +commercial, enterprise-level support for the Apache HTTP Server. In addition, +IBM will be a full participant in the Apache HTTP Server Project, +a collaborative development effort, and will make contributions to +enhance the capabilities of the Apache HTTP Server. +/EM/BLOCKQUOTE + +P +STRONGSoftware Development, June 1998: /STRONG +STRONGCITEApache: An Open-Source Software Success Story/CITE/STRONG +by Warren Keuffel + +P +STRONGFast Company, May 1998, Issue 14, page 38: /STRONG +A HREF=http://www.fastcompany.com/online/14/rftf.html; +STRONGCITEThe Best Things in Life Are Free/CITE/STRONG/A +BLOCKQUOTEEM +Apache's real miracle is not so much its success in the software market +as its magnetic draw in the talent market. No single company could hope +to hire the diverse programming team that came together to create Apache. +Even more amazingly, this global collection of brainpower received no +compensation for its effort. Sure, the product is free. But so is the labor. +/EM/BLOCKQUOTE + +P STRONGPerfomance Computing, May 1998: /STRONG A HREF=http://www.performancecomputing.com/columns/web/9805.shtml; STRONGCITEThe Apache HTTP Server/CITE/STRONG/A
cvs commit: apache-site/press 22Jun98.html 22Jun98.txt
fielding98/06/24 19:52:29 Modified:.in_the_news.html Added: press22Jun98.html 22Jun98.txt Log: Add the Apache Group's press release of 22 June 1998. Revision ChangesPath 1.38 +1 -0 apache-site/in_the_news.html Index: in_the_news.html === RCS file: /export/home/cvs/apache-site/in_the_news.html,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- in_the_news.html 1998/06/24 10:56:48 1.37 +++ in_the_news.html 1998/06/25 02:52:28 1.38 @@ -38,6 +38,7 @@ /EM/BLOCKQUOTE Other press about this announcement: UL +LIA HREF=press/22Jun98.htmlApache Group press release/A LIA HREF=http://www.thestandard.net/articles/article_display/0,1449,720,00.html?01; The Industry Standard: IBM to Adopt Apache as Preferred E-commerce Server/A LIA HREF=http://www.zdnet.com/pcweek/news/0615/19mibm.html;PC Week: IBM backs freeware Apachein new app server/A 1.1 apache-site/press/22Jun98.html Index: 22Jun98.html === !DOCTYPE HTML PUBLIC -//IETF//DTD HTML 2.0//EN HTMLHEAD TITLEIBM joins the Apache Project, Plans to bundle and support the Apache HTTP Server/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF IMG SRC=../images/apache_sub.gif ALT= H2 align=centerIBM joins the Apache Project,br Plans to bundle and support the Apache HTTP Server/H2 P INTERNET - June 22, 1998 - The Apache Group announced today that they are entering into an engineering partnership with IBM for development of the open-source Apache HTTP server software. IBM will be contributing engineering manpower and technology to the project, and will be incorporating the award-winning Apache software into the IBM line of WebSphere Application Server software, as well as providing support and services for the Apache platform. A technical representative from IBM will be joining the Apache Group, which directs the Apache development effort. P The Apache Group is a non-profit international organization comprised of individuals who jointly develop software for serving World Wide Web pages from Unix and NT systems. The Apache HTTP server software is available at no cost, with an open-source license. Several other companies sell derivative products and services based on the Apache distribution. Apache and Apache-based software runs on over half of the Web sites on the Internet, according to numbers published by Netcraft Ltd. P This is a major endorsement of the open-source software development model, and of the quality of the code we have developed, said Brian Behlendorf, Apache Group member. IBM will benefit by having a world-class Web serving solution to offer to its customers; the Apache Group, and by proxy all users of Apache or Apache-derived software, will benefit through contributions back to the project by IBM developers. P Paraic Sweeney, vice president of IBM's WebSphere Application Server Marketing, said, IBM is pleased to join the Apache Group, and in shipping the Apache HTTP Server with the WebSphere Application Server, IBM is providing customers with commercial grade support to a highly successful product across a broad range of customers. P Open-source development efforts have existed on the Internet for as long as it has been around, and much of the software that makes the Internet work was developed that way, said Ken Coar, another member of the Apache Group. It's very encouraging that IBM, a major player in the computer industry, is recognizing the power and value of the open-source model. By supporting an open-source project rather than pursuing a proprietary and competitive effort, IBM is helping to assure that Internet software and standards will be the best they can be for everyone, and not just serve a single interest. This way, everyone benefits. P Apache's emphasis on developing software according to the latest Internet standards, and feeding that development experience back into the standards specification process of the Internet Engineering Taskforce (IETF), makes the Apache HTTP server an ideal platform for both non-profit and commercial products, said Roy Fielding, an Apache Group member and researcher at the University of California, Irvine. IBM's involvement in the Apache Group gives them access to both a robust implementation of current Web technology and a premier forum for the development of the future Web architecture. Researchers call this `technology transfer,' but in the commercial world it is just good business sense. P I am excited to see IBM join the large group
cvs commit: apache-site/contributors index.html
fielding98/06/24 20:22:24 Modified:.ABOUT_APACHE.html contributors index.html Log: Reactivate me. Revision ChangesPath 1.17 +8 -17 apache-site/ABOUT_APACHE.html Index: ABOUT_APACHE.html === RCS file: /export/home/cvs/apache-site/ABOUT_APACHE.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ABOUT_APACHE.html 1998/06/25 03:04:00 1.16 +++ ABOUT_APACHE.html 1998/06/25 03:22:20 1.17 @@ -22,7 +22,7 @@ HREF=http://www.apache.org; http://www.apache.org//Agt; BR - June 1997 + June 1998 /H3 HR H2 @@ -136,7 +136,7 @@ /P HR SIZE=4 H2 - Current Apache Group in alphabetical order as of 23 April 1998: + Current Apache Group in alphabetical order as of 24 June 1998: /H2 DL DD @@ -167,6 +167,12 @@ /TD /TR TR + TDRoy T. Fieldingnbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + /TD + TDUC Irvine, California + /TD + /TR + TR TDDean Gaudetnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD @@ -272,12 +278,6 @@ DD TABLE TR - TDRoy T. Fieldingnbsp;nbsp;nbsp;nbsp;nbsp;nbsp; - /TD - TDUC Irvine, California - /TD - /TR - TR TDChuck Murckonbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD TDThe Topsail Group, Pennsylvania @@ -488,14 +488,5 @@ H3 ALIGN=CENTER EMThanks for using Apache!/EM /H3 - HR - P - ADDRESSRoy Fielding, June 1997/ADDRESS - /P - P - If you are interested in other WWW history, see - lt;A - HREF=http://www.webhistory.org/; - SAMPhttp://www.webhistory.org//SAMP/Agt;. /BODY /HTML 1.46 +5 -5 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- index.html1998/06/25 03:03:59 1.45 +++ index.html1998/06/25 03:22:24 1.46 @@ -19,7 +19,7 @@ This page exists to recognize the efforts and contributions of the core individuals in the Apache project. -H2Current Apache Group in alphabetical order as of 23 April 1998:/H2 +H2Current Apache Group in alphabetical order as of 24 June 1998:/H2 TABLE BORDER=0 TR VALIGN=TOP @@ -39,6 +39,9 @@ TDSTRONGA HREF=#rseRalf S. Engelschall/A/STRONG TDDr. Cosmetics, mod_rewrite, DSO support, Configure, APACI, apxs, etc. TR VALIGN=TOP + TDSTRONGA HREF=#fieldingRoy T. Fielding/A/STRONG + TDStandards Cop. +TR VALIGN=TOP TDSTRONGA HREF=#dgaudetDean Gaudet/A/STRONG TDPerformance freak. TR VALIGN=TOP @@ -82,9 +85,6 @@ TD COLSPAN=2 H2Apache Emeritae (old group members now off doing other things)/H2 TR VALIGN=TOP - TDSTRONGA HREF=#fieldingRoy T. Fielding/A/STRONG - TDStandards Cop. -TR VALIGN=TOP TDSTRONGA HREF=#murckoChuck Murcko/A/STRONG TDUnixWare, IRIX, BSD porting. TR VALIGN=TOP @@ -229,7 +229,7 @@ to the standards for HTTP, HTML and URI, and makes sure that Apache conforms to those worth conforming to. On a good day, he'll even test the code, dabble in software engineering practice, - submit a few patches, and squeeze out an Agenda.BR + submit a few patches, and squeeze out an agenda.BR P
cvs commit: apache-1.3 STATUS
fielding98/07/21 21:00:47 Modified:.STATUS Log: Remember what I just wasted a couple hours verifying. Revision ChangesPath 1.447 +5 -0 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.446 retrieving revision 1.447 diff -u -r1.446 -r1.447 --- STATUS1998/07/21 15:39:39 1.446 +++ STATUS1998/07/22 04:00:46 1.447 @@ -156,6 +156,11 @@ * proxy_*_canon routines use r-proxyreq incorrectly. See [EMAIL PROTECTED] +* Use of ptrans in http_main is inconsistent: it is a static global + that is sometimes used as a temporary pool, sometimes as a + per-connection pool, and overshadowed in child_sub_main() for a + per-thread pool. That sucks. + Open issues: * How should an Apache binary release tarball look?
cvs commit: apache-1.3 ABOUT_APACHE
fielding98/07/21 21:03:00 Modified:.ABOUT_APACHE Log: Ready to vote on 1.3 issues again. Revision ChangesPath 1.20 +1 -1 apache-1.3/ABOUT_APACHE Index: ABOUT_APACHE === RCS file: /home/cvs/apache-1.3/ABOUT_APACHE,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ABOUT_APACHE 1998/07/15 12:31:23 1.19 +++ ABOUT_APACHE 1998/07/22 04:02:59 1.20 @@ -74,6 +74,7 @@ Mark J. CoxC2Net Europe, UK Lars EilebrechtKreuztal, Germany Ralf S. EngelschallMunich, Germany. + Roy T. FieldingUC Irvine, California Dean GaudetTransmeta Corporation, California Rob HartillInternet Movie DB, UK Ben Hyde Gensym, Massachusetts @@ -92,7 +93,6 @@ Apache Emeritae (old group members now off doing other things) - Roy T. FieldingUC Irvine, California Chuck Murcko The Topsail Group, Pennsylvania David Robinson Cambridge University, UK Robert S. Thau MIT, Massachusetts
cvs commit: apache-1.3/src/main http_protocol.c
fielding98/07/21 22:48:21
Modified:src CHANGES
src/main http_protocol.c
Log:
Fixed problem with buffered response message not being sent for
the read_request error conditions of URI-too-long (414) and
malformed header fields (400). We now create enough of the request
record so that it is adequately logged as well.
PR: 2646 from Jim Gettys
Revision ChangesPath
1.976 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.975
retrieving revision 1.976
diff -u -r1.975 -r1.976
--- CHANGES 1998/07/21 15:39:40 1.975
+++ CHANGES 1998/07/22 05:48:19 1.976
@@ -1,5 +1,9 @@
Changes with Apache 1.3.2
+ *) Fixed problem with buffered response message not being sent for
+ the read_request error conditions of URI-too-long (414) and
+ malformed header fields (400). [Roy Fielding] PR#2646
+
*) Add support for the Max-Forwards: header line required by RFC2068 for
the TRACE method. This allows apache to TRACE along a chain of proxies
up to a predetermined depth. [Martin Kraemer]
1.226 +48 -46apache-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.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- http_protocol.c 1998/07/19 05:55:16 1.225
+++ http_protocol.c 1998/07/22 05:48:21 1.226
@@ -656,20 +656,9 @@
/* we've probably got something to do, ignore graceful restart requests
*/
#ifdef SIGUSR1
signal(SIGUSR1, SIG_IGN);
-#endif /* SIGUSR1 */
+#endif
+
ap_bsetflag(conn-client, B_SAFEREAD, 0);
-if (len == (HUGE_STRING_LEN - 1)) {
-ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r-server,
-request failed for %s, reason: URI too long,
-ap_get_remote_host(r-connection, r-per_dir_config,
REMOTE_NAME));
- /* hack to deal with the HTTP_REQUEST_TIME_OUT setting up above: */
- if (r-status == HTTP_REQUEST_TIME_OUT) {
- r-status = HTTP_OK;
- }
- r-request_time = time(NULL);
- ap_die (HTTP_REQUEST_URI_TOO_LARGE, r);
-return 0;
-}
r-request_time = time(NULL);
r-the_request = ap_pstrdup(r-pool, l);
@@ -700,8 +689,16 @@
ap_parse_uri(r, uri);
+if (len == (HUGE_STRING_LEN - 1)) {
+r-status= HTTP_REQUEST_URI_TOO_LARGE;
+r-proto_num = HTTP_VERSION(1,0);
+r-protocol = ap_pstrdup(r-pool, HTTP/1.0);
+return 0;
+}
+
r-assbackwards = (ll[0] == '\0');
r-protocol = ap_pstrdup(r-pool, ll[0] ? ll : HTTP/0.9);
+
if (2 == sscanf(r-protocol, HTTP/%u.%u, major, minor)
minor HTTP_VERSION(1,0)) /* don't allow HTTP/0.1000 */
r-proto_num = HTTP_VERSION(major, minor);
@@ -725,23 +722,15 @@
while ((len = getline(field, MAX_STRING_LEN, c-client, 1)) 0) {
char *copy = ap_palloc(r-pool, len + 1);
memcpy(copy, field, len + 1);
-
- if (!(value = strchr(copy, ':'))) { /* Find the colon separator */
- /* if there's none, this request is screwed up.
- * a hack to deal with how we set HTTP_REQUEST_TIME_OUT earlier.*/
- if (r-status == HTTP_REQUEST_TIME_OUT)
- r-status = HTTP_OK;
-
- ap_die (HTTP_BAD_REQUEST, r);
- return;
- }
+
+if (!(value = strchr(copy, ':'))) { /* Find the colon separator
*/
+r-status = HTTP_BAD_REQUEST; /* or abort the bad request
*/
+return;
+}
*value = '\0';
++value;
- /* XXX: RFC2068 defines only SP and HT as whitespace, this test is
- * wrong... and so are many others probably.
- */
-while (ap_isspace(*value))
+while (*value == ' ' || *value == '\t')
++value;/* Skip to start of value */
/* XXX: should strip trailing whitespace as well */
@@ -754,7 +743,7 @@
= MAX_STRING_LEN - 1) {
/* soak up the extra data */
}
- if (len == 0) /* time to exit the larger loop as well */
+ if (len = 0) /* time to exit the larger loop as well */
break;
}
}
@@ -796,34 +785,47 @@
r-status = HTTP_REQUEST_TIME_OUT; /* Until we get a request */
r-the_request = NULL;
-/* Get the request... */
-
#ifdef CHARSET_EBCDIC
ap_bsetflag(r-connection-client, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 1);
-#endif /* CHARSET_EBCDIC */
+#endif
+
+/* Get the request
cvs commit: apache-1.3 STATUS
fielding98/07/28 23:53:09 Modified:.STATUS Log: The ptrans ugliness is not worth fixing til 2.0, and Dean has already fixed it in the apache-nspr code. Revision ChangesPath 1.451 +0 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.450 retrieving revision 1.451 diff -u -r1.450 -r1.451 --- STATUS1998/07/25 13:33:51 1.450 +++ STATUS1998/07/29 06:53:07 1.451 @@ -159,11 +159,6 @@ * proxy_*_canon routines use r-proxyreq incorrectly. See [EMAIL PROTECTED] -* Use of ptrans in http_main is inconsistent: it is a static global - that is sometimes used as a temporary pool, sometimes as a - per-connection pool, and overshadowed in child_sub_main() for a - per-thread pool. That sucks. - Open issues: * Underscores on symbols in DSO situation is broken for NetBSD:
cvs commit: apache-site ABOUT_APACHE.html
fielding98/08/01 15:52:42 Modified:.ABOUT_APACHE.html Log: Update to match ABOUT_APACHE Revision ChangesPath 1.19 +0 -2 apache-site/ABOUT_APACHE.html Index: ABOUT_APACHE.html === RCS file: /export/home/cvs/apache-site/ABOUT_APACHE.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ABOUT_APACHE.html 1998/07/15 12:31:24 1.18 +++ ABOUT_APACHE.html 1998/08/01 22:52:41 1.19 @@ -333,8 +333,6 @@ /LI LIAmbarish Malpani (NT port). /LI - LIBen Hyde (multi-platform build tests). - /LI /UL P Many 3SUPrd/SUP-party modules, frequently used and recommended, are also
cvs commit: apache-1.3 STATUS
fielding98/08/01 17:10:30 Modified:.STATUS Log: Add status of binary builds. Revision ChangesPath 1.452 +27 -0 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.451 retrieving revision 1.452 diff -u -r1.451 -r1.452 --- STATUS1998/07/29 06:53:07 1.451 +++ STATUS1998/08/02 00:10:29 1.452 @@ -482,3 +482,30 @@ accomodate it, though it does add complexity to suexec.c. PR #1120 Brian: +1 + +Binaries + The goal here is to have two columns of all-Y (where applicable) + for the two stable release versions, and nothing under Old unless + the new version just doesn't work on that platform. + +1.2.6 1.3.1 Old + aix_4.1N Y 1.2.5, 1.3.0 + alphalinux N N 1.3.0 + aux_3.1N N 1.3.0 + decalphaNT N N 1.3b6 + dunix_4.0 N Y 1.2.4, 1.3.0 + freebsd_2.1N N 1.2.4 + freebsd_2.2N N 1.2.5 + hpux_10.20 N N 1.2.5 + hpux_11N Y + irix_6.2 N N 1.2.5 + linux_2.x N N 1.2.4, 1.3.0 + netbsd_1.2 N N 1.2.4 + os2N Y 1.3b6, 1.3b7 + reliantunix_5.4Y N 1.3.0 + solarisN Y*1.2.5, 1.3.0 (* for Solaris 2.6) + sparclinux N Y 1.3.0 + sunos_4.1.xN N 1.2.5 + ultrix_4.4 N N 1.2.4 + win32 - Y +
cvs commit: apache-1.3/src/main http_main.c http_protocol.c
fielding98/08/01 21:43:19
Modified:src CHANGES
src/main http_main.c http_protocol.c
Log:
Allow ap_read_request errors to propagate through the normal request
handling loop so that the connection can be properly closed with
lingering_close, thus avoiding a potential TCP reset that would
cause the client to miss the HTTP error response.
Revision ChangesPath
1.993 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -r1.992 -r1.993
--- CHANGES 1998/07/28 17:26:43 1.992
+++ CHANGES 1998/08/02 04:43:15 1.993
@@ -1,5 +1,10 @@
Changes with Apache 1.3.2
+ *) Allow ap_read_request errors to propagate through the normal request
+ handling loop so that the connection can be properly closed with
+ lingering_close, thus avoiding a potential TCP reset that would
+ cause the client to miss the HTTP error response. [Roy Fielding]
+
*) One more portability fix for APACI shadow tree support: Swap order of
awk
and sed in top-level configure script to avoid sed fails on some
platforms (for instance SunOS 4.1.3 and NCR SysV) because of the
1.376 +14 -9 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.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- http_main.c 1998/07/20 16:37:11 1.375
+++ http_main.c 1998/08/02 04:43:17 1.376
@@ -3699,8 +3699,11 @@
(void) ap_update_child_status(my_child_num, SERVER_BUSY_WRITE, r);
- ap_process_request(r);
+ /* process the request if it was read without error */
+ if (r-status == HTTP_OK)
+ ap_process_request(r);
+
#if defined(STATUS)
increment_counts(my_child_num, r);
#endif
@@ -4466,15 +4469,16 @@
conn = new_connection(ptrans, server_conf, cio,
(struct sockaddr_in *) sa_client,
(struct sockaddr_in *) sa_server, -1);
- r = ap_read_request(conn);
- if (r)
- ap_process_request(r); /* else premature EOF (ignore) */
- while (r conn-keepalive !conn-aborted) {
- ap_destroy_pool(r-pool);
- r = ap_read_request(conn);
- if (r)
+ while ((r = ap_read_request(conn)) != NULL) {
+
+ if (r-status == HTTP_OK)
ap_process_request(r);
+
+ if (!conn-keepalive || conn-aborted)
+ break;
+
+ ap_destroy_pool(r-pool);
}
ap_bclose(cio);
@@ -4779,7 +4783,8 @@
while ((r = ap_read_request(current_conn)) != NULL) {
(void) ap_update_child_status(child_num, SERVER_BUSY_WRITE, r);
- ap_process_request(r);
+ if (r-status == HTTP_OK)
+ ap_process_request(r);
#if defined(STATUS)
increment_counts(child_num, r);
1.227 +2 -3 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.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- http_protocol.c 1998/07/22 05:48:21 1.226
+++ http_protocol.c 1998/08/02 04:43:18 1.227
@@ -803,8 +803,8 @@
ap_send_error_response(r, 0);
ap_bflush(r-connection-client);
ap_log_transaction(r);
+return r;
}
-r-connection-aborted = 1;
return NULL;
}
if (!r-assbackwards) {
@@ -819,8 +819,7 @@
ap_send_error_response(r, 0);
ap_bflush(r-connection-client);
ap_log_transaction(r);
-r-connection-aborted = 1;
-return NULL;
+return r;
}
}
else {
cvs commit: apache-1.3/src/main http_config.c http_core.c http_protocol.c
fielding98/08/09 21:16:16
Modified:src CHANGES
src/include http_config.h http_core.h httpd.h
src/main http_config.c http_core.c http_protocol.c
Log:
Fixed request limit change to be more portable. Removed the server_rec
variables since compile-time control of the request-line, fieldsize, and
number of fields is sufficient. Added a per-dir configuration directive
LimitRequestBody for setting a maximum request message body, with the
default of 0 meaning no limit.
Revision ChangesPath
1.1015+3 -2 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1014
retrieving revision 1.1015
diff -u -r1.1014 -r1.1015
--- CHANGES 1998/08/10 00:10:18 1.1014
+++ CHANGES 1998/08/10 04:16:11 1.1015
@@ -3,10 +3,11 @@
*) SECURITY: Eliminate O(n^2) space DoS attacks (and other O(n^2)
cpu time attacks) in header parsing. [Dean Gaudet]
- *) SECURITY: Added default limits for various aspects of reading a
+ *) SECURITY: Added compile-time limits for various aspects of reading a
client request to avoid some simple denial of service attacks,
including limits on maximum request-line size, number of header
- fields, size of any one header field, and size of the request
+ fields, and size of any one header field. Also added a configurable
+ directive LimitRequestBody for limiting the size of the request
message body. [Roy Fielding]
*) Make status module aware of DNS and logging states, even if
1.93 +1 -1 apache-1.3/src/include/http_config.h
Index: http_config.h
===
RCS file: /home/cvs/apache-1.3/src/include/http_config.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- http_config.h 1998/08/09 06:37:15 1.92
+++ http_config.h 1998/08/10 04:16:12 1.93
@@ -275,7 +275,7 @@
* handle it back-compatibly, or at least signal an error).
*/
-#define MODULE_MAGIC_NUMBER 19980808
+#define MODULE_MAGIC_NUMBER 19980809
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL
/* Generic accessors for other modules to get at their own module-specific
1.47 +2 -0 apache-1.3/src/include/http_core.h
Index: http_core.h
===
RCS file: /home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- http_core.h 1998/08/06 19:23:43 1.46
+++ http_core.h 1998/08/10 04:16:13 1.47
@@ -131,6 +131,7 @@
API_EXPORT(char *) ap_construct_url(pool *p, const char *uri, const
request_rec *r);
API_EXPORT(const char *) ap_get_server_name(const request_rec *r);
API_EXPORT(unsigned) ap_get_server_port(const request_rec *r);
+API_EXPORT(unsigned long) ap_get_limit_req_body(const request_rec *r);
API_EXPORT(void) ap_custom_response(request_rec *r, int status, char
*string);
/* Authentication stuff. This is one of the places where compatibility
@@ -236,6 +237,7 @@
#ifdef RLIMIT_NPROC
struct rlimit *limit_nproc;
#endif
+unsigned long limit_req_body; /* limit on bytes in request msg body */
/* logging options */
enum { srv_sig_off, srv_sig_on, srv_sig_withmail } server_signature;
1.233 +18 -27apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- httpd.h 1998/08/09 16:57:28 1.232
+++ httpd.h 1998/08/10 04:16:13 1.233
@@ -369,6 +369,24 @@
#define DEFAULT_LISTENBACKLOG 511
#endif
+/* Limits on the size of various request items. These limits primarily
+ * exist to prevent simple denial-of-service attacks on a server based
+ * on misuse of the protocol. The recommended values will depend on the
+ * nature of the server resources -- CGI scripts and database backends
+ * might require large values, but most servers could get by with much
+ * smaller limits than we use below. The request message body size can
+ * be limited by the per-dir config directive LimitRequestBody.
+ */
+#ifndef AP_LIMIT_REQUEST_LINE
+#define AP_LIMIT_REQUEST_LINE 8192
+#endif /* default limit on bytes in Request-Line (Method+URI+HTTP-version) */
+#ifndef AP_LIMIT_REQUEST_FIELDS
+#define AP_LIMIT_REQUEST_FIELDS 100
+#endif /* default limit on number of request header fields */
+#ifndef AP_LIMIT_REQUEST_FIELDSIZE
+#define AP_LIMIT_REQUEST_FIELDSIZE 8192
+#endif /* default limit on bytes
cvs commit: apache-1.3/src/include httpd.h
fielding98/08/09 21:23:03 Modified:src/include httpd.h Log: Use 8190 as the limit since it is more efficient, and explain why that is the case. Revision ChangesPath 1.234 +5 -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.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- httpd.h 1998/08/10 04:16:13 1.233 +++ httpd.h 1998/08/10 04:23:02 1.234 @@ -376,15 +376,18 @@ * might require large values, but most servers could get by with much * smaller limits than we use below. The request message body size can * be limited by the per-dir config directive LimitRequestBody. + * + * Internal buffer sizes are two bytes more than the AP_LIMIT_REQUEST_LINE + * and AP_LIMIT_REQUEST_FIELDSIZE below, which explains the 8190. */ #ifndef AP_LIMIT_REQUEST_LINE -#define AP_LIMIT_REQUEST_LINE 8192 +#define AP_LIMIT_REQUEST_LINE 8190 #endif /* default limit on bytes in Request-Line (Method+URI+HTTP-version) */ #ifndef AP_LIMIT_REQUEST_FIELDS #define AP_LIMIT_REQUEST_FIELDS 100 #endif /* default limit on number of request header fields */ #ifndef AP_LIMIT_REQUEST_FIELDSIZE -#define AP_LIMIT_REQUEST_FIELDSIZE 8192 +#define AP_LIMIT_REQUEST_FIELDSIZE 8190 #endif /* default limit on bytes in any one header field */ /*
cvs commit: apache-devsite mmn.txt
fielding98/08/11 02:34:02 Modified:.mmn.txt Log: 19980811 (1.3.2-dev) - added limit_req_line, limit_req_fieldsize, and limit_req_fields to server_rec. - added limit_req_body to core_dir_config and ap_get_limit_req_body() to get its value. Revision ChangesPath 1.32 +5 -1 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mmn.txt 1998/08/06 19:24:47 1.31 +++ mmn.txt 1998/08/11 09:34:02 1.32 @@ -80,4 +80,8 @@ 19980806 (1.3.2-dev) - add ap_log_rerror() - add ap_scan_script_header_err_core() - add ap_uuencode() - - add ap_custom_response() \ No newline at end of file + - add ap_custom_response() +19980811 (1.3.2-dev) - added limit_req_line, limit_req_fieldsize, and + limit_req_fields to server_rec. + - added limit_req_body to core_dir_config and + ap_get_limit_req_body() to get its value.
cvs commit: apache-1.3/htdocs/manual/mod core.html directives.html
fielding98/08/11 17:29:16
Modified:htdocs/manual/mod core.html directives.html
Log:
Documentation for the LimitRequest* directives.
Revision ChangesPath
1.131 +199 -1apache-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.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- core.html 1998/08/11 15:37:49 1.130
+++ core.html 1998/08/12 00:29:14 1.131
@@ -49,6 +49,10 @@
LIA HREF=#keepaliveKeepAlive/A
LIA HREF=#keepalivetimeoutKeepAliveTimeout/A
LIA HREF=#limitlt;Limitgt;/A
+LIA HREF=#limitrequestbodyLimitRequestBody/A
+LIA HREF=#limitrequestfieldsLimitRequestFields/A
+LIA HREF=#limitrequestfieldsizeLimitRequestFieldsize/A
+LIA HREF=#limitrequestlineLimitRequestLine/A
LIA HREF=#listenListen/A
LIA HREF=#listenbacklogListenBacklog/A
LIA HREF=#locationlt;Locationgt;/A
@@ -1324,7 +1328,201 @@
OPTIONS. STRONGThe method name is case-sensitive./STRONG
If GET is used it will also restrict HEAD requests.
STRONGIf you wish to limit all methods, do not include any
-lt;Limitgt; directive at all./STRONG PHR
+lt;Limitgt; directive at all./STRONG
+
+PHR
+
+H2A NAME=limitrequestbodyLimitRequestBody directive/A/H2
+!--%plaintext lt;?INDEX {\tt LimitRequestBody} directivegt; --
+A
+ HREF=directive-dict.html#Syntax
+ REL=Help
+STRONGSyntax:/STRONG/A LimitRequestBody EMnumber/EMBR
+A
+ HREF=directive-dict.html#Default
+ REL=Help
+STRONGDefault:/STRONG/A CODELimitRequestBody 0/CODEBR
+A
+ HREF=directive-dict.html#Context
+ REL=Help
+STRONGContext:/STRONG/A server configBR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A coreBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A LimitRequestBody is only available in
+Apache 1.3.2 and later.
+P
+
+EMNumber/EM is a long integer from 0 (meaning unlimited) to 2147483647
+(2GB). The default value is defined by the compile-time constant
+CODEDEFAULT_LIMIT_REQUEST_BODY/CODE (0 as distributed).
+P
+
+The LimitRequestBody directive allows the user to set a
+limit on the allowed size of an HTTP request message body within
+the context in which the directive is given (server, per-directory,
+per-file or per-location). If the client request exceeds that limit,
+the server will return an error response instead of servicing the request.
+The size of a normal request message body will vary greatly depending
+on the nature of the resource and the methods allowed on that resource.
+CGI scripts typically use the message body for passing form information
+to the server. Implementations of the PUT method will require a value
+at least as large as any representation that the server wishes
+to accept for that resource.
+P
+
+This directive gives the server administrator greater control over abnormal
+client request behavior, which may be useful for avoiding some forms
+of denial-of-service attacks.
+P
+
+PHR
+
+H2A NAME=limitrequestfieldsLimitRequestFields directive/A/H2
+!--%plaintext lt;?INDEX {\tt LimitRequestFields} directivegt; --
+A
+ HREF=directive-dict.html#Syntax
+ REL=Help
+STRONGSyntax:/STRONG/A LimitRequestFields EMnumber/EMBR
+A
+ HREF=directive-dict.html#Default
+ REL=Help
+STRONGDefault:/STRONG/A CODELimitRequestFields 100/CODEBR
+A
+ HREF=directive-dict.html#Context
+ REL=Help
+STRONGContext:/STRONG/A server configBR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A coreBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A LimitRequestFields is only available in
+Apache 1.3.2 and later.
+P
+
+EMNumber/EM is an integer from 0 (meaning unlimited) to 32767.
+The default value is defined by the compile-time constant
+CODEDEFAULT_LIMIT_REQUEST_FIELDS/CODE (100 as distributed).
+P
+
+The LimitRequestFields directive allows the server administrator to modify
+the limit on the number of request header fields allowed in an HTTP request.
+A server needs this value to be larger than the number of fields that a
+normal client request might include. The number of request header fields
+used by a client rarely exceeds 20, but this may vary among different
+client implementations, often depending upon the extent to which a user
+has configured their browser to support detailed content negotiation.
+Optional HTTP extensions are often expressed using request header fields.
+P
+
+This directive gives the server administrator greater control over abnormal
+client request behavior, which may be useful for avoiding some forms
+of denial-of-service attacks. The value should be increased if normal
+clients see an error response from the server
cvs commit: apache-1.3/htdocs/manual/mod core.html
fielding98/08/11 17:31:45 Modified:htdocs/manual/mod core.html Log: Forgot that LimitRequestBody is allowed everywhere. Revision ChangesPath 1.132 +2 -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.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- core.html 1998/08/12 00:29:14 1.131 +++ core.html 1998/08/12 00:31:44 1.132 @@ -1345,7 +1345,8 @@ A HREF=directive-dict.html#Context REL=Help -STRONGContext:/STRONG/A server configBR +STRONGContext:/STRONG/A server config, virtual host, directory, +.htaccessBR A HREF=directive-dict.html#Status REL=Help
cvs commit: apache-1.3/src/regex regcomp.c regex2.h regexec.c regfree.c
fielding98/09/15 12:47:46
Modified:src CHANGES Configure
src/helpers GuessOS
src/include ap_config.h hsregex.h
src/main http_main.c
src/os/unix os.c
src/regex regcomp.c regex2.h regexec.c regfree.c
Log:
Added RHAPSODY (Mac OS X Server) support. MAP_TMPFILE defined
as an alternate mechanism for mmap'd shared memory for RHAPSODY.
ap_private_extern defined to hide symbols that conflict with loaded
dynamic libraries on the NEXT and RHAPSODY platforms.
Submitted code was modified by Roy to use ap_private_extern instead of
directly using __private_extern__, and MAP_TMPFILE instead of TMP_MAP_ANON,
as suggested by Dean.
Submitted by: Wilfredo Sanchez [EMAIL PROTECTED]
Reviewed by: Roy Fielding, Dean Gaudet
Revision ChangesPath
1.1059+6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1058
retrieving revision 1.1059
diff -u -r1.1058 -r1.1059
--- CHANGES 1998/09/15 00:15:16 1.1058
+++ CHANGES 1998/09/15 19:47:36 1.1059
@@ -1,5 +1,11 @@
Changes with Apache 1.3.2
+ *) PORT: Added RHAPSODY (Mac OS X Server) support. MAP_TMPFILE defined
+ as an alternate mechanism for mmap'd shared memory for RHAPSODY.
+ ap_private_extern defined to hide symbols that conflict with loaded
+ dynamic libraries on the NEXT and RHAPSODY platforms.
+ [Wilfredo Sanchez [EMAIL PROTECTED]]
+
*) Delete PID file on clean shutdowns.
[Charles Randall [EMAIL PROTECTED]] PR#2947
1.288 +15 -2 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- Configure 1998/09/10 08:58:42 1.287
+++ Configure 1998/09/15 19:47:36 1.288
@@ -483,13 +483,13 @@
DBM_LIB=
;;
*-next-nextstep*)
- OS='NeXT'
+ OS='NeXTStep'
OPTIM='-O'
CFLAGS=$CFLAGS -DNEXT
DEF_WANTHSREGEX=yes
;;
*-next-openstep*)
- OS='Openstep for Mach'
+ OS='OpenStep/Mach'
CC='cc'
OPTIM='-O'
CFLAGS=$CFLAGS -DNEXT
@@ -498,6 +498,11 @@
LDFLAGS_SHLIB='-dynamiclib -undefined warning'
DEF_WANTHSREGEX=yes
;;
+*-apple-rhapsody*)
+ OS='Mac OS X Server'
+ CFLAGS=$CFLAGS -DRHAPSODY
+ DEF_WANTHSREGEX=yes
+ ;;
*-dec-osf*)
OS='DEC OSF/1'
CFLAGS=$CFLAGS -DOSF1
@@ -853,6 +858,14 @@
LDFLAGS_SHLIB_EXPORT=
SHLIB_SUFFIX_DEPTH=2
;;
+ *-apple-rhapsody*)
+ LD_SHLIB=cc
+CFLAGS_SHLIB=
+LDFLAGS_SHLIB=-bundle -undefined suppress
+LDFLAGS_SHLIB_EXPORT=
+SHLIB_SUFFIX_DEPTH=0
+ #DEF_SHARED_CORE=yes
+ ;;
*-solaris2*)
case $CC in
*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;;
1.45 +7 -0 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- GuessOS 1998/07/28 17:07:13 1.44
+++ GuessOS 1998/09/15 19:47:39 1.45
@@ -229,6 +229,13 @@
echo ${MACHINE}-tandem-sysv4; exit 0;
;;
+Rhapsody:*:*:*)
+ case ${MACHINE} in
+ Power*) MACHINE=powerpc ;;
+ esac
+ echo ${MACHINE}-apple-rhapsody${RELEASE}; exit 0
+ ;;
+
RISC iX:*)
echo arm-whatever-riscix; exit 0;
;;
1.232 +48 -0 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- ap_config.h 1998/08/13 02:59:32 1.231
+++ ap_config.h 1998/09/15 19:47:40 1.232
@@ -360,6 +360,43 @@
#define NO_USE_SIGACTION
#define HAVE_SYSLOG 1
+#elif defined(RHAPSODY) /* Mac OS X Server */
+#define HAVE_GMTOFF
+#define HAVE_MMAP
+#define USE_MMAP_FILES
+#define USE_MMAP_SCOREBOARD
+#define MAP_TMPFILE
+#define HAVE_RESOURCE
+#define HAVE_SYS_RESOURCE_H /* apaci should catch this but doesn't */
+#define HAVE_SNPRINTF
+#define JMP_BUF jmp_buf
+#define USE_LONGJMP
+#define USE_FLOCK_SERIALIZED_ACCEPT
+#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
+/*
+ * If you are using APACI, (you should be on Rhapsody) these
+ * values are set at configure time. These are here as reference
cvs commit: apache-1.3 README.NT
fielding98/09/19 23:22:46 Modified:.README.NT Log: Clean up some of the information and merge the warning from WARNING-NT.TXT. Revision ChangesPath 1.12 +33 -21apache-1.3/README.NT Index: README.NT === RCS file: /home/cvs/apache-1.3/README.NT,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- README.NT 1998/05/30 12:57:48 1.11 +++ README.NT 1998/09/20 06:22:46 1.12 @@ -1,61 +1,73 @@ - Apache for Windows - Version 1.3 (and up) +Apache for Windows + Version 1.3 (and up) What is it? --- Apache is an HTTP server, originally designed for Unix systems. This -is the first release of Apache for Windows systems. Like the Unix -version, it includes many frequently requested new features, and has -an API which allows it to be extended to meet users' needs more -easily. It also allows ISAPI extensions. +is the first major release of Apache for Windows systems, including +Microsoft Windows NT, 98, and 95. Like the Unix version, it includes +many frequently requested new features, and has an API that allows it +to be extended to meet users' needs more easily. It also allows ISAPI +extensions. Documentation - The documentation available as of the date of this release is also -included, in HTML format, in the htdocs/manual/ directory. For the -most up-to-date documentation, visit us on the WWW, at -http://www.apache.org/. For Windows specific information, see -http://www.apache.org/docs/windows.html. +included, in HTML format, in the ./htdocs/manual/ directory. +For the most up-to-date documentation, visit us on the WWW at +http://www.apache.org/. For Windows specific information, see +http://www.apache.org/docs/windows.html. WARNING --- -Apache on NT has not yet been optimized for performance. Apache still +Apache on Win32 has not yet been optimized for performance. Apache still performs best, and is most reliable on Unix platforms. Over time we -will improve NT performance. Folks doing comparative reviews of -webserver performance are asked to compare against Apache on a Unix +will improve performance for Windows NT. Folks doing comparative reviews +of webserver performance are asked to compare against Apache on a Unix platform such as Solaris, FreeBSD, or Linux. +Apache on Win32 should still be considered beta quality code. It does not +meet the normal standards of stability and security that Unix releases do. +There is also a much greater chance of security holes being present in the +Win32 version of Apache, due to the frequent discrepancies between the public +documentation for the various Windows system calls and file system types +and the reality of what is included in Windows system software. + Installation or Compilation Instructions -See the file http://www.apache.org/docs/windows.html for details of +See the website http://www.apache.org/docs/windows.html for details of how to install Apache from a binary release or how to compile Apache -from scratch. (This file is also available as -htdocs/manual/windows.html in either a source or binary distribution). +from scratch. This file is also included in the distribution as +./htdocs/manual/windows.html. Known Problems -- +To get information about the current set of known problems, see our +online bug reporting database at http://www.apache.org/bug_report.html. +In particular, search for problem reports under the category os-windows. + +This is a rough list of what we know has not been implemented on Win32. + - The User directive is not supported. If you run apache as a service, you can change the user it runs as by going to Control Panel-Services-Startup - suexec doesn't work -- RFC 1413 not yet ported +- RFC 1413 (IdentityCheck) is not yet ported - If you have a very busy server, when a server child process exits, any connections made to that child process that have not yet been accepted by it are aborted. - -- Problem with very long running cgi scripts (their output is garbled?) -- regex does not generate *.ih headers. +- The regex library build does not generate *.ih headers. -- Multithreadng is not properly abstracted +- Multithreading is not properly abstracted - htpasswd passwords are stored in plain text because Windows lacks a crypt() function
cvs commit: apache-1.3 WARNING-NT.TXT
fielding98/09/19 23:29:57 Removed: .WARNING-NT.TXT Log: Moved to the README.NT, where it belongs.
cvs commit: apache-1.3 STATUS
fielding98/09/23 16:12:41 Modified:.STATUS Log: Update release status and binary table. Revision ChangesPath 1.489 +15 -51apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.488 retrieving revision 1.489 diff -u -r1.488 -r1.489 --- STATUS1998/09/22 18:26:52 1.488 +++ STATUS1998/09/23 23:12:40 1.489 @@ -2,46 +2,11 @@ Release: -1.3.2: In preparation for a release. - - Tarball rolled on .. Mon, 21 Sep 1998 - See: ftp://dev.apache.org/httpd/dist/ - - Release and announcement proposed for Wed, 23 Sep 1998 - - Ralf is the release manager. - - Current test status: - o FreeBSD 2.2.6 .. Ok (Ralf S. Engelschall) - o FreeBSD 2.2.7 .. Ok (Jim Jagielski) - o Debian GNU/Linux 1.3 ... Ok (Ralf S. Engelschall) - o RedHat 4.2 . Ok (Ken Coar) - o RedHat 5.1 . Ok (Shane Owenby) - o HPUX 10.20 . Ok (Ralf S. Engelschall) - o AIX 4.1.5 .. Ok (Jens-Uwe Mager) - o AIX 4.1.5 / gcc 2.7.2.2 Ok (Shane Owenby) - o AIX 4.1.5 / xlC 3.6.4 .. Fails (Shane Owenby) - [KNOWN PROBLEM] - o AIX 4.2.1 .. Ok (Bill Stoddard) - o AIX 4.2.1 / xlC 3.1.4 .. Ok (Shane Owenby) - o AIX 4.3.1 / xlC 3.1.4 .. Ok (Shane Owenby) - o Solaris 2.6 / gcc .. Ok (Ralf S. Engelschall) - o Solaris 2.6 / SPARCWorks compiler .. Ok (Shane Owenby) - o Solaris 2.5 / gcc .. Ok (Roy Fielding) - o Solaris 2.5.1 / gcc Ok (Shane Owenby) - o Solaris 2.5.1 / SPARCWorks comp. ... Ok (Shane Owenby) - o SunOS 4.1.3 Ok (Ralf S. Engelschall) - o Digital Unix 4.0D / gcc DEC C ... Ok (Charles Randall) - o Digital Unix 4.0B / DEC C .. Ok (Charles Randall) - o IRIX 6.2 ... Ok (Dan Jacobowitz) - o OS\2 ... Ok (Brian Havard) - o Windows NT (general) Ok (Bill Stoddard) - o Netwinder .. Fails (Rasmus Lerdorf) - [NOT CRITICAL] - o A/UX 3.1.1 . Ok (Jim Jagielski) -o ReliantUNIX-mips / cc .. Ok (Martin Kraemer) -o SINIX-intel / cc ... Ok (Martin Kraemer) +1.3.3-dev: current +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. - -1.3.0: Tagged and rolled on June 1. Announced and Released on the 6th. +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 @@ -50,10 +15,6 @@ * need to ensure it compiles properly on win32 before rolling the tarball, and that no last minute changes break it -* WARNING-NT.TXT; why did Roy remove it? Either we have to agree to - remove it from the installer, etc. or it has to go back. - Marc: -1 on a release without it without some justification - Documentation that needs writing: * Need a document explaining mod_rewrite/UseCanonicalName off based @@ -64,6 +25,9 @@ Available Patches: +* Earle Ake: Apache 1.3.1 port to Pyramid DC/OSx + [EMAIL PROTECTED] + * Patches for the DSO/mod_perl problem (see below for description): Ralf's [PATCH] Fix module init @@ -491,24 +455,24 @@ for the two stable release versions, and nothing under Old unless the new version just doesn't work on that platform. -1.2.6 1.3.1 Old - aix_4.1N Y 1.2.5, 1.3.0 +1.2.6 1.3.2 Old + aix_4.1N N 1.2.5, 1.3.1 alphalinux N N 1.3.0 aux_3.1N N 1.3.0 decalphaNT N N 1.3b6 - dunix_4.0 N Y 1.2.4, 1.3.0 + dunix_4.0 N N 1.2.4, 1.3.0, 1.3.1 freebsd_2.1N N 1.2.4 freebsd_2.2N N 1.2.5 hpux_10.20 N N 1.2.5 - hpux_11N Y + hpux_11N Y irix_6.2
cvs commit: apache-1.3/src/main http_config.c http_protocol.c
fielding98/09/25 15:45:01
Modified:src/main http_config.c http_protocol.c
Log:
Fix warnings and add error-notes to HTTP_REQUEST_URI_TOO_LARGE.
Revision ChangesPath
1.131 +4 -1 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.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- http_config.c 1998/09/25 15:42:12 1.130
+++ http_config.c 1998/09/25 22:45:00 1.131
@@ -1229,7 +1229,10 @@
filename = ap_make_full_path(r-pool, d, w);
f = ap_pcfg_openfile(r-pool, filename);
}
-if (f) {
+if (!access_name[0]) {
+ dc = NULL;
+}
+else if (f) {
dc = ap_create_per_dir_config(r-pool);
parms.config_file = f;
1.241 +7 -4 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.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- http_protocol.c 1998/09/25 12:27:05 1.240
+++ http_protocol.c 1998/09/25 22:45:00 1.241
@@ -2158,7 +2158,7 @@
case BAD_REQUEST:
ap_bputs(Your browser sent a request that\n, fd);
ap_bputs(this server could not understand.P\n, fd);
- if (error_notes = ap_table_get(r-notes, error-notes) != NULL) {
+ if ((error_notes = ap_table_get(r-notes, error-notes)) != NULL) {
ap_bvputs(fd, error_notes, P\n, NULL);
}
break;
@@ -2195,7 +2195,7 @@
case LENGTH_REQUIRED:
ap_bvputs(fd, A request of the requested method , r-method,
requires a valid Content-length.P\n, NULL);
- if (error_notes = ap_table_get(r-notes, error-notes) != NULL) {
+ if ((error_notes = ap_table_get(r-notes, error-notes)) != NULL) {
ap_bvputs(fd, error_notes, P\n, NULL);
}
break;
@@ -2238,7 +2238,10 @@
break;
case HTTP_REQUEST_URI_TOO_LARGE:
ap_bputs(The requested URL's length exceeds the capacity\n, fd);
- ap_bputs(limit for this server.\n, fd);
+ ap_bputs(limit for this server.P\n, fd);
+ if ((error_notes = ap_table_get(r-notes, error-notes)) != NULL) {
+ ap_bvputs(fd, error_notes, P\n, NULL);
+ }
break;
case HTTP_UNSUPPORTED_MEDIA_TYPE:
ap_bputs(The supplied request data is not in a format\n, fd);
@@ -2263,7 +2266,7 @@
ap_bputs( and inform them of the time the error occurred,\n, fd);
ap_bputs(and anything you might have done that may have\n, fd);
ap_bputs(caused the error.P\n, fd);
- if (error_notes = ap_table_get(r-notes, error-notes) != NULL) {
+ if ((error_notes = ap_table_get(r-notes, error-notes)) != NULL) {
ap_bvputs(fd, error_notes, P\n, NULL);
}
break;
cvs commit: apache-1.3/src/main http_config.c
fielding98/09/25 15:49:39
Modified:src/main http_config.c
Log:
Ooops. Friday it is. Undo last unintended commit.
Revision ChangesPath
1.132 +1 -4 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.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- http_config.c 1998/09/25 22:45:00 1.131
+++ http_config.c 1998/09/25 22:49:38 1.132
@@ -1229,10 +1229,7 @@
filename = ap_make_full_path(r-pool, d, w);
f = ap_pcfg_openfile(r-pool, filename);
}
-if (!access_name[0]) {
- dc = NULL;
-}
-else if (f) {
+if (f) {
dc = ap_create_per_dir_config(r-pool);
parms.config_file = f;
cvs commit: apache-1.3/src CHANGES
fielding98/09/25 16:24:19 Modified:src CHANGES Log: Add log entry for the save errno fix that we both committed at the same time. Revision ChangesPath 1.1080+4 -2 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1079 retrieving revision 1.1080 diff -u -r1.1079 -r1.1080 --- CHANGES 1998/09/25 17:17:52 1.1079 +++ CHANGES 1998/09/25 23:24:18 1.1080 @@ -1,7 +1,9 @@ Changes with Apache 1.3.3 - *) Non-existant .htaccess files being returned as FORBIDDEN instead - of not-existing. [Roy Fielding] + *) The ap_pfopen and ap_pfdopen routines were failing to protect the + errno on an error, which leads to one error being mistaken for + another when reading non-existant .htaccess files. + [Jim Jagielski, Roy Fielding] *) OS/2: The new header tests get things right, need to update ap_config.h. [Brian Havard]
cvs commit: apache-1.3/src/main http_config.c
fielding98/09/25 17:07:09
Modified:src CHANGES
src/main http_config.c
Log:
Reconstructed the loop through multiple htaccess file names so
that missing files are not confused with unreadable files.
Revision ChangesPath
1.1081+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1080
retrieving revision 1.1081
diff -u -r1.1080 -r1.1081
--- CHANGES 1998/09/25 23:24:18 1.1080
+++ CHANGES 1998/09/26 00:07:06 1.1081
@@ -1,5 +1,9 @@
Changes with Apache 1.3.3
+ *) Reconstructed the loop through multiple htaccess file names so
+ that missing files are not confused with unreadable files.
+ [Roy Fielding]
+
*) The ap_pfopen and ap_pfdopen routines were failing to protect the
errno on an error, which leads to one error being mistaken for
another when reading non-existant .htaccess files.
1.134 +33 -35apache-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.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- http_config.c 1998/09/25 23:39:50 1.133
+++ http_config.c 1998/09/26 00:07:08 1.134
@@ -1206,7 +1206,7 @@
char *filename = NULL;
const struct htaccess_result *cache;
struct htaccess_result *new;
-void *dc;
+void *dc = NULL;
/* firstly, search cache */
for (cache = r-htaccess; cache != NULL; cache = cache-next)
@@ -1224,41 +1224,39 @@
parms.path = ap_pstrdup(r-pool, d);
/* 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;
-}
-else {
- if (errno == ENOENT || errno == ENOTDIR)
- dc = NULL;
- else {
- ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
- %s pcfg_openfile: unable to check htaccess file,
- ensure it is readable,
- filename);
- ap_table_setn(r-notes, error-notes,
- Server unable to read htaccess file, denying
- access to be safe);
- return HTTP_FORBIDDEN;
- }
+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,
+ ensure it is readable,
+ filename);
+ap_table_setn(r-notes, error-notes,
+ Server unable to read htaccess file, denying
+ access to be safe);
+return HTTP_FORBIDDEN;
+}
}
/* cache it */
cvs commit: apache-devsite mmn.txt.asis index.html mmn.txt
fielding98/10/03 03:03:22 Modified:.index.html Added: .mmn.txt.asis Removed: .mmn.txt Log: The table of module magic number values has been moved inside ap_mmn.h, so forward developers there rather than keep a duplicate copy. Revision ChangesPath 1.25 +1 -2 apache-devsite/index.html Index: index.html === RCS file: /export/home/cvs/apache-devsite/index.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- index.html1998/08/03 14:48:27 1.24 +++ index.html1998/10/03 10:03:21 1.25 @@ -95,9 +95,8 @@ (last modified on !--#flastmod virtual=todo.html --) /LI LIRecord of changes to the - A HREF=mmn.txtmodule magic number/A + A HREF=http://www.apache.org/websrc/cvsweb.cgi/apache-1.3/src/include/ap_mmn.h;module magic number/A BR - (last modified on !--#flastmod virtual=mmn.txt --) /LI /UL 1.1 apache-devsite/mmn.txt.asis Index: mmn.txt.asis === Status: 200 OK Content-type: text/html !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTML HEAD TITLEModule Magic Number/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF H1Module Magic Number/H1 The table of module magic numbers has been moved to the include file PRE a href=http://www.apache.org/websrc/cvsweb.cgi/apache-1.3/src/include/ap_mmn.h;src/include/ap_mmn.h/a /PRE distributed with the Apache HTTP Server source code. /BODY /HTML
cvs commit: apache-1.3/src/include ap_config.h
fielding98/10/03 03:46:51 Modified:src CHANGES src/include ap_config.h Log: Remove extra HAVE_SYS_RESOURCE_H define for RHAPSODY since it is now taken care of properly by the header file tests. Submitted by: Wilfredo Sanchez [EMAIL PROTECTED] Reviewed by: Roy Fielding Revision ChangesPath 1.1088+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1087 retrieving revision 1.1088 diff -u -r1.1087 -r1.1088 --- CHANGES 1998/10/02 02:06:14 1.1087 +++ CHANGES 1998/10/03 10:46:49 1.1088 @@ -1,5 +1,9 @@ Changes with Apache 1.3.3 + *) PORT: Remove extra HAVE_SYS_RESOURCE_H define for RHAPSODY since + it is now taken care of properly by the header file tests. + [Wilfredo Sanchez [EMAIL PROTECTED]] + *) Fix problem with scripts and finehandle inheritance on Win32. [Ken Parzygnat [EMAIL PROTECTED]] PR#2884, 2910 1.238 +0 -1 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- ap_config.h 1998/09/29 01:22:57 1.237 +++ ap_config.h 1998/10/03 10:46:50 1.238 @@ -372,7 +372,6 @@ #define USE_MMAP_SCOREBOARD #define MAP_TMPFILE #define HAVE_RESOURCE -#define HAVE_SYS_RESOURCE_H /* apaci should catch this but doesn't */ #define HAVE_SNPRINTF #define JMP_BUF jmp_buf #define USE_LONGJMP
cvs commit: apache-1.3/src CHANGES
fielding98/10/03 04:04:45 Modified:src CHANGES Log: Quote paths in default configuration files. Submitted by: Wilfredo Sanchez [EMAIL PROTECTED] Reviewed by: Roy Fielding, Ralf S. Engelschall Revision ChangesPath 1.1089+2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1088 retrieving revision 1.1089 diff -u -r1.1088 -r1.1089 --- CHANGES 1998/10/03 10:46:49 1.1088 +++ CHANGES 1998/10/03 11:04:43 1.1089 @@ -1,5 +1,7 @@ Changes with Apache 1.3.3 + *) Quote paths in default configuration files. [Wilfredo Sanchez] + *) PORT: Remove extra HAVE_SYS_RESOURCE_H define for RHAPSODY since it is now taken care of properly by the header file tests. [Wilfredo Sanchez [EMAIL PROTECTED]]
cvs commit: apache-1.3/conf access.conf-dist highperformance.conf-dist httpd.conf-dist srm.conf-dist
fielding98/10/03 04:05:07 Modified:conf access.conf-dist highperformance.conf-dist httpd.conf-dist srm.conf-dist Log: Quote paths in default configuration files. Submitted by: Wilfredo Sanchez [EMAIL PROTECTED] Reviewed by:Roy Fielding, Ralf S. Engelschall Revision ChangesPath 1.16 +2 -2 apache-1.3/conf/access.conf-dist Index: access.conf-dist === RCS file: /home/cvs/apache-1.3/conf/access.conf-dist,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- access.conf-dist 1998/09/03 18:04:08 1.15 +++ access.conf-dist 1998/10/03 11:05:05 1.16 @@ -25,7 +25,7 @@ # This should be changed to whatever you set DocumentRoot to. -Directory @@ServerRoot@@/htdocs +Directory @@ServerRoot@@/htdocs # This may also be None, All, or any combination of Indexes, # Includes, FollowSymLinks, ExecCGI, or MultiViews. @@ -51,7 +51,7 @@ # @@ServerRoot@@/cgi-bin should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. -Directory @@ServerRoot@@/cgi-bin +Directory @@ServerRoot@@/cgi-bin AllowOverride None Options None /Directory 1.2 +1 -1 apache-1.3/conf/highperformance.conf-dist Index: highperformance.conf-dist === RCS file: /home/cvs/apache-1.3/conf/highperformance.conf-dist,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- highperformance.conf-dist 1998/03/13 01:32:33 1.1 +++ highperformance.conf-dist 1998/10/03 11:05:05 1.2 @@ -43,7 +43,7 @@ /Directory # If this was a real internet server you'd probably want to uncomment this: -#Directory @@ServerRoot@@/htdocs +#Directory @@ServerRoot@@/htdocs #order allow,deny #allow from all #/Directory 1.31 +1 -1 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- httpd.conf-dist 1998/09/12 20:16:50 1.30 +++ httpd.conf-dist 1998/10/03 11:05:05 1.31 @@ -63,7 +63,7 @@ # mounted filesystem then please read the LockFile documentation, # you will save yourself a lot of trouble. -ServerRoot @@ServerRoot@@ +ServerRoot @@ServerRoot@@ # BindAddress: You can support virtual hosts with this option. This option # is used to tell the server which IP address to listen to. It can either 1.27 +4 -4 apache-1.3/conf/srm.conf-dist Index: srm.conf-dist === RCS file: /home/cvs/apache-1.3/conf/srm.conf-dist,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- srm.conf-dist 1998/08/30 21:47:08 1.26 +++ srm.conf-dist 1998/10/03 11:05:06 1.27 @@ -12,12 +12,12 @@ # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. -DocumentRoot @@ServerRoot@@/htdocs +DocumentRoot @@ServerRoot@@/htdocs # UserDir: The name of the directory which is appended onto a user's home # directory if a ~user request is recieved. -UserDir public_html +UserDir @@UserDir@@ # DirectoryIndex: Name of the file or files to use as a pre-written HTML # directory index. Separate multiple entries with spaces. @@ -152,12 +152,12 @@ # require it to be present in the URL. So /icons isn't aliased in this # example. -Alias /icons/ @@ServerRoot@@/icons/ +Alias /icons/ @@ServerRoot@@/icons/ # ScriptAlias: This controls which directories contain server scripts. # Format: ScriptAlias fakename realname -#ScriptAlias /cgi-bin/ @@ServerRoot@@/cgi-bin/ +ScriptAlias /cgi-bin/ @@ServerRoot@@/cgi-bin/ # If you want to use server side includes, or CGI outside # ScriptAliased directories, uncomment the following lines.
cvs commit: apache-1.3/conf srm.conf-dist
fielding98/10/03 04:13:31 Modified:conf srm.conf-dist Log: @@UserDir@@ does not exist, so back that part of last patch out. Revision ChangesPath 1.28 +1 -1 apache-1.3/conf/srm.conf-dist Index: srm.conf-dist === RCS file: /home/cvs/apache-1.3/conf/srm.conf-dist,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- srm.conf-dist 1998/10/03 11:05:06 1.27 +++ srm.conf-dist 1998/10/03 11:13:31 1.28 @@ -17,7 +17,7 @@ # UserDir: The name of the directory which is appended onto a user's home # directory if a ~user request is recieved. -UserDir @@UserDir@@ +UserDir public_html # DirectoryIndex: Name of the file or files to use as a pre-written HTML # directory index. Separate multiple entries with spaces.
cvs commit: apache-1.3 STATUS
fielding98/10/03 04:42:04 Modified:.STATUS Log: remove duplicate entry, update others Revision ChangesPath 1.498 +16 -26apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.497 retrieving revision 1.498 diff -u -r1.497 -r1.498 --- STATUS1998/09/30 15:48:06 1.497 +++ STATUS1998/10/03 11:42:03 1.498 @@ -26,6 +26,10 @@ Available Patches: +* Wilfredo Sanchez's [PATCH] Build outside of source tree +Message-ID: [EMAIL PROTECTED] +Status: Ralf +1 (conceptual, with question) + * Patches for the DSO/mod_perl problem (see below for description): Ralf's [PATCH] Fix module init @@ -35,13 +39,6 @@ Message-ID: [EMAIL PROTECTED] Status: Ralf +1, Lars +1 -* Ralf's [PATCH] Fix module init - This fixes the mod_so/mod_perl problems described under FINAL RELEASE - SHOWSTOPPERS by doing a more correct init of the modules after loading - through two new core API functions. - Message-ID: [EMAIL PROTECTED] - Status: Ralf +1, Lars +1 - * Paul's patch to add integrated restart/shutdown signalling (Win32) This patch make Apache listen on predictable event names to allow restarts and shutdowns to be initiated. Also adds a new command line @@ -52,17 +49,14 @@ Martin +1 (on concept; the restart switches could be added to the unix version, too) -* Lars' patch to work around a Navigator/Mozilla bug when mod_proxy - is used (broken images). - (Marc doesn't like it and I don't like it either, but people will - blame Apache for it, so...) - Message-ID: [EMAIL PROTECTED] - In progress: * Ken's IndexFormat enhancement to mod_autoindex to allow CustomLog-like tailoring of directory listing formats +* Roy is working on the 100 Continue problem with calls to + ap_discard_request_body() + Needs patch: * Ralf: mod_so doesn't correctly initialise modules. For instance @@ -123,6 +117,13 @@ * proxy_*_canon routines use r-proxyreq incorrectly. See [EMAIL PROTECTED] +* work around a Navigator/Mozilla bug when mod_proxy is used + (broken images). + Message-ID: [EMAIL PROTECTED] +Status: Lars' patch was vetoed. Roy and Dean think that it is +probably another buffer magic number error and should be +tested to find out and, if so, fixed like it was in core. + Open issues: * Underscores on symbols in DSO situation is broken for NetBSD: @@ -274,6 +275,8 @@ Help: +* proxy module doesn't load on Win95. Why? Good question. PR#1462. + * Directory /, Directory C:/ both fail to do anything, while Directory * SEGVs. @@ -382,16 +385,6 @@ Delayed until after 1.3.2, unless someone happens to get to it: -* Arnt Gulbrandsen [EMAIL PROTECTED] 03 Apr 1998 21:28:17 +0200 - [EMAIL PROTECTED] mod_usertrack.c patch: - The patch provides per-domain cookies (which I use to share user-ids - among the *.troll.no web servers) and configurable cookie names. It - also marginally increases the efficiency of Apache when the server - runs with DNS lookups turned off. - - Update: Dean found one part of the patch unacceptable, Arnt is in -the process of updating it. - * TZ should not be dealt with specially any longer now that we have PassEnv. See [EMAIL PROTECTED] @@ -402,9 +395,6 @@ unless we warn people in big nasty letters to add PassEnv TZ to their config files just in case and hope they do it :) - -* proxy module doesn't load on Win95. Why? Good question. - PR#1462. * In ap_bclose() there's no test that (fb-fd != -1) -- so it's possible that it'll do something completely bogus when it's
cvs commit: apache-1.3 STATUS
fielding98/10/03 05:11:24 Modified:.STATUS Log: remember that mime.types thing Revision ChangesPath 1.499 +5 -0 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.498 retrieving revision 1.499 diff -u -r1.498 -r1.499 --- STATUS1998/10/03 11:42:03 1.498 +++ STATUS1998/10/03 12:11:22 1.499 @@ -26,6 +26,11 @@ Available Patches: +* Manoj's [PATCH] mime.types update +Message-ID: [EMAIL PROTECTED] +Status: Roy thinks we should put a common_mime_types.txt file in +the documentation and remove the unused entries from conf. + * Wilfredo Sanchez's [PATCH] Build outside of source tree Message-ID: [EMAIL PROTECTED] Status: Ralf +1 (conceptual, with question)
cvs commit: apache-1.3 README.NT
fielding98/10/03 05:25:54 Modified:.README.NT Log: Remove the bits that Ben Hyde objected to. Revision ChangesPath 1.13 +0 -4 apache-1.3/README.NT Index: README.NT === RCS file: /home/cvs/apache-1.3/README.NT,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- README.NT 1998/09/20 06:22:46 1.12 +++ README.NT 1998/10/03 12:25:53 1.13 @@ -31,10 +31,6 @@ Apache on Win32 should still be considered beta quality code. It does not meet the normal standards of stability and security that Unix releases do. -There is also a much greater chance of security holes being present in the -Win32 version of Apache, due to the frequent discrepancies between the public -documentation for the various Windows system calls and file system types -and the reality of what is included in Windows system software. Installation or Compilation Instructions
cvs commit: apache-1.3/src/main buff.c
fielding98/10/05 10:48:45
Modified:src CHANGES
src/main buff.c
Log:
Fix a possible race condition between timed-out requests and the
ap_bhalfduplex select that might result in an infinite loop on
platforms that do not validate the descriptor.
Revision ChangesPath
1.1101+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1100
retrieving revision 1.1101
diff -u -r1.1100 -r1.1101
--- CHANGES 1998/10/04 19:05:13 1.1100
+++ CHANGES 1998/10/05 17:48:42 1.1101
@@ -1,5 +1,9 @@
Changes with Apache 1.3.3
+ *) Fix a possible race condition between timed-out requests and the
+ ap_bhalfduplex select that might result in an infinite loop on
+ platforms that do not validate the descriptor. [Roy Fielding]
+
*) Fix mod_autoindex bug where directories got a size of 0k instead
of -. [Martin Plechsmid [EMAIL PROTECTED], Marc Slemko]
PR#3130
1.83 +12 -3 apache-1.3/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-1.3/src/main/buff.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- buff.c1998/09/04 16:47:46 1.82
+++ buff.c1998/10/05 17:48:44 1.83
@@ -562,14 +562,22 @@
#endif
-/* note we assume the caller has ensured that fb-fd_in = FD_SETSIZE */
+/* Test the descriptor and flush the output buffer if it looks like
+ * we will block on the next read.
+ *
+ * Note we assume the caller has ensured that fb-fd_in = FD_SETSIZE
+ */
API_EXPORT(void) ap_bhalfduplex(BUFF *fb)
{
int rv;
fd_set fds;
struct timeval tv;
-if (fb-incnt 0 || fb-outcnt == 0) {
+/* We don't need to do anything if the connection has been closed
+ * or there is something readable in the incoming buffer
+ * or there is nothing flushable in the output buffer.
+ */
+if (fb == NULL || fb-fd_in 0 || fb-incnt 0 || fb-outcnt == 0) {
return;
}
/* test for a block */
@@ -579,7 +587,8 @@
tv.tv_sec = 0;
tv.tv_usec = 0;
rv = ap_select(fb-fd_in + 1, fds, NULL, NULL, tv);
-} while (rv 0 errno == EINTR);
+} while (rv 0 errno == EINTR !(fb-flags B_EOUT));
+
/* treat any error as if it would block as well */
if (rv != 1) {
ap_bflush(fb);
cvs commit: apache-1.3/conf srm.conf-dist
fielding98/10/05 10:53:35 Modified:conf srm.conf-dist Log: The ScriptAlias line was accidentally uncommented by Wilfredo's patch. Revision ChangesPath 1.29 +1 -1 apache-1.3/conf/srm.conf-dist Index: srm.conf-dist === RCS file: /home/cvs/apache-1.3/conf/srm.conf-dist,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- srm.conf-dist 1998/10/03 11:13:31 1.28 +++ srm.conf-dist 1998/10/05 17:53:34 1.29 @@ -157,7 +157,7 @@ # ScriptAlias: This controls which directories contain server scripts. # Format: ScriptAlias fakename realname -ScriptAlias /cgi-bin/ @@ServerRoot@@/cgi-bin/ +#ScriptAlias /cgi-bin/ @@ServerRoot@@/cgi-bin/ # If you want to use server side includes, or CGI outside # ScriptAliased directories, uncomment the following lines.
cvs commit: apache-1.3/src/main http_protocol.c
fielding98/10/05 15:11:17
Modified:src CHANGES
src/include httpd.h
src/main http_protocol.c
Log:
Added new HTTP status codes and default response bodies from the
revised HTTP/1.1 (307, 416, 417), WebDAV (102, 207, 422, 423), and
HTTP Extension Framework (510) specifications. Did not add the
WebDAV 424 and 425 codes because they are bogus. We don't use any
of these codes yet, but they are now available to 3rd-party modules.
Revision ChangesPath
1.1102+7 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1101
retrieving revision 1.1102
diff -u -r1.1101 -r1.1102
--- CHANGES 1998/10/05 17:48:42 1.1101
+++ CHANGES 1998/10/05 22:11:14 1.1102
@@ -1,5 +1,12 @@
Changes with Apache 1.3.3
+ *) Added new HTTP status codes and default response bodies from the
+ revised HTTP/1.1 (307, 416, 417), WebDAV (102, 207, 422, 423), and
+ HTTP Extension Framework (510) specifications. Did not add the
+ WebDAV 424 and 425 codes because they are bogus. We don't use any
+ of these codes yet, but they are now available to 3rd-party modules.
+ [Roy Fielding]
+
*) Fix a possible race condition between timed-out requests and the
ap_bhalfduplex select that might result in an infinite loop on
platforms that do not validate the descriptor. [Roy Fielding]
1.245 +13 -1 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.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- httpd.h 1998/09/21 19:44:12 1.244
+++ httpd.h 1998/10/05 22:11:16 1.245
@@ -443,10 +443,15 @@
/* --- HTTP Status Codes - */
-#define RESPONSE_CODES 38
+/* The size of the static array in http_protocol.c for storing
+ * all of the potential response status-lines (a sparse table).
+ * A future version should dynamically generate the table at startup.
+ */
+#define RESPONSE_CODES 54
#define HTTP_CONTINUE 100
#define HTTP_SWITCHING_PROTOCOLS 101
+#define HTTP_PROCESSING102
#define HTTP_OK200
#define HTTP_CREATED 201
#define HTTP_ACCEPTED 202
@@ -454,12 +459,14 @@
#define HTTP_NO_CONTENT204
#define HTTP_RESET_CONTENT 205
#define HTTP_PARTIAL_CONTENT 206
+#define HTTP_MULTI_STATUS 207
#define HTTP_MULTIPLE_CHOICES 300
#define HTTP_MOVED_PERMANENTLY 301
#define HTTP_MOVED_TEMPORARILY 302
#define HTTP_SEE_OTHER 303
#define HTTP_NOT_MODIFIED 304
#define HTTP_USE_PROXY 305
+#define HTTP_TEMPORARY_REDIRECT307
#define HTTP_BAD_REQUEST 400
#define HTTP_UNAUTHORIZED 401
#define HTTP_PAYMENT_REQUIRED 402
@@ -476,6 +483,10 @@
#define HTTP_REQUEST_ENTITY_TOO_LARGE 413
#define HTTP_REQUEST_URI_TOO_LARGE 414
#define HTTP_UNSUPPORTED_MEDIA_TYPE415
+#define HTTP_RANGE_NOT_SATISFIABLE 416
+#define HTTP_EXPECTATION_FAILED417
+#define HTTP_UNPROCESSABLE_ENTITY 422
+#define HTTP_LOCKED423
#define HTTP_INTERNAL_SERVER_ERROR 500
#define HTTP_NOT_IMPLEMENTED 501
#define HTTP_BAD_GATEWAY 502
@@ -483,6 +494,7 @@
#define HTTP_GATEWAY_TIME_OUT 504
#define HTTP_VERSION_NOT_SUPPORTED 505
#define HTTP_VARIANT_ALSO_VARIES 506
+#define HTTP_NOT_EXTENDED 510
#define DOCUMENT_FOLLOWSHTTP_OK
#define PARTIAL_CONTENT HTTP_PARTIAL_CONTENT
1.242 +65 -26apache-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.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- http_protocol.c 1998/09/25 22:45:00 1.241
+++ http_protocol.c 1998/10/05 22:11:16 1.242
@@ -988,7 +988,8 @@
static char *status_lines[] = {
100 Continue,
101 Switching Protocols,
-#define LEVEL_200 2
+102 Processing,
+#define LEVEL_200 3
200 OK,
201 Created,
202 Accepted,
@@ -996,14 +997,17 @@
204 No Content,
205 Reset Content,
206 Partial Content,
-#define LEVEL_300 9
+207 Multi-Status,
+#define
cvs commit: apache-1.3 STATUS
fielding98/10/05 15:34:30 Modified:.STATUS Log: Remove note about HTTP status codes (done) and move the general stuff in the postponed category back up to the general category. Revision ChangesPath 1.501 +52 -55apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.500 retrieving revision 1.501 diff -u -r1.500 -r1.501 --- STATUS1998/10/05 10:55:12 1.500 +++ STATUS1998/10/05 22:34:28 1.501 @@ -261,6 +261,58 @@ * Should we re-enable nagle now that we're non-buffering CGIs? See various messages from Marc in March 98. +* TZ should not be dealt with specially any longer now that we have + PassEnv. See + [EMAIL PROTECTED] + Jim: IMO it's too late in the game for this... I'm +sure this would cause some strange bug reports as + people's cgi-scripts no longer work correctly + (It worked just fine before I upgraded to 1.3.0) + unless we warn people in big nasty letters to add + PassEnv TZ to their config files just in case + and hope they do it :) + +* In ap_bclose() there's no test that (fb-fd != -1) -- so it's + possible that it'll do something completely bogus when it's + used for read-only things. - Dean Gaudet + +* ap_pcfg_openfile doesn't use pfopen() to open the file. Consider + .htaccess parsing, if a timeout occurs the file may not be closed. I + can't imagine that a timeout would be set during this stage... but it'd + probably be good to just clean this up. - Dean Gaudet + +* Okay, so our negotiation strategy needs a bit of refinement. See + [EMAIL PROTECTED]. + In general, we need to go through and clean up the negotiation + module to make it compliant with the final HTTP/1.1 draft, and at the + very least we should make it more copacetic to the idea of transferring + gzipped variants of files when both variants exist on the server. + +* Roy's HTTP/1.1 Wishlist items: +1) Expect +2) byte range error handling +3) update the Accept-Encoding parser to allow q-values + +* use of spawnvp in uncompress_child in mod_mime_magic - doesn't + use the new child_info structure, is this still safe? Needs to be + looked at. + +* suexec doesn't understand argv parameters; e.g. + +!--#exec cmd=./ls -l -- + + fails even when ls is in the same directory because suexec is trying + to stat a file called ls -l. A patch for this is available at + +http://www.xnet.com/~emarshal/suexec.diff + + and it's not bad except that it doesn't handle programs with spaces in + the filename (think win32, or samba-mounted filesystems). There are + several PR's to this and I don't see for security reasons why we can't + accomodate it, though it does add complexity to suexec.c. + PR #1120 + Brian: +1 + Win32 specific issues: Important @@ -390,61 +442,6 @@ * apparently either BrowserMatch or the nokeepalive variable cause instability - see PR#1729. - -Delayed until after 1.3.2, unless someone happens to get to it: - -* TZ should not be dealt with specially any longer now that we have - PassEnv. See - [EMAIL PROTECTED] - Jim: IMO it's too late in the game for this... I'm -sure this would cause some strange bug reports as - people's cgi-scripts no longer work correctly - (It worked just fine before I upgraded to 1.3.0) - unless we warn people in big nasty letters to add - PassEnv TZ to their config files just in case - and hope they do it :) - -* In ap_bclose() there's no test that (fb-fd != -1) -- so it's - possible that it'll do something completely bogus when it's - used for read-only things. - Dean Gaudet - -* ap_pcfg_openfile doesn't use pfopen() to open the file. Consider - .htaccess parsing, if a timeout occurs the file may not be closed. I - can't imagine that a timeout would be set during this stage... but it'd - probably be good to just clean this up. - Dean Gaudet - -* Okay, so our negotiation strategy needs a bit of refinement. See - [EMAIL PROTECTED]. - In general, we need to go through and clean up the negotiation - module to make it compliant with the final HTTP/1.1 draft, and at the - very least we should make it more copacetic to the idea of transferring - gzipped variants of files when both variants exist on the server. - -* Roy's HTTP/1.1 Wishlist items: -1) New status codes? -2) Expect -3) byte range error handling
cvs commit: apache-1.3/src/main http_protocol.c http_request.c
fielding98/10/06 12:06:11
Modified:src CHANGES
src/include httpd.h
src/main http_protocol.c http_request.c
Log:
Added a complete implementation of the Expect header field as
specified in rev-05 of HTTP/1.1. Used that implementation as a means
of disabling the 100 Continue response when we already know the final
status, which is mighty useful for PUT responses that result in 302 or 401.
Moved two ugly protocol condition checks that were in http_request.c
over to where they belong in http_protocol.c. They were put there
originally because ap_read_request formerly could not return an
error response, but I added that capability in 1.3.2.
Added removal of extra trailing whitespace from the getline results as part
of the protocol processing, which is extra nice because it works
between continuation lines, is almost no cost in the normal case
of no extra whitespace, and saves memory.
Revision ChangesPath
1.1103+10 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1102
retrieving revision 1.1103
diff -u -r1.1102 -r1.1103
--- CHANGES 1998/10/05 22:11:14 1.1102
+++ CHANGES 1998/10/06 19:06:06 1.1103
@@ -1,5 +1,15 @@
Changes with Apache 1.3.3
+ *) Added a complete implementation of the Expect header field as
+ specified in rev-05 of HTTP/1.1. Disabled the 100 Continue
+ response when we already know the final status, which is mighty
+ useful for PUT responses that result in 302 or 401. [Roy Fielding]
+
+ *) Remove extra trailing whitespace from the getline results as part
+ of the protocol processing, which is extra nice because it works
+ between continuation lines, is almost no cost in the normal case
+ of no extra whitespace, and saves memory. [Roy Fielding]
+
*) Added new HTTP status codes and default response bodies from the
revised HTTP/1.1 (307, 416, 417), WebDAV (102, 207, 422, 423), and
HTTP Extension Framework (510) specifications. Did not add the
1.246 +7 -0 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- httpd.h 1998/10/05 22:11:16 1.245
+++ httpd.h 1998/10/06 19:06:08 1.246
@@ -752,6 +752,13 @@
* that way, a sub request's list can (temporarily) point to a parent's list
*/
const struct htaccess_result *htaccess;
+
+/* Things placed at the end of the record to avoid breaking binary
+ * compatibility. It would be nice to remember to reorder the entire
+ * record to improve 64bit alignment the next time we need to break
+ * binary compatibility for some other reason.
+ */
+unsigned expecting_100; /* is client waiting for a 100 response? */
};
1.243 +93 -13apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- http_protocol.c 1998/10/05 22:11:16 1.242
+++ http_protocol.c 1998/10/06 19:06:09 1.243
@@ -551,6 +551,17 @@
total += retval;/* and how long s has become */
if (*pos == '\n') { /* Did we get a full line of input?*/
+/*
+ * Trim any extra trailing spaces or tabs except for the first
+ * space or tab at the beginning of a blank string. This makes
+ * it much easier to check field values for exact matches, and
+ * saves memory as well. Terminate string at end of line.
+ */
+while (pos (s + 1) (*(pos - 1) == ' ' || *(pos - 1) ==
'\t')) {
+--pos; /* trim extra trailing spaces or tabs */
+--total;/* but not one at the beginning of line*/
+++n;
+}
*pos = '\0';
--total;
++n;
@@ -767,8 +778,6 @@
while (*value == ' ' || *value == '\t')
++value;/* Skip to start of value */
-/* XXX: should strip trailing whitespace as well */
-
ap_table_addn(tmp_headers, copy, value);
}
@@ -778,8 +787,9 @@
request_rec *ap_read_request(conn_rec *conn)
{
request_rec *r;
-int access_status;
pool *p;
+const char *expect;
+int access_status;
p = ap_make_sub_pool(conn-pool);
r = ap_pcalloc(p, sizeof(request_rec));
@@ -846,6
cvs commit: apache-1.3 Announcement
fielding98/10/06 13:29:41 Modified:.Announcement Log: Minor rewording and mention HTTP/1.1 revision stuff. Revision ChangesPath 1.39 +17 -13apache-1.3/Announcement Index: Announcement === RCS file: /home/cvs/apache-1.3/Announcement,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- Announcement 1998/10/06 20:12:43 1.38 +++ Announcement 1998/10/06 20:29:39 1.39 @@ -4,17 +4,21 @@ The Apache Group is pleased to announce the release of version 1.3.3 of the Apache HTTP server. -This new Apache version is mainly a bugfix release. In the previous -1.3.2 release, server error reporting was seriously broken. This -affected the functionality of most custom ErrorDocuments and of modules -such as mod_speling. Additionally, changes in this release consist of -new supported platforms, Win32 and Unix portability fixes, ErrorDocument -environment enhancements, incorrect error reporting of non-existant -.htaccess files and assorted other features or fixes. Users should -review the CHANGES file and decide on their upgrade plans; We consider -Apache 1.3.3 to be the most stable version of Apache available and we -strongly recommend that users of older versions, especially of the 1.1.x -and 1.2.x family, upgrade as soon as possible. +This new Apache version is a bugfix release, primarily to fix a +serious problem with server error reporting introduced in 1.3.2. +This affected the functionality of most custom ErrorDocuments and +of some modules that depend on special error output (e.g., mod_speling). +A side-effect bug that resulted in incorrect error reporting of +nonexistent .htaccess files has also been fixed. + +Additional changes in this release consist of new supported platforms, +Win32 and Unix portability fixes, ErrorDocument environment enhancements, +improved protocol behavior to match the HTTP/1.1 revised specification, +and assorted other features or fixes. Users should review the CHANGES file +and decide on their upgrade plans. We consider Apache 1.3.3 to be the +most stable version of Apache available and we strongly recommend that +users of older versions, especially of the 1.1.x and 1.2.x family, upgrade +as soon as possible. Apache 1.3.3 is available for download from @@ -46,5 +50,5 @@ Win32 stability or security problems do not impact, in any way, Apache on other platforms. With the continued donation of time and resources by individuals and companies, we hope that the Win32 -version of Apache will grow stronger through the 1.3.x release -cycle. +version of Apache will grow stronger through the 1.3.x release cycle. +
cvs commit: apache-1.3 STATUS
fielding98/10/06 13:46:34 Modified:.STATUS Log: Remove things done today and increase priority of binary build discussion. Revision ChangesPath 1.503 +44 -55apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.502 retrieving revision 1.503 diff -u -r1.502 -r1.503 --- STATUS1998/10/05 23:04:28 1.502 +++ STATUS1998/10/06 20:46:32 1.503 @@ -18,6 +18,48 @@ * need to ensure it compiles properly on win32 before rolling the tarball, and that no last minute changes break it +* How should an Apache binary release tarball look? + + 1. The old way where it is just a source release tarball + plus a pre-compiled src/httpd-gnutriple. It is created + via the apache-devsite/binbuild.sh script which + - creates the build tree + - creates the src/Configuration file with standard modules + - runs make + - renames src/httpd to src/httpd-gnutriple + - runs make clean + - packs the build tree stuff together + Already known discussion points: + - should src/httpd be renamed or now because a lot + of PRs say they cannot find the httpd :-( + Status: Ralf -0, Ken +0 + + 2. The way other projects release binary tarballs, i.e. + a package containing the installed (binary) files. + It can be created by a script which + - creates the build tree + - runs ./configure --prefix=/usr/local/apache \ + --enable-shared=remain \ + --disable-module=auth_db \ + --enable-suexec ... + - runs make install root=apache-root + - packs the stuff together from ./apache-root only!! + Already known discussion points: + - should there be a prefix usr/local/apache in + the tarball or not? Some people think + it's useful while others dislike it a lot. + - it doesn't include the source. + - should suexec be prebuilt in a binary tarball? + Status: Ralf +1, Martin +1, Ken -1 (not a veto), Roy -1 + + 3. A source release tarball with three extra directories: +lib: for the shared library object files +bin: for the httpd and support executables +man: for the man files (if desired) + as if the server was installed in those directories. + Status: Roy +1 + + Documentation that needs writing: * Need a document explaining mod_rewrite/UseCanonicalName off based @@ -47,24 +89,11 @@ Message-ID: [EMAIL PROTECTED] Status: Ralf +1, Lars +1 -* Paul's patch to add integrated restart/shutdown signalling (Win32) - This patch make Apache listen on predictable event names to allow - restarts and shutdowns to be initiated. Also adds a new command line - option to send the shutdown or restart signal to the running parent - process. - Message-ID: [EMAIL PROTECTED] - Status: Ken +1 (on concept), Lars +1 (on concept), Jim +1 (concept) - Martin +1 (on concept; the restart switches could -be added to the unix version, too) - In progress: * Ken's IndexFormat enhancement to mod_autoindex to allow CustomLog-like tailoring of directory listing formats -* Roy is working on the 100 Continue problem with calls to - ap_discard_request_body() - Needs patch: * Ralf: mod_so doesn't correctly initialise modules. For instance @@ -147,45 +176,6 @@ You can differentiate by comparing the output of `uname -m' with any of: alpha bebox macppc newsmips ofppc pica pmax sparc64. -* How should an Apache binary release tarball look? - NOTE: This should be resolved before 1.3.3 !! - - 1. The old way where it is just a source release tarball - plus a pre-compiled src/httpd-gnutriple. It is created - via the apache-devsite/binbuild.sh script which - - creates the build tree - - creates the src/Configuration file with standard modules - - runs make - - renames src/httpd to src/httpd-gnutriple - - runs make clean - - packs the build tree stuff together - Already known discussion points: - - should src/httpd be renamed or now because a lot - of PRs say they cannot find the httpd :-( - Pros: gets filled tomorrow - Cons: gets filled tomorrow - Status: Ralf -0, Ken +0 - - 2. The way other projects release binary tarballs, i.e. - a package containing the installed (binary) files. - It can
cvs commit: apache-1.3 STATUS
fielding98/10/06 13:59:05 Modified:.STATUS Log: Point to Harrie's patch (Jim must have missed it) Revision ChangesPath 1.504 +7 -0 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.503 retrieving revision 1.504 diff -u -r1.503 -r1.504 --- STATUS1998/10/06 20:46:32 1.503 +++ STATUS1998/10/06 20:59:05 1.504 @@ -70,6 +70,13 @@ Available Patches: +* Harrie Hazewinkel's PATCH scoreboard + This is a patch that changes the 'vhost'-name (type char [32]) + in the scoreboard into a 'vhost'-number (type int), and then uses a + lookup table to display the server name. +Message-ID: [EMAIL PROTECTED] +Status: Roy (untested +1) + * Manoj's [PATCH] mime.types update Message-ID: [EMAIL PROTECTED] Status: Roy thinks we should put a common_mime_types.txt file in
cvs commit: apache-1.3/src/modules/proxy proxy_util.c
fielding98/10/09 09:47:55
Modified:src CHANGES
src/modules/proxy proxy_util.c
Log:
Fixed a segmentation violation in mod_proxy when a response is non-cachable.
PR: 2950
Revision ChangesPath
1.1105+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1104
retrieving revision 1.1105
diff -u -r1.1104 -r1.1105
--- CHANGES 1998/10/07 09:20:38 1.1104
+++ CHANGES 1998/10/09 16:47:52 1.1105
@@ -1,3 +1,8 @@
+Changes with Apache 1.3.4
+
+ *) Fixed a segmentation violation in mod_proxy when a response is
+ non-cachable. [Roy Fielding, traced by Doug Bloebaum].
+
Changes with Apache 1.3.3
*) Added a complete implementation of the Expect header field as
1.71 +1 -1 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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- proxy_util.c 1998/08/31 19:51:59 1.70
+++ proxy_util.c 1998/10/09 16:47:54 1.71
@@ -581,7 +581,7 @@
ap_reset_timeout(r);
if (w = 0) {
-if (c != NULL) {
+if (c != NULL c-fp != NULL) {
/* when a send failure occurs, we need to decide
* whether to continue loading and caching the
* document, or to abort the whole thing
cvs commit: apache-1.3/src CHANGES
fielding98/10/09 10:42:18 Modified:src CHANGES Log: Add PRs to last entry. Revision ChangesPath 1.1106+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1105 retrieving revision 1.1106 diff -u -r1.1105 -r1.1106 --- CHANGES 1998/10/09 16:47:52 1.1105 +++ CHANGES 1998/10/09 17:42:15 1.1106 @@ -1,7 +1,7 @@ Changes with Apache 1.3.4 *) Fixed a segmentation violation in mod_proxy when a response is - non-cachable. [Roy Fielding, traced by Doug Bloebaum]. + non-cachable. [Roy Fielding, traced by Doug Bloebaum]. PR#2950, 3056 Changes with Apache 1.3.3
cvs commit: apache-devsite debugging.html
fielding98/10/09 13:29:00 Modified:.debugging.html Log: Add Dean's MaxClients 1 suggestion. Revision ChangesPath 1.3 +5 -1 apache-devsite/debugging.html Index: debugging.html === RCS file: /export/home/cvs/apache-devsite/debugging.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- debugging.html1998/10/09 19:35:51 1.2 +++ debugging.html1998/10/09 20:28:59 1.3 @@ -37,7 +37,11 @@ PThe only tricky part of running gdb on Apache is forcing the server into a single-process mode so that the parent process being debugged does the request-handling work instead of forking child processes. -We have provided the CODE-X/CODE option for that purpose. +We have provided the CODE-X/CODE option for that purpose, which will +work fine for most cases. However, some modules don't like starting +up with CODE-X/CODE, but are happy if you force only one child to run +(using CODEMaxClients 1/CODE); you can then use gdb's attach command +to debug the child server. PThe following example, with font color=greenuser input in green/font, shows the output of gdb run on a server executable (httpd) in the current
cvs commit: apache-devsite debugging.html
fielding98/10/09 13:53:45 Modified:.debugging.html Log: Add notes about getting a live backtrace. Revision ChangesPath 1.4 +54 -2 apache-devsite/debugging.html Index: debugging.html === RCS file: /export/home/cvs/apache-devsite/debugging.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- debugging.html1998/10/09 20:28:59 1.3 +++ debugging.html1998/10/09 20:53:45 1.4 @@ -20,6 +20,7 @@ OL LIA HREF=#gdbUsing 'CODEgdb/CODE'/A +LIA HREF=#backtraceGetting a live backtrace/A /OL HR @@ -152,12 +153,63 @@ PIf you are debugging a system crash and you have a core file from the crash, then do the following: PRE -% gdb httpd -c core -(gdb) where +% font color=greengdb httpd -c core/font +(gdb) font color=greenwhere/font /PRE and it will (hopefully) print a stack backtrace of where the core dump occurred during processing. P + +HR + +PA NAME=backtraceBGetting a live backtrace/B/A + +PA backtrace will let you know the hierarchy of procedures that +were called to get to a particular point in the process. On some platforms +you can get a live backtrace of any process. + +PFor SVR4-based variants of Unix, the pstack command for proc can +be used to display a a live backtrace. For example, on Solaris it looks like +PRE +% font color=green/usr/proc/bin/pstack 10623/font +10623: httpd -d /usr/local/apache + ef5b68d8 poll (efffcd08, 0, 3e8) + ef5d21e0 select (0, ef612c28, 0, 0, 3e8, efffcd08) + 288 + 00042574 wait_or_timeout (0, 75000, 75000, 7c3e8, 60f40, 52c00) + 78 + 00044310 standalone_main (5fd68, 75800, 75c00, 75000, 2, 64) + 240 + 000449f4 main (3, efffeee4, efffeef4, 75fe4, 1, 0) + 374 + 000162fc _start (0, 0, 0, 0, 0, 0) + 5c +/PRE + +PAnother technique is to use gdb to attach to the running process +and then using where to print the backtrace, as in +PRE +% font color=greengdb httpd 10623/font +GDB is free software and you are welcome to distribute copies of it + under certain conditions; type show copying to see the conditions. +There is absolutely no warranty for GDB; type show warranty for details. +GDB 4.16.gnat.1.13 (sparc-sun-solaris2.5), +Copyright 1996 Free Software Foundation, Inc... + +/usr/local/apache/src/10623: No such file or directory. +Attaching to program `/usr/local/apache/src/httpd', process 10623 +Reading symbols from /usr/lib/libsocket.so.1...done. +Reading symbols from /usr/lib/libnsl.so.1...done. +Reading symbols from /usr/lib/libc.so.1...done. +Reading symbols from /usr/lib/libdl.so.1...done. +Reading symbols from /usr/lib/libintl.so.1...done. +Reading symbols from /usr/lib/libmp.so.1...done. +Reading symbols from /usr/lib/libw.so.1...done. +Reading symbols from /usr/platform/SUNW,Ultra-1/lib/libc_psr.so.1...done. +0xef5b68d8 in () +(gdb) font color=greenwhere/font +#0 0xef5b68d8 in () +#1 0xef5d21e8 in select () +#2 0x4257c in wait_or_timeout (status=0x0) at http_main.c:2357 +#3 0x44318 in standalone_main (argc=392552, argv=0x75800) at http_main.c:4273 +#4 0x449fc in main (argc=3, argv=0xefffeee4) at http_main.c:4534 +(gdb) +/PRE HR
cvs commit: apache-devsite debugging.html
fielding98/10/09 14:22:27 Modified:.debugging.html Log: Add information about using truss Revision ChangesPath 1.5 +31 -2 apache-devsite/debugging.html Index: debugging.html === RCS file: /export/home/cvs/apache-devsite/debugging.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- debugging.html1998/10/09 20:53:45 1.4 +++ debugging.html1998/10/09 21:22:27 1.5 @@ -21,11 +21,13 @@ OL LIA HREF=#gdbUsing 'CODEgdb/CODE'/A LIA HREF=#backtraceGetting a live backtrace/A +LIA HREF=#trussUsing 'CODEtruss/trace/strace/CODE' to +trace system calls and signals/A /OL HR -PA NAME=gdbBUsing 'CODEgdb/CODE'/B/A +H3A NAME=gdbBUsing 'CODEgdb/CODE'/B/A/H3 PIf you use the gcc or egcs compilers, it is likely that the best debugger for your system is gdb. This is only a brief summary of how @@ -162,7 +164,7 @@ HR -PA NAME=backtraceBGetting a live backtrace/B/A +H3A NAME=backtraceBGetting a live backtrace/B/A/H3 PA backtrace will let you know the hierarchy of procedures that were called to get to a particular point in the process. On some platforms @@ -210,6 +212,33 @@ #4 0x449fc in main (argc=3, argv=0xefffeee4) at http_main.c:4534 (gdb) /PRE +P + +HR + +H3A NAME=trussBUsing 'CODEtruss/trace/strace/CODE' to +trace system calls and signals/B/A/H3 + +PMost Unix-based systems have at least one command for displaying +a trace of system calls and signals as they are accessed by a running +process. This command is called CODEtruss/CODE on most SVR4-based +systems and either CODEtrace/CODE or CODEstrace/CODE on many +other systems. + +PA useful tip for using the CODEtruss/CODE command on Solaris is +the CODE-f/CODE option; it tells truss to follow and continue tracing +any child processes forked by the main process. The easiest way to get +a full trace of a server is to do something like: +PRE +% font color=greentruss -f httpd -d /usr/local/apache gt;amp; outfile/font +/PRE +and let it run through a few requests before killing the parent. You can +then view the entire trace in outfile, or use something like +PRE +% font color=greenegrep '^10698:' outfile/font +/PRE +to view just the trace of the process id 10698. +P HR
cvs commit: apache-devsite debugging.html
fielding98/10/09 16:09:18 Modified:.debugging.html Log: Add brief notes about getting and analyzing a TCP packet trace. This is the last of my remembered tips, so feel free to add stuff if you have any more. Revision ChangesPath 1.7 +21 -3 apache-devsite/debugging.html Index: debugging.html === RCS file: /export/home/cvs/apache-devsite/debugging.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- debugging.html1998/10/09 22:14:05 1.6 +++ debugging.html1998/10/09 23:09:17 1.7 @@ -14,9 +14,8 @@ H1Apache Debugging Guide/H1 -PThis document is a collection of semi-random and unorganized notes -regarding tools and techniques for debugging Apache, and Apache -modules. +PThis document is a collection of notes regarding tools and techniques +for debugging Apache and Apache modules. OL LIA HREF=#gdbUsing 'CODEgdb/CODE'/A @@ -24,6 +23,7 @@ LIA HREF=#trussUsing 'CODEtruss/trace/strace/CODE' to trace system calls and signals/A LIA HREF=#gcoreGetting the server to dump core/A +LIA HREF=#tcpdumpGetting and analyzing a TCP packet trace/A /OL HR @@ -275,6 +275,24 @@ and then look at the backtrace as discussed above for a href=#gdbgdb/a. P + +HR + +H3A NAME=tcpdumpGetting and analyzing a TCP packet trace/A/H3 + +P +This is more difficult than I have time to describe at the moment. +Here are some pointers to useful discussions and tools: +UL +LIa href=http://jarok.cs.ohiou.edu/software/tcptrace/pcap.html;tools for +producing TCP dumps/a +LIa href=http://jarok.cs.ohiou.edu/software/tcptrace/tcptrace.html; +tcptrace/a is a TCP dump file analysis tool +LIa href=http://HTTP.CS.Berkeley.EDU/~daw/mike/;tcpshow/a is another +/UL +There is also a simple ASCII viewer for TCP dump traces in the Apache +repository in the file +CODEa href=http://www.apache.org/websrc/cvsweb.cgi/apache-1.3/src/test/tcpdumpscii.txt;src/test/tcpdumpscii.txt/a/CODE. HR
cvs commit: apache-site index.html
fielding98/10/09 16:16:00 Modified:.index.html Log: Update to October survey stats. Revision ChangesPath 1.70 +3 -3 apache-site/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/index.html,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- index.html1998/10/09 12:29:55 1.69 +++ index.html1998/10/09 23:16:00 1.70 @@ -101,10 +101,10 @@ PBLOCKQUOTE Apache has been the most popular web server on the Internet since -April of 1996. The September 1998 WWW server A +April of 1996. The October 1998 WWW server A HREF=http://www.netcraft.com/Survey/;site survey by Netcraft/A -found that over 51% of the web sites on the Internet are using Apache -(even without counting its derivatives) - thus making it more widely +found that over 52% of the web sites on the Internet are using Apache +(56% if Apache derivatives are included), thus making it more widely used than all other web servers combined. P
cvs commit: apache-1.3/src/main util.c
fielding98/10/09 17:40:08
Modified:src CHANGES
src/main util.c
Log:
Minor performance improvement to ap_escape_html(), since we already
calculate the string length.
It occurs to me that we could do a lot better by having a separate
interface for just give me a pointer to my own string if nothing
needs to be escaped. This routine is mostly used in buffer send
situations, so the extra copy is frequently just a waste of memory.
Revision ChangesPath
1.1107+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1106
retrieving revision 1.1107
diff -u -r1.1106 -r1.1107
--- CHANGES 1998/10/09 17:42:15 1.1106
+++ CHANGES 1998/10/10 00:40:04 1.1107
@@ -1,5 +1,7 @@
Changes with Apache 1.3.4
+ *) Minor performance improvement to ap_escape_html(). [Roy Fielding]
+
*) Fixed a segmentation violation in mod_proxy when a response is
non-cachable. [Roy Fielding, traced by Doug Bloebaum]. PR#2950, 3056
1.135 +2 -1 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- util.c1998/09/25 23:01:49 1.134
+++ util.c1998/10/10 00:40:07 1.135
@@ -1251,7 +1251,8 @@
j += 4;
if (j == 0)
- return ap_pstrdup(p, s);
+ return ap_pstrndup(p, s, i);
+
x = ap_palloc(p, i + j + 1);
for (i = 0, j = 0; s[i] != '\0'; i++, j++)
if (s[i] == '') {
cvs commit: apache-1.3/src/main http_core.c
fielding98/10/29 19:08:56
Modified:src CHANGES
src/include http_log.h
src/main http_core.c
Log:
Eliminate DoS attack when a bad URI path contains what
looks like a printf format escape. This was caused by allowing
tainted data from the network to be placed within the format string
of a call to ap_log_rerror.
PR: Reported by Remco van de Meent [EMAIL PROTECTED], Studenten Net Twente
Submitted by: Marc Slemko
Reviewed by: Roy Fielding
Revision ChangesPath
1.1129+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1128
retrieving revision 1.1129
diff -u -r1.1128 -r1.1129
--- CHANGES 1998/10/28 19:33:52 1.1128
+++ CHANGES 1998/10/30 03:08:52 1.1129
@@ -1,5 +1,8 @@
Changes with Apache 1.3.4
+ *) SECURITY: Eliminate DoS attack when a bad URI path contains what
+ looks like a printf format escape. [Marc Slemko, Studenten Net Twente]
+
*) Fix in mod_autoindex: for files where the last modified time stamp was
unavailable, an empty string was printed which was 2 bytes short.
The size and description columns were therefore not aligned correctly.
1.32 +9 -0 apache-1.3/src/include/http_log.h
Index: http_log.h
===
RCS file: /home/cvs/apache-1.3/src/include/http_log.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- http_log.h1998/08/06 17:30:24 1.31
+++ http_log.h1998/10/30 03:08:55 1.32
@@ -105,6 +105,15 @@
#define APLOG_MARK __FILE__,__LINE__
void ap_open_logs (server_rec *, pool *p);
+
+/* The two primary logging functions, ap_log_error and ap_log_rerror,
+ * use a printf style format string to build the log message. It is
+ * VERY IMPORTANT that you not include any raw data from the network,
+ * such as the request-URI or request header fields, within the format
+ * string. Doing so makes the server vulnerable to a denial-of-service
+ * attack and other messy behavior. Instead, use a simple format string
+ * like %s, followed by the string containing the untrusted data.
+ */
API_EXPORT(void) ap_log_error(const char *file, int line, int level,
const server_rec *s, const char *fmt, ...)
__attribute__((format(printf,5,6)));
1.238 +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.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- http_core.c 1998/10/23 20:07:39 1.237
+++ http_core.c 1998/10/30 03:08:55 1.238
@@ -2783,7 +2783,7 @@
else {
emsg = ap_pstrcat(r-pool, emsg, r-filename, r-path_info, NULL);
}
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, emsg);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, %s, emsg);
return HTTP_NOT_FOUND;
}
if (r-method_number != M_GET) {
cvs commit: apache-1.3/src/modules/proxy mod_proxy.c
fielding98/10/30 14:41:28
Modified:src CHANGES
src/main http_config.c http_protocol.c
src/modules/proxy mod_proxy.c
Log:
Disable sending of error-notes on a 500 (Internal Server Error) response
since it often includes file path info. Enable sending of error-notes
on a 501 (Method Not Implemented).
http_config.c would respond with 501 (Method Not Implemented) if a
content type handler was specified but could not be found, which
should have been a 500 response. Likewise, mod_proxy.c would responsd
with a 501 if the URI scheme is unrecognized instead of the correct
response of 403 (Forbidden).
PR: 3173
Revision ChangesPath
1.1130+10 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1129
retrieving revision 1.1130
diff -u -r1.1129 -r1.1130
--- CHANGES 1998/10/30 03:08:52 1.1129
+++ CHANGES 1998/10/30 22:41:21 1.1130
@@ -1,5 +1,15 @@
Changes with Apache 1.3.4
+ *) Disable sending of error-notes on a 500 (Internal Server Error) response
+ since it often includes file path info. Enable sending of error-notes
+ on a 501 (Method Not Implemented). [Roy Fielding] PR#3173
+
+ *) http_config.c would respond with 501 (Method Not Implemented) if a
+ content type handler was specified but could not be found, which
+ should have been a 500 response. Likewise, mod_proxy.c would responsd
+ with a 501 if the URI scheme is unrecognized instead of the correct
+ response of 403 (Forbidden). [Roy Fielding]
+
*) SECURITY: Eliminate DoS attack when a bad URI path contains what
looks like a printf format escape. [Marc Slemko, Studenten Net Twente]
1.135 +3 -3 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.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- http_config.c 1998/09/26 00:07:08 1.134
+++ http_config.c 1998/10/30 22:41:24 1.135
@@ -479,7 +479,7 @@
const char *handler;
char *p;
size_t handler_len;
-int result = NOT_IMPLEMENTED;
+int result = HTTP_INTERNAL_SERVER_ERROR;
if (r-handler) {
handler = r-handler;
@@ -509,7 +509,7 @@
}
}
-if (result == NOT_IMPLEMENTED r-handler) {
+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);
}
@@ -526,7 +526,7 @@
}
}
-return NOT_IMPLEMENTED;
+return HTTP_INTERNAL_SERVER_ERROR;
}
/* One-time setup for precompiled modules --- NOT to be done on restart */
1.247 +17 -4 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.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- http_protocol.c 1998/10/19 05:59:35 1.246
+++ http_protocol.c 1998/10/30 22:41:24 1.247
@@ -2297,10 +2297,13 @@
ap_escape_html(r-pool, r-uri),
evaluated to false.P\n, NULL);
break;
- case NOT_IMPLEMENTED:
+ case HTTP_NOT_IMPLEMENTED:
ap_bvputs(fd, ap_escape_html(r-pool, r-method), to ,
ap_escape_html(r-pool, r-uri),
not supported.P\n, NULL);
+ if ((error_notes = ap_table_get(r-notes, error-notes)) != NULL) {
+ ap_bvputs(fd, error_notes, P\n, NULL);
+ }
break;
case BAD_GATEWAY:
ap_bputs(The proxy server received an invalid\015\012, fd);
@@ -2387,9 +2390,19 @@
caused the error.P\n
More information about this error may be available\n
in the server error log.P\n, NULL);
- if ((error_notes = ap_table_get(r-notes, error-notes)) != NULL) {
- ap_bvputs(fd, error_notes, P\n, NULL);
- }
+ /*
+ * It would be nice to give the user the information they need to
+ * fix the problem directly since many users don't have access to
+ * the error_log (think University sites) even though they can easily
+ * get this error by misconfiguring an htaccess file. However, the
+ * error notes tend to include the real file pathname in this case,
+ * which some people consider to be a breach of privacy. Until we
+ * can figure out a way to remove the pathname, leave this commented
cvs commit: apache-1.3/src/modules/standard mod_actions.c
fielding98/11/08 01:51:12 Modified:src CHANGES src/include ap_mmn.h http_protocol.h httpd.h src/main http_core.c http_protocol.c src/modules/standard mod_actions.c Log: Enabled all of the WebDAV method names for use by third-party modules, Limit, and Script directives. That includes PATCH, PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, and UNLOCK. Improved mod_actions.c so that it can use any of the methods defined in httpd.h. Added ap_method_number_of(method) for getting the internal method number. I would have preferred to use a configurable table for new methods, but the current API is too dependent on methods being represented as a bitmask. We need to rethink this in the next major server version. Revision ChangesPath 1.1140+7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1139 retrieving revision 1.1140 diff -u -r1.1139 -r1.1140 --- CHANGES 1998/11/07 14:31:21 1.1139 +++ CHANGES 1998/11/08 09:51:07 1.1140 @@ -1,5 +1,12 @@ Changes with Apache 1.3.4 + *) Enabled all of the WebDAV method names for use by third-party + modules, Limit, and Script directives. That includes PATCH, + PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, and UNLOCK. + Improved mod_actions.c so that it can use any of the methods + defined in httpd.h. Added ap_method_number_of(method) for + getting the internal method number. [Roy Fielding] + *) PORT: Add a port to the TPF OS. [Joe Moenich [EMAIL PROTECTED] and others at IBM] 1.10 +3 -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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ap_mmn.h 1998/10/03 18:46:01 1.9 +++ ap_mmn.h 1998/11/08 09:51:09 1.10 @@ -181,10 +181,12 @@ *(for implementing better error reporting). * 19980906 (1.3.2-dev) - added ap_md5_binary() * 19980917 (1.3.2-dev) - bs2000: changed os_set_authfile() to os_set_account() + * 19981108 (1.3.4-dev) - added ap_method_number_of() + * - changed value of M_INVALID and added WebDAV methods */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 19980917 +#define MODULE_MAGIC_NUMBER_MAJOR 19981108 #endif #define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ 1.46 +5 -0 apache-1.3/src/include/http_protocol.h Index: http_protocol.h === RCS file: /home/cvs/apache-1.3/src/include/http_protocol.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- http_protocol.h 1998/08/09 14:33:10 1.45 +++ http_protocol.h 1998/11/08 09:51:09 1.46 @@ -209,6 +209,11 @@ CORE_EXPORT(void) ap_parse_uri(request_rec *r, const char *uri); +/* Get the method number associated with the given string, assumed to + * contain an HTTP method. Returns M_INVALID if not recognized. + */ +API_EXPORT(int) ap_method_number_of(const char *method); + #ifdef __cplusplus } #endif 1.251 +21 -9 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.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- httpd.h 1998/11/05 20:07:51 1.250 +++ httpd.h 1998/11/08 09:51:09 1.251 @@ -531,16 +531,28 @@ ((x) == HTTP_SERVICE_UNAVAILABLE) || \ ((x) == HTTP_NOT_IMPLEMENTED)) +/* Methods recognized (but not necessarily handled) by the server. + * These constants are used in bit shifting masks of size int, so it is + * unsafe to have more methods than bits in an int. HEAD == M_GET. + */ +#define M_GET0 +#define M_PUT1 +#define M_POST 2 +#define M_DELETE 3 +#define M_CONNECT4 +#define M_OPTIONS5 +#define M_TRACE 6 +#define M_PATCH 7 +#define M_PROPFIND 8 +#define M_PROPPATCH 9 +#define M_MKCOL 10 +#define M_COPY 11 +#define M_MOVE 12 +#define M_LOCK 13 +#define M_UNLOCK14 -#define METHODS 8 -#define M_GET 0 -#define M_PUT 1 -#define M_POST 2 -#define M_DELETE 3 -#define M_CONNECT 4 -#define M_OPTIONS 5 -#define M_TRACE 6 -#define M_INVALID 7 +#define METHODS 15 +#define M_INVALID 31 #define
cvs commit: apache-1.3/conf httpd.conf-dist
fielding98/11/08 02:43:39 Modified:conf httpd.conf-dist Log: Add Directory section for /icons/ because it is necessary if the site changes the / (root) section to deny access by default. Add examples for setting UserDir and proxy access (currently unlimited). Restore FancyIndexing directive instead of IndexOptions FancyIndexing. Fix some comments and typos. Revision ChangesPath 1.34 +43 -7 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- httpd.conf-dist 1998/10/28 22:04:09 1.33 +++ httpd.conf-dist 1998/11/08 10:43:38 1.34 @@ -111,7 +111,7 @@ # # MaxKeepAliveRequests: The maximum number of requests to allow # during a persistent connection. Set to 0 to allow an unlimited amount. -# We reccomend you leave this number high, for maximum performance. +# We recommend you leave this number high, for maximum performance. # MaxKeepAliveRequests 100 @@ -326,6 +326,23 @@ UserDir public_html # +# Control access to UserDir directories. The following is an example +# for a site where these directories are restricted to read-only. +# +#Directory /*/public_html +#AllowOverride FileInfo AuthConfig Limit +#Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec +#Limit GET POST OPTIONS PROPFIND +#Order allow,deny +#Allow from all +#/Limit +#Limit PUT DELETE PATCH PROPPATCH MKCOL COPY MOVE LOCK UNLOCK +#Order deny,allow +#Deny from all +#/Limit +#/Directory + +# # DirectoryIndex: Name of the file or files to use as a pre-written HTML # directory index. Separate multiple entries with spaces. # @@ -476,6 +493,13 @@ # Alias /icons/ @@ServerRoot@@/icons/ +Directory @@ServerRoot@@/icons +Options Indexes MultiViews +AllowOverride None +Order allow,deny +Allow from all +/Directory + # # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that @@ -493,6 +517,8 @@ Directory @@ServerRoot@@/cgi-bin AllowOverride None Options None +Order allow,deny +Allow from all /Directory # @@ -509,7 +535,7 @@ # # FancyIndexing is whether you want fancy directory indexing or standard # -IndexOptions FancyIndexing +FancyIndexing On # # AddIcon* directives tell the server which icon to show for different @@ -585,7 +611,7 @@ # AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress # information on the fly. Note: Not all browsers support this. # Despite the name similarity, the following Add* directives have nothing -# to do with the FancyIndexing customisation directives above. +# to do with the FancyIndexing customization directives above. # AddEncoding x-compress Z AddEncoding x-gzip gz @@ -697,9 +723,9 @@ # request will *not* be available to such a script. # -# The following directives disable keepalives and HTTP header flushes. -# The first directive disables it for Netscape 2.x and browsers which -# spoof it. There are known problems with these. +# The following directives modify normal HTTP response behavior. +# The first directive disables keepalive for Netscape 2.x and browsers that +# spoof it. There are known problems with these browser implementations. # The second directive is for Microsoft Internet Explorer 4.0b2 # which has a broken HTTP/1.1 implementation and does not properly # support keepalive when it is used on 301 or 302 (redirect) responses. @@ -752,10 +778,17 @@ #/Location # -# Proxy Server directives. Uncomment the following line to +# Proxy Server directives. Uncomment the following lines to # enable the proxy server: # +#IfModule mod_proxy.c #ProxyRequests On +# +#Directory proxy:* +#Order deny,allow +#Deny from all +#Allow from .your_domain.com +#/Directory # # Enable/disable the handling of HTTP/1.1 Via: headers. @@ -775,6 +808,9 @@ #CacheLastModifiedFactor 0.1 #CacheDefaultExpire 1 #NoCache a_domain.com another_domain.edu joes.garage_sale.com + +#/IfModule +# End of proxy directives. ### Section 3: Virtual Hosts #
cvs commit: apache-1.3 STATUS
fielding98/11/08 02:51:13 Modified:.STATUS Log: Time for bed. Revision ChangesPath 1.533 +3 -10 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.532 retrieving revision 1.533 diff -u -r1.532 -r1.533 --- STATUS1998/11/07 01:51:24 1.532 +++ STATUS1998/11/08 10:51:12 1.533 @@ -83,10 +83,6 @@ Status: Marc +1, Jim +1 (concept) * Needs more in-depth review * -* Roy's [PATCH] Enable all WebDAV methods -Message-ID: [EMAIL PROTECTED] - Status: Roy +1, Lars +1 - * Manoj and Ken Parzygnat's PATCH to support %-expandos from Unix on Win32 Message-ID: [EMAIL PROTECTED] @@ -115,12 +111,7 @@ * Manoj's [PATCH] mime.types update Message-ID: [EMAIL PROTECTED] -Status: Roy thinks we should put a common_mime_types.txt file in -the documentation and remove the unused entries from conf. -Ralf +1 for both Manoj's patch and Roys suggestion with -a slight preference for Manoj's patch because the -overhead of more entries is not noticeable to me. -Lars +1 +Status: Roy +1, Ralf +1, Lars +1 * Patches for the DSO/mod_perl problem (see below for description): @@ -137,6 +128,8 @@ CustomLog-like tailoring of directory listing formats Needs patch: + +* Roy: Need to add updated WebDAV status codes from latest draft. * Ralf: mod_so doesn't correctly initialise modules. For instance the handlers of mod_perl are not initialised.
cvs commit: apache-1.3/conf mime.types
fielding98/11/09 17:35:49 Modified:conf mime.types Log: Update to reflect all of the registered media types as of 23 Sep 1998. PR: 2380, 2286, 2246 Submitted by: Manoj Kasichainula Reviewed by: Roy, Ralf, Lars, Martin Revision ChangesPath 1.18 +174 -12 apache-1.3/conf/mime.types Index: mime.types === RCS file: /home/cvs/apache-1.3/conf/mime.types,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mime.types1998/09/30 17:42:05 1.17 +++ mime.types1998/11/10 01:35:49 1.18 @@ -1,41 +1,164 @@ -# This file controls what MIME types are sent to the client for the -# given file extensions. Sending the correct MIME type to the client +# This file controls what Internet media types are sent to the client for +# given file extension(s). Sending the correct media type to the client # is important so they know how to handle the content of the file. # Extra types can either be added here or by using an AddType directive -# in your config files. For more information about MIME types -# please read RFC 2045, 2046, 2047, 2048, and 2077. +# in your config files. For more information about Internet media types, +# please read RFC 2045, 2046, 2047, 2048, and 2077. The Internet media type +# registry is at ftp://ftp.iana.org/in-notes/iana/assignments/media-types/. # MIME type Extension +application/EDI-Consent +application/EDI-X12 +application/EDIFACT application/activemessage -application/andrew-inset +application/andrew-insetez application/applefile application/atomicmail +application/cals-1840 +application/commonground +application/cybercash application/dca-rft application/dec-dx +application/eshop +application/hyperstudio +application/iges application/mac-binhex40 hqx application/mac-compactpro cpt application/macwriteii +application/marc +application/mathematica application/msword doc application/news-message-id application/news-transmission application/octet-stream bin dms lha lzh exe class application/oda oda application/pdf pdf +application/pgp-encrypted +application/pgp-keys +application/pgp-signature +application/pkcs10 +application/pkcs7-mime +application/pkcs7-signature application/postscript ai eps ps application/powerpoint ppt +application/prs.alvestrand.titrax-sheet +application/prs.cww +application/prs.nprend application/remote-printing +application/riscos application/rtf rtf +application/set-payment +application/set-payment-initiation +application/set-registration +application/set-registration-initiation +application/sgml +application/sgml-open-catalog application/slate -application/smil smi smil sml +application/smil smi smil +application/vemmi +application/vnd.3M.Post-it-Notes +application/vnd.FloGraphIt +application/vnd.acucobol +application/vnd.anser-web-certificate-issue-initiation +application/vnd.anser-web-funds-transfer-initiation +application/vnd.audiograph +application/vnd.businessobjects +application/vnd.claymore +application/vnd.comsocaller +application/vnd.dna +application/vnd.dxr +application/vnd.ecdis-update +application/vnd.ecowin.chart +application/vnd.ecowin.filerequest +application/vnd.ecowin.fileupdate +application/vnd.ecowin.series +application/vnd.ecowin.seriesrequest +application/vnd.ecowin.seriesupdate +application/vnd.enliven +application/vnd.epson.salt +application/vnd.fdf +application/vnd.ffsns +application/vnd.framemaker +application/vnd.fujitsu.oasys +application/vnd.fujitsu.oasys2 +application/vnd.fujitsu.oasys3 +application/vnd.fujitsu.oasysgp +application/vnd.fujitsu.oasysprs +application/vnd.fujixerox.docuworks +application/vnd.hp-HPGL +application/vnd.hp-PCL +application/vnd.hp-PCLXL +application/vnd.hp-hps +application/vnd.ibm.MiniPay +application/vnd.ibm.modcap +application/vnd.intercon.formnet +application/vnd.intertrust.digibox +application/vnd.intertrust.nncp +application/vnd.is-xpr +application/vnd.japannet-directory-service +application/vnd.japannet-jpnstore-wakeup +application/vnd.japannet-payment-wakeup +application/vnd.japannet-registration
cvs commit: apache-1.3/conf mime.types
fielding98/11/09 17:39:38 Modified:conf mime.types Log: Add text/vnd.flatland.3dml as per request. PR: 3332 Revision ChangesPath 1.19 +1 -0 apache-1.3/conf/mime.types Index: mime.types === RCS file: /home/cvs/apache-1.3/conf/mime.types,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mime.types1998/11/10 01:35:49 1.18 +++ mime.types1998/11/10 01:39:37 1.19 @@ -261,6 +261,7 @@ text/vnd.fmi.flexstor text/vnd.in3d.3dml text/vnd.in3d.spot +text/vnd.flatland.3dml text/vnd.latex-z text/x-setextetx text/xml xml
cvs commit: apache-1.3/conf httpd.conf-dist
fielding98/11/09 19:27:59 Modified:conf httpd.conf-dist Log: Restore IndexOptions FancyIndexing, since it is the latter directive that is now deprecated. Revision ChangesPath 1.35 +1 -1 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- httpd.conf-dist 1998/11/08 10:43:38 1.34 +++ httpd.conf-dist 1998/11/10 03:27:58 1.35 @@ -535,7 +535,7 @@ # # FancyIndexing is whether you want fancy directory indexing or standard # -FancyIndexing On +IndexOptions FancyIndexing # # AddIcon* directives tell the server which icon to show for different
cvs commit: apache-1.3/src/main util.c
fielding98/11/09 19:45:06 Modified:conf mime.types src/main util.c Log: Relive history through legacy comments. Woohoo! Revision ChangesPath 1.21 +2 -0 apache-1.3/conf/mime.types Index: mime.types === RCS file: /home/cvs/apache-1.3/conf/mime.types,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mime.types1998/11/10 01:55:19 1.20 +++ mime.types1998/11/10 03:45:05 1.21 @@ -1,3 +1,5 @@ +# This is a comment. I love comments. + # This file controls what Internet media types are sent to the client for # given file extension(s). Sending the correct media type to the client # is important so they know how to handle the content of the file. 1.140 +8 -0 apache-1.3/src/main/util.c Index: util.c === RCS file: /home/cvs/apache-1.3/src/main/util.c,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- util.c1998/11/06 22:42:43 1.139 +++ util.c1998/11/10 03:45:06 1.140 @@ -210,6 +210,14 @@ } #endif +/* Roy owes Rob beer. */ +/* Rob owes Roy dinner. */ + +/* These legacy comments would make a lot more sense if Roy hadn't + * replaced the old later_than() routine with util_date.c. + * + * Well, okay, they still wouldn't make any sense. + */ /* Match = 0, NoMatch = 1, Abort = -1 * Based loosely on sections of wildmat.c by Rich Salz
cvs commit: apache-1.3/src CHANGES
fielding98/11/09 22:10:26 Modified:.STATUS src CHANGES Log: A bit chilly tonight. Revision ChangesPath 1.535 +0 -4 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.534 retrieving revision 1.535 diff -u -r1.534 -r1.535 --- STATUS1998/11/08 20:09:16 1.534 +++ STATUS1998/11/10 06:10:24 1.535 @@ -109,10 +109,6 @@ http://www.physics.mcgill.ca/~juan/mod_include.patch Status: Ken -0 for 1.3/+0 for 2.0 -* Manoj's [PATCH] mime.types update -Message-ID: [EMAIL PROTECTED] -Status: Roy +1, Ralf +1, Lars +1, Martin +1 - * Patches for the DSO/mod_perl problem (see below for description): Ralf's [PATCH] Fix module init 1.1143+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1142 retrieving revision 1.1143 diff -u -r1.1142 -r1.1143 --- CHANGES 1998/11/09 07:03:16 1.1142 +++ CHANGES 1998/11/10 06:10:25 1.1143 @@ -1,5 +1,9 @@ Changes with Apache 1.3.4 + *) Updated mime.types to reflect current Internet media types + and include a URL to the registry. + [Manoj Kasichainula, Roy Fielding] PR#2380, 2286, 2246 + *) SECURITY: Do a more complete check in mod_include to avoid an infinite loop of recursive SSI includes. [Marc Slemko] PR#3323
cvs commit: apache-site/library index.html
fielding98/11/09 22:44:39 Modified:library index.html Log: Update links to standards, new working groups PR: 2246 Revision ChangesPath 1.3 +9 -7 apache-site/library/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/library/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.html1997/08/03 09:35:30 1.2 +++ index.html1998/11/10 06:44:39 1.3 @@ -25,10 +25,12 @@ /UL LISTRONGIETF Working Groups/STRONG/LI UL -LIA HREF=http://www.ics.uci.edu/pub/ietf/http/;HTTP Working Group/A/LI -LIA HREF=http://www-ns.rutgers.edu/www-security/;HTTP-Security Working Group/A/LI -LIA HREF=http://www.ics.uci.edu/pub/ietf/html/;HTML Working Group/A/LI -LIA HREF=http://www.ics.uci.edu/pub/ietf/uri/;URI Working Group/A/LI +LIA HREF=http://www.ics.uci.edu/pub/ietf/http/;HTTP/A/LI +LIA HREF=http://www-ns.rutgers.edu/www-security/;HTTP-Security/A/LI +LIA HREF=http://www.ics.uci.edu/pub/ietf/webdav/;WebDAV (HTTP Distributed Authoring and Versioning)/A/LI +LIA HREF=http://www.ics.uci.edu/pub/ietf/dasl/;DASL (DAV Searching amp; Locating)/A/LI +LIA HREF=http://www.ics.uci.edu/pub/ietf/html/;HTML/A/LI +LIA HREF=http://www.ics.uci.edu/pub/ietf/uri/;URI/A/LI /UL /UL @@ -39,6 +41,7 @@ UL LIA HREF=http://www.w3.org/pub/WWW/Protocols/rfc1945/rfc1945;RFC1945: HTTP 1.0/A (Deprecated Standard)/LI LIA HREF=http://www.w3.org/pub/WWW/Protocols/rfc2068/rfc2068;RFC2068: HTTP 1.1/A (Proposed Standard)/LI +LIA HREF=http://www.ics.uci.edu/pub/ietf/uri/rfc2396.txt;RFC2396: Uniform Resource Identifiers/A (Draft Standard)/LI /UL LISTRONGA HREF=http://www.w3.org/MarkUp/;Hypertext Markup Language/A (HTML)/STRONG/LI UL @@ -49,9 +52,8 @@ LISTRONGA HREF=http://www.webreference.com/index2.html;Related Stuff/A/STRONG/LI UL LIA HREF=http://hoohoo.ncsa.uiuc.edu/cgi/;Common Gateway Interface - CGI/1.1/A/LI -LIA HREF=http://www.oac.uci.edu/indiv/ehood/MIME/1521/rfc1521ToC.html;RFC1521 - MIME (part 1)/A/LI -LIA HREF=http://www.oac.uci.edu/indiv/ehood/MIME/1522/rfc1522ToC.html;RFC1522 - MIME (part 2)/A/LI -LIA HREF=http://www.w3.org/pub/WWW/Daemon/User/Config/Logging.html; Logging in CERN httpd/A/LI +LIA HREF=ftp://ftp.iana.org/in-notes/iana/assignments/media-types/;Internet media types/A/LI +LIA HREF=http://www.w3.org/Daemon/User/Config/Logging.html;Logging in CERN httpd/A/LI /UL /UL
cvs commit: apache-1.3/src/main http_protocol.c
fielding98/11/09 23:30:09 Modified:.STATUS src CHANGES src/include httpd.h src/main http_protocol.c Log: Added the last two WebDAV status codes of 424 (Failed Dependency) and 507 (Insufficient Storage) for use by third-party modules. Revision ChangesPath 1.536 +0 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.535 retrieving revision 1.536 diff -u -r1.535 -r1.536 --- STATUS1998/11/10 06:10:24 1.535 +++ STATUS1998/11/10 07:30:05 1.536 @@ -125,8 +125,6 @@ Needs patch: -* Roy: Need to add updated WebDAV status codes from latest draft. - * Ralf: mod_so doesn't correctly initialise modules. For instance the handlers of mod_perl are not initialised. An ap_init_modules() could be done from mod_so but this is too much. 1.1144+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1143 retrieving revision 1.1144 diff -u -r1.1143 -r1.1144 --- CHANGES 1998/11/10 06:10:25 1.1143 +++ CHANGES 1998/11/10 07:30:06 1.1144 @@ -13,6 +13,10 @@ was changed to show more information about the suEXEC setup. [Lars Eilebrecht] PR#3316, 3357, 3361 + *) Added the last two WebDAV status codes of 424 (Failed Dependency) + and 507 (Insufficient Storage) for use by third-party modules. + [Roy Fielding] + *) Enabled all of the WebDAV method names for use by third-party modules, Limit, and Script directives. That includes PATCH, PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, and UNLOCK. 1.252 +3 -1 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.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- httpd.h 1998/11/08 09:51:09 1.251 +++ httpd.h 1998/11/10 07:30:07 1.252 @@ -447,7 +447,7 @@ * all of the potential response status-lines (a sparse table). * A future version should dynamically generate the table at startup. */ -#define RESPONSE_CODES 54 +#define RESPONSE_CODES 55 #define HTTP_CONTINUE 100 #define HTTP_SWITCHING_PROTOCOLS 101 @@ -487,6 +487,7 @@ #define HTTP_EXPECTATION_FAILED417 #define HTTP_UNPROCESSABLE_ENTITY 422 #define HTTP_LOCKED423 +#define HTTP_FAILED_DEPENDENCY 424 #define HTTP_INTERNAL_SERVER_ERROR 500 #define HTTP_NOT_IMPLEMENTED 501 #define HTTP_BAD_GATEWAY 502 @@ -494,6 +495,7 @@ #define HTTP_GATEWAY_TIME_OUT 504 #define HTTP_VERSION_NOT_SUPPORTED 505 #define HTTP_VARIANT_ALSO_VARIES 506 +#define HTTP_INSUFFICIENT_STORAGE 507 #define HTTP_NOT_EXTENDED 510 #define DOCUMENT_FOLLOWSHTTP_OK 1.249 +15 -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.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- http_protocol.c 1998/11/08 09:51:11 1.248 +++ http_protocol.c 1998/11/10 07:30:08 1.249 @@ -1154,7 +1154,8 @@ 421 unused, 422 Unprocessable Entity, 423 Locked, -#define LEVEL_500 43 +424 Failed Dependency, +#define LEVEL_500 44 500 Internal Server Error, 501 Method Not Implemented, 502 Bad Gateway, @@ -1162,7 +1163,7 @@ 504 Gateway Time-out, 505 HTTP Version Not Supported, 506 Variant Also Negotiates -507 unused, +507 Insufficient Storage 508 unused, 509 unused, 510 Not Extended, @@ -2425,6 +2426,18 @@ ap_bputs(The requested resource is currently locked.\n The lock must be released or proper identification\n given before the method can be applied.\n, fd); + break; + case HTTP_FAILED_DEPENDENCY: + ap_bputs(The method could not be performed on the resource\n + because the requested action depended on another\n + action and that other action failed.\n, fd); + break; + case HTTP_INSUFFICIENT_STORAGE: + ap_bputs(The method could not be performed on the resource\n + because the server is unable to store the\n + representation needed to successfully complete
cvs commit: apache-1.3 STATUS
fielding98/11/10 00:02:46 Modified:.STATUS Log: My computer just turned into a pumpkin -- time to get back to work on my dissertation stuff. Note things that other people need to do for us to get a release out soon. Revision ChangesPath 1.537 +17 -7 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.536 retrieving revision 1.537 diff -u -r1.536 -r1.537 --- STATUS1998/11/10 07:30:05 1.536 +++ STATUS1998/11/10 08:02:45 1.537 @@ -14,6 +14,8 @@ RELEASE SHOWSTOPPERS: +* Win32 device file issues (nul/aux/...) + * How should an Apache binary release tarball look? 1. The old way where it is just a source release tarball @@ -57,12 +59,6 @@ are built) Ralf -0 (I dislike mixed source+binary tarballs) -* Win32 device file issues (nul/aux/...) - -* Addition of cute little icons to Apache's main icon groups. - See [EMAIL PROTECTED] - Status: Ralf +1 - Documentation that needs writing: * Need a document explaining mod_rewrite/UseCanonicalName off based @@ -73,10 +69,16 @@ Available Patches: +* Ralf's [PATCH] MODULE_MAGIC_COOKIE field for module structure +Message-ID: [EMAIL PROTECTED] +Status: Currently assumes 8-byte long, Ralf will fix and repost. + * Ralf's Build outside of source tree (take 2: alternative solution) (overrules Wilfredo Sanchez's [PATCH] Build outside of source tree) Message-ID: [EMAIL PROTECTED] Status: Ralf +1, Jim +1, Martin +1 +Fred says this doesn't work for him, suggests replacement in +[EMAIL PROTECTED] * Marc's [PATCH] PR#3323: recursive includes Message-ID: [EMAIL PROTECTED] @@ -86,7 +88,7 @@ * Manoj and Ken Parzygnat's PATCH to support %-expandos from Unix on Win32 Message-ID: [EMAIL PROTECTED] -Status: +Status: Umm, wasn't this committed and/or reversed last week? * Ron Record's patch to port Apache to UnixWare 7 (forwarded by Randy). @@ -103,6 +105,10 @@ Message-ID: PR#3247 Status: +* Khimenko Victor's os_inline.c finctions are not inlined +Message-ID: [EMAIL PROTECTED] +Status: Roy +1 + * Juan Gallego's patch to add CSH-style modifiers (:h, :r, :t, :e) to mod_include's variable processing. Mesage-ID: PR#3246, also available at @@ -120,6 +126,10 @@ In progress: +* Addition of cute little icons to Apache's main icon groups. + See [EMAIL PROTECTED] + Status: Ralf +1, Roy +1 (in icons/small subdirectory) + * Ken's IndexFormat enhancement to mod_autoindex to allow CustomLog-like tailoring of directory listing formats
cvs commit: apache-1.3 STATUS
fielding98/11/10 17:37:56 Modified:.STATUS Log: another one bites the dust Revision ChangesPath 1.539 +0 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.538 retrieving revision 1.539 diff -u -r1.538 -r1.539 --- STATUS1998/11/10 19:24:56 1.538 +++ STATUS1998/11/11 01:37:55 1.539 @@ -90,11 +90,6 @@ Message-ID: [EMAIL PROTECTED] Status: -* Wilfredo Sanchez's PATCH to make Apache buildable for FAT on - Rhapsody/OS X. - Message-ID: [EMAIL PROTECTED] - Status: Ken +1 (untested), Martin +1 (untested) - * Amiel Lee Yee's patch to update ap_config.h for DGUX/Intel and str[n]casecmp(). Message-ID: PR#3247
cvs commit: apache-1.3 STATUS
fielding98/11/11 13:39:27 Modified:.STATUS Log: add Dean's vote Revision ChangesPath 1.540 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.539 retrieving revision 1.540 diff -u -r1.539 -r1.540 --- STATUS1998/11/11 01:37:55 1.539 +++ STATUS1998/11/11 21:39:27 1.540 @@ -97,7 +97,7 @@ * Khimenko Victor's os_inline.c finctions are not inlined Message-ID: [EMAIL PROTECTED] -Status: Roy +1 +Status: Roy +1, Dean +1 * Juan Gallego's patch to add CSH-style modifiers (:h, :r, :t, :e) to mod_include's variable processing.
cvs commit: apache-1.3 STATUS
fielding98/12/11 17:24:04 Modified:.STATUS Log: Update Win32 showstoppers. Revision ChangesPath 1.548 +11 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.547 retrieving revision 1.548 diff -u -r1.547 -r1.548 --- STATUS1998/12/10 14:24:06 1.547 +++ STATUS1998/12/12 01:24:03 1.548 @@ -14,8 +14,17 @@ RELEASE SHOWSTOPPERS: -* Win32 device file issues (nul/aux/...) - Patch: Available /* anyone have message-id? */ +* Paul's [PATCH] Win32 device files + Message-ID: [EMAIL PROTECTED] + and [EMAIL PROTECTED] + Status: Someone who knows the current status of this thing should apply + it now, since the rest of us can't test it otherwise. + +* nmake compilation broken on Win95 + Paul Ausbeck says the problem is that the distribution uses + %PARAM% type arguments in nmake invokations. + Message-ID: [EMAIL PROTECTED] + Status: patch needed since we can't test above without it * 'kill -HUP' broken on FreeBSD and others: child processes die or do not restart.
cvs commit: apache-1.3/src/include ap_config.h
fielding98/12/11 18:53:42 Modified:src CHANGES src/include ap_config.h Log: Fix ordering of definitions in ap_config.h so that ap_inline is defined before it might be used. Submitted by: Victor Khimenko [EMAIL PROTECTED] Reviewed by: Roy Fielding, Dean Gaudet Revision ChangesPath 1.1166+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1165 retrieving revision 1.1166 diff -u -r1.1165 -r1.1166 --- CHANGES 1998/12/06 16:14:16 1.1165 +++ CHANGES 1998/12/12 02:53:40 1.1166 @@ -1,5 +1,8 @@ Changes with Apache 1.3.4 + *) Fix ordering of definitions in ap_config.h so that ap_inline is + defined before it might be used. [Khimenko Victor] + *) PORT: Add Dynamic Shared Object (DSO) support for BSDI (v4.0). [Tom Serkowski [EMAIL PROTECTED]] PR#3453 1.245 +21 -21apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- ap_config.h 1998/11/06 22:42:41 1.244 +++ ap_config.h 1998/12/12 02:53:42 1.245 @@ -84,6 +84,27 @@ #include sys/types.h #include sys/stat.h +/* So that we can use inline on some critical functions, and use + * GNUC attributes (such as to get -Wall warnings for printf-like + * functions). Only do this in gcc 2.7 or later ... it may work + * on earlier stuff, but why chance it. + * + * We've since discovered that the gcc shipped with NeXT systems + * as cc is completely broken. It claims to be __GNUC__ and so + * on, but it doesn't implement half of the things that __GNUC__ + * means. In particular it's missing inline and the __attribute__ + * stuff. So we hack around it. PR#1613. -djg + */ +#if !defined(__GNUC__) || __GNUC__ 2 || __GNUC_MINOR__ 7 || defined(NEXT) +#define ap_inline +#define __attribute__(__x) +#define ENUM_BITFIELD(e,n,w) signed int n : w +#else +#define ap_inline __inline__ +#define USE_GNU_INLINE +#define ENUM_BITFIELD(e,n,w) e n : w +#endif + #ifdef WIN32 /* include process.h first so we can override spawn[lv]e* properly */ #include process.h @@ -888,27 +909,6 @@ #define ap_private_extern __private_extern__ #else #define ap_private_extern -#endif - -/* So that we can use inline on some critical functions, and use - * GNUC attributes (such as to get -Wall warnings for printf-like - * functions). Only do this in gcc 2.7 or later ... it may work - * on earlier stuff, but why chance it. - * - * We've since discovered that the gcc shipped with NeXT systems - * as cc is completely broken. It claims to be __GNUC__ and so - * on, but it doesn't implement half of the things that __GNUC__ - * means. In particular it's missing inline and the __attribute__ - * stuff. So we hack around it. PR#1613. -djg - */ -#if !defined(__GNUC__) || __GNUC__ 2 || __GNUC_MINOR__ 7 || defined(NEXT) -#define ap_inline -#define __attribute__(__x) -#define ENUM_BITFIELD(e,n,w) signed int n : w -#else -#define ap_inline __inline__ -#define USE_GNU_INLINE -#define ENUM_BITFIELD(e,n,w) e n : w #endif /*
cvs commit: apache-1.3/src CHANGES
fielding98/12/11 18:57:08 Modified:.STATUS src CHANGES Log: One down, too many to go. Revision ChangesPath 1.549 +0 -4 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.548 retrieving revision 1.549 diff -u -r1.548 -r1.549 --- STATUS1998/12/12 01:24:03 1.548 +++ STATUS1998/12/12 02:57:06 1.549 @@ -157,10 +157,6 @@ Message-ID: PR#3247 Status: -* Khimenko Victor's os_inline.c finctions are not inlined -Message-ID: [EMAIL PROTECTED] -Status: Roy +1, Dean +1 - * Juan Gallego's patch to add CSH-style modifiers (:h, :r, :t, :e) to mod_include's variable processing. Mesage-ID: PR#3246, also available at 1.1167+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1166 retrieving revision 1.1167 diff -u -r1.1166 -r1.1167 --- CHANGES 1998/12/12 02:53:40 1.1166 +++ CHANGES 1998/12/12 02:57:07 1.1167 @@ -1,7 +1,7 @@ Changes with Apache 1.3.4 *) Fix ordering of definitions in ap_config.h so that ap_inline is - defined before it might be used. [Khimenko Victor] + defined before it might be used. [Victor Khimenko] *) PORT: Add Dynamic Shared Object (DSO) support for BSDI (v4.0). [Tom Serkowski [EMAIL PROTECTED]] PR#3453
cvs commit: apache-1.3/src/include ap_config.h
fielding98/12/11 19:12:18 Modified:src CHANGES src/include ap_config.h Log: The I86 version of DGUX has support for strncasecmp and strcasecmp, so allow it in ap_config.h. [Amiel Lee Yee] PR#3247 PR: 3247 Submitted by: Amiel Lee Yee [EMAIL PROTECTED] Reviewed by: Roy Fielding Revision ChangesPath 1.1168+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1167 retrieving revision 1.1168 diff -u -r1.1167 -r1.1168 --- CHANGES 1998/12/12 02:57:07 1.1167 +++ CHANGES 1998/12/12 03:12:15 1.1168 @@ -1,5 +1,8 @@ Changes with Apache 1.3.4 + *) PORT: The I86 version of DGUX has support for strncasecmp and + strcasecmp, so allow it in ap_config.h. [Amiel Lee Yee] PR#3247 + *) Fix ordering of definitions in ap_config.h so that ap_inline is defined before it might be used. [Victor Khimenko] 1.246 +5 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.245 retrieving revision 1.246 diff -u -r1.245 -r1.246 --- ap_config.h 1998/12/12 02:53:42 1.245 +++ ap_config.h 1998/12/12 03:12:17 1.246 @@ -593,8 +593,13 @@ #define NO_KILLPG #undef NO_SETSID #undef NEED_STRDUP +#ifdef _IX86_DG +#undef NEED_STRCASECMP +#undef NEED_STRNCASECMP +#else #define NEED_STRCASECMP #define NEED_STRNCASECMP +#endif #define bzero(a,b) memset(a,0,b) /* A lot of SVR4 systems need this */ #define USE_FCNTL_SERIALIZED_ACCEPT
cvs commit: apache-1.3 STATUS
fielding98/12/11 19:17:29 Modified:.STATUS Log: two down, twelve to go Revision ChangesPath 1.550 +1 -9 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.549 retrieving revision 1.550 diff -u -r1.549 -r1.550 --- STATUS1998/12/12 02:57:06 1.549 +++ STATUS1998/12/12 03:17:28 1.550 @@ -2,7 +2,7 @@ Release: -1.3.4-dev: current. There is discussion on releasing it soon +1.3.4-dev: current. (Lars volunteers as release manager) 1.3.3: Tagged and rolled on Oct. 7. Released on 9th, announced on 10th. @@ -26,9 +26,6 @@ Message-ID: [EMAIL PROTECTED] Status: patch needed since we can't test above without it -* 'kill -HUP' broken on FreeBSD and others: child processes die or - do not restart. - RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * How should an Apache binary release tarball look? @@ -150,11 +147,6 @@ * Ron Record's patch to port Apache to UnixWare 7 (forwarded by Randy). Message-ID: [EMAIL PROTECTED] - Status: - -* Amiel Lee Yee's patch to update ap_config.h for DGUX/Intel - and str[n]casecmp(). - Message-ID: PR#3247 Status: * Juan Gallego's patch to add CSH-style modifiers (:h, :r, :t, :e)
cvs commit: apache-1.3/src/include ap_config.h
fielding98/12/11 19:54:19 Modified:src CHANGES src/include ap_config.h Log: Add defines for USE_FLOCK_SERIALIZED_ACCEPT and SINGLE_LISTEN_UNSERIALIZED_ACCEPT to NetBSD/OpenBSD section to allow serialized accept for multiport listens. Also fixed a misplaced #endif that would skip several defines if DEFAULT_GROUP was overridden. PR: 3120 Submitted by: Roy Fielding, Curt Sampson [EMAIL PROTECTED] Revision ChangesPath 1.1169+9 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1168 retrieving revision 1.1169 diff -u -r1.1168 -r1.1169 --- CHANGES 1998/12/12 03:12:15 1.1168 +++ CHANGES 1998/12/12 03:54:16 1.1169 @@ -1,5 +1,14 @@ Changes with Apache 1.3.4 + *) PORT: Add defines for USE_FLOCK_SERIALIZED_ACCEPT and + SINGLE_LISTEN_UNSERIALIZED_ACCEPT to NetBSD/OpenBSD section + of ap_config.h to allow serialized accept for multiport listens. + [Roy Fielding, Curt Sampson] PR#3120 + + *) PORT: Fixed a misplaced #endif for NetBSD/OpenBSD section + of ap_config.h that would skip several defines if DEFAULT_GROUP + was overridden. [Roy Fielding] + *) PORT: The I86 version of DGUX has support for strncasecmp and strcasecmp, so allow it in ap_config.h. [Amiel Lee Yee] PR#3247 1.247 +3 -1 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- ap_config.h 1998/12/12 03:12:17 1.246 +++ ap_config.h 1998/12/12 03:54:18 1.247 @@ -616,11 +616,13 @@ #endif #ifndef DEFAULT_GROUP #define DEFAULT_GROUP nogroup +#endif #define HAVE_SHMGET 1 #define HAVE_MMAP 1 #define USE_MMAP_SCOREBOARD #define USE_MMAP_FILES -#endif +#define USE_FLOCK_SERIALIZED_ACCEPT +#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT #elif defined(UTS21) #undef HAVE_GMTOFF
cvs commit: apache-1.3 STATUS
fielding98/12/11 21:31:41 Modified:.STATUS Log: 5 down, 10 to go Revision ChangesPath 1.552 +0 -30 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.551 retrieving revision 1.552 diff -u -r1.551 -r1.552 --- STATUS1998/12/12 04:22:58 1.551 +++ STATUS1998/12/12 05:31:40 1.552 @@ -148,15 +148,6 @@ http://www.physics.mcgill.ca/~juan/mod_include.patch Status: Ken -0 for 1.3/+0 for 2.0 -* Patches for the DSO/mod_perl problem (see below for description): - - Ralf's [PATCH] Fix module init - This fixes the mod_so/mod_perl problems described under FINAL RELEASE - SHOWSTOPPERS by doing a more correct init of the modules after loading - through two new core API functions. - Message-ID: [EMAIL PROTECTED] - Status: Ralf +1, Lars +1 - In progress: * Addition of cute little icons to Apache's main icon groups. @@ -167,27 +158,6 @@ CustomLog-like tailoring of directory listing formats Needs patch: - -* Ralf: mod_so doesn't correctly initialise modules. For instance - the handlers of mod_perl are not initialised. - An ap_init_modules() could be done from mod_so but this is too much. - - I've already debugged this up to ap_invoke_handler() and it correctly - sees the handlers from mod_perl (perl-script) and actually runs them. - But under DSO situation it returns DECLINED while under non-DSO - situation it runs fine. Sure, its mod_perl's fault because its mod_perl - code which returns DECLINED. But it definitely seems to be caused by a - missing init in mod_so under DSO situation. I've already asked Doug for - hints but he has not had a chance to look into it. - - Currently at least mod_perl is broken under the DSO situation because of - this missing init in mod_so. But perhaps there are more modules which - have the same problem. This should be fixed for 1.3.2 or at least found - out why it is happening! - - Current status: We have two patches available (see above) but still don't - know the real reason. And the patches work not under - all platforms :-( * get_path_info bug; ap_get_remote_host should be ap_vformatter instead. See: [EMAIL PROTECTED]
cvs commit: apache-1.3/src/include ap_config.h
fielding98/12/11 21:59:58 Modified:src/include ap_config.h Log: UnixWare 7 has improved support for some stuff so that we no longer need USE_FCNTL_SERIALIZED_ACCEPT, NO_LINGCLOSE, or NO_KILLPG. Change already noted in CHANGES, but wasn't completed. Submitted by: Ron Record [EMAIL PROTECTED] Reviewed by: Roy Fielding Revision ChangesPath 1.248 +3 -1 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- ap_config.h 1998/12/12 03:54:18 1.247 +++ ap_config.h 1998/12/12 05:59:57 1.248 @@ -569,8 +569,11 @@ #endif /*_OSD_POSIX*/ #elif defined(UW) +#if UW 700 +#define USE_FCNTL_SERIALIZED_ACCEPT #define NO_LINGCLOSE #define NO_KILLPG +#endif #undef NO_SETSID #undef NEED_STRDUP #define NEED_STRCASECMP @@ -587,7 +590,6 @@ #endif #define NET_SIZE_T size_t #define HAVE_SYSLOG 1 -#define USE_FCNTL_SERIALIZED_ACCEPT #elif defined(DGUX) #define NO_KILLPG
cvs commit: apache-1.3 STATUS
fielding98/12/11 22:04:48 Modified:.STATUS Log: 6 down, 11 to go (bugger me) Revision ChangesPath 1.553 +0 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.552 retrieving revision 1.553 diff -u -r1.552 -r1.553 --- STATUS1998/12/12 05:31:40 1.552 +++ STATUS1998/12/12 06:04:47 1.553 @@ -137,11 +137,6 @@ Status: Marc +1, Jim +1 (concept) * Needs more in-depth review * -* Ron Record's patch to port Apache to UnixWare 7 (forwarded by - Randy). - Message-ID: [EMAIL PROTECTED] - Status: - * Juan Gallego's patch to add CSH-style modifiers (:h, :r, :t, :e) to mod_include's variable processing. Mesage-ID: PR#3246, also available at
cvs commit: apache-1.3 STATUS
fielding98/12/11 22:53:57 Modified:.STATUS Log: 6 down, 9 to go Revision ChangesPath 1.554 +17 -42apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.553 retrieving revision 1.554 diff -u -r1.553 -r1.554 --- STATUS1998/12/12 06:04:47 1.553 +++ STATUS1998/12/12 06:53:57 1.554 @@ -85,53 +85,15 @@ Available Patches: -* Randy's [PATCH] APACI configure changes - This is the original patch which tries to provide the new default path - layout, the single config installation, the APACI top-level Makefile - generation and the TARGET name. - Status: Ralf -0 (with a tendency to -1) - [actually: path layout:+0 (too less generic) - single config: +1 (all ok) - top-level Makefile: -0 (too problematic) - TARGET name:+0 (too incomplete)] - -* Ralf's [PATCH] Configuration (1/4): Path Layout - This patch makes the Apache Classic Path Layout the default and provides - a general way (--with-layout) to specificy the layout. GNU layout is - predefined, more custom layout can be added easily through external - files. - Status: Ralf +1 - -* Ralf's [PATCH] Configuration (2/4): Single Config - This patch is extracted from Randys patch and makes sure that the - access.conf and srm.conf (dummy) files are no longer installed. - Status: Ralf +1 - -* Ralf's [PATCH] Configuration (3/4): APACI Makefile for src/Configure - This patch is a possible alternative answer to Randys attemp to create - an APACI top-level Makefile from within src/Configure. Because Randys - attemp is against the APACI intenations. Of course, this patch is - against the src/Configure intentations, so even the author dislikes it. - But the author thinks at least this is better than doing - mass-exportation of variables and code movements. - Status: Ralf -0, Jim -1 - -* Ralf's [PATCH] Configuration (4/4): TARGET name - This patch tries to complete Randys initial work to make the TARGET - variable more generic and more generally applicable. With it one can - change httpd to apache or to whatever for the particular - installation. - Status: Ralf +1 +* Ralf's [PATCH] Cleanup command line options +Message-ID: [EMAIL PROTECTED] +Status: Ralf +1, Roy +1 * Michael van Elst's patch [PR#3160] to improve mod_rewrite's in-core cache handling by using a hash table. Message-ID: [EMAIL PROTECTED] Status: Lars +1 -* Ralf's [PATCH] MODULE_MAGIC_COOKIE field for module structure -Message-ID: [EMAIL PROTECTED] -Status: Currently assumes 8-byte long, Ralf will fix and repost. - * Marc's [PATCH] PR#3323: recursive includes Message-ID: [EMAIL PROTECTED] Status: Marc +1, Jim +1 (concept) @@ -143,11 +105,24 @@ http://www.physics.mcgill.ca/~juan/mod_include.patch Status: Ken -0 for 1.3/+0 for 2.0 +* Eric Prud'hommeaux's mod_dir mods for file-level access control. +Message-ID: [EMAIL PROTECTED] +Status: + +* Eric Prud'hommeaux's mods for practical negotiation with + file level access control. +Message-ID: [EMAIL PROTECTED] +Status: + In progress: +* Mark Bixby's freshening up the MPE/iX port (mostly APACI) + Message-ID: [EMAIL PROTECTED] +Status: ??? + * Addition of cute little icons to Apache's main icon groups. See [EMAIL PROTECTED] - Status: Ralf +1, Roy +1 (in icons/small subdirectory) +Status: Ralf +1, Roy +1 (in icons/small subdirectory) * Ken's IndexFormat enhancement to mod_autoindex to allow CustomLog-like tailoring of directory listing formats
cvs commit: apache-devsite index.html
fielding98/12/11 23:00:04 Modified:.index.html Log: Add link to Scott Dybiec's [EMAIL PROTECTED] hypermail archive. Revision ChangesPath 1.26 +2 -0 apache-devsite/index.html Index: index.html === RCS file: /export/home/cvs/apache-devsite/index.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- index.html1998/10/03 10:03:21 1.25 +++ index.html1998/12/12 07:00:04 1.26 @@ -41,6 +41,8 @@ /LI LIA HREF=mail/Archives/A of the Apache mailing lists. /LI + LIA HREF=http://www.humanfactor.com/cgi-bin/cgi-delegate/apache-ML/nh/;Hypermail archive of new-httpd/A. + /LI LIHow to contribute A HREF=patches.htmlcode patches/A to Apache. /LI /UL
cvs commit: apache-1.3 STATUS
fielding98/12/11 23:28:15 Modified:.STATUS Log: *sigh*, back to 10. If we want 1.3.4 out this year, the release needs to go out on Thursday. I probably won't be able to work on it again until mid January, so it's time for others to step up. Revision ChangesPath 1.555 +13 -6 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.554 retrieving revision 1.555 diff -u -r1.554 -r1.555 --- STATUS1998/12/12 06:53:57 1.554 +++ STATUS1998/12/12 07:28:14 1.555 @@ -15,17 +15,20 @@ RELEASE SHOWSTOPPERS: * Paul's [PATCH] Win32 device files - Message-ID: [EMAIL PROTECTED] - and [EMAIL PROTECTED] - Status: Someone who knows the current status of this thing should apply - it now, since the rest of us can't test it otherwise. +Message-ID: [EMAIL PROTECTED] +and [EMAIL PROTECTED] +Status: Someone who knows the current status of this thing should +apply it now, since the rest of us can't test it otherwise. * nmake compilation broken on Win95 Paul Ausbeck says the problem is that the distribution uses %PARAM% type arguments in nmake invokations. - Message-ID: [EMAIL PROTECTED] - Status: patch needed since we can't test above without it +Message-ID: [EMAIL PROTECTED] +Status: patch needed since we can't test above without it +* long pathnames with many components and no AllowOverride None +Status: Marc is looking at it + RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * How should an Apache binary release tarball look? @@ -84,6 +87,10 @@ vhost-xxx.html document out of it. -- rse Available Patches: + +* PR#2575 problem with ap_assert macro +Message-ID: [EMAIL PROTECTED] +Status: * Ralf's [PATCH] Cleanup command line options Message-ID: [EMAIL PROTECTED]
