cvs commit: apache-1.3/src Configuration.tmpl
fielding99/08/08 23:25:25 Modified:src Configuration.tmpl Log: Move mod_auth_digest to where it makes sense. If there is a problem with the ordering here, then we should move all the auth modules and not just the latest one. Revision ChangesPath 1.120 +13 -12apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- Configuration.tmpl1999/08/08 22:45:10 1.119 +++ Configuration.tmpl1999/08/09 06:25:24 1.120 @@ -322,17 +322,6 @@ AddModule modules/standard/mod_userdir.o -## "digest" implements HTTP Digest Authentication rather than the less -## secure Basic Auth used by the other modules. This is an updated -## version of mod_digest, but it is not well tested and is therefore -## marked experimental. -## Note: if you add this module in then you might also need the -## truerand library (available for example from -## ftp://research.att.com/dist/mab/librand.shar) - see the Rule -## DEV_RANDOM above for more info. - -# AddModule modules/experimental/mod_auth_digest.o - ## The proxy module enables the server to act as a proxy for outside ## http and ftp services. It's not as complete as it could be yet. ## NOTE: You do not want this module UNLESS you are running a proxy; @@ -370,9 +359,21 @@ # AddModule modules/standard/mod_auth_db.o ## "digest" implements HTTP Digest Authentication rather than the less -## secure Basic Auth used by the other modules. +## secure Basic Auth used by the other modules. This is the old version. # AddModule modules/standard/mod_digest.o + +## "auth_digest" implements HTTP/1.1 Digest Authentication (RFC 2617) +## rather than the less secure Basic Auth used by the other modules. +## This is an updated version of mod_digest, but it is not as well tested +## and is therefore marked experimental. Use either the one above, or +## this one below, but not both digest modules. +## Note: if you add this module in then you might also need the +## truerand library (available for example from +## ftp://research.att.com/dist/mab/librand.shar) - see the Rule +## DEV_RANDOM above for more info. + +# AddModule modules/experimental/mod_auth_digest.o ## Optional response header manipulation modules. ##
cvs commit: apache-1.3/src/main http_core.c
fielding99/08/09 00:29:30
Modified:src/main http_core.c
Log:
Local struct mmap conflicts with system structure name on DYNIX,
and is pretty damn confusing anyway. Changed to mmap_rec.
PR: 4735
Revision ChangesPath
1.271 +3 -3 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- http_core.c 1999/07/03 07:59:48 1.270
+++ http_core.c 1999/08/09 07:29:29 1.271
@@ -2977,14 +2977,14 @@
static int do_nothing(request_rec *r) { return OK; }
#ifdef USE_MMAP_FILES
-struct mmap {
+struct mmap_rec {
void *mm;
size_t length;
};
static void mmap_cleanup(void *mmv)
{
-struct mmap *mmd = mmv;
+struct mmap_rec *mmd = mmv;
if (munmap(mmd->mm, mmd->length) == -1) {
ap_log_error(APLOG_MARK, APLOG_ERR, NULL,
@@ -3147,7 +3147,7 @@
#ifdef USE_MMAP_FILES
}
else {
- struct mmap *mmd;
+ struct mmap_rec *mmd;
mmd = ap_palloc(r->pool, sizeof(*mmd));
mmd->mm = mm;
cvs commit: apache-1.3/src/os/unix os.c
fielding99/08/09 00:38:50 Modified:.INSTALL src CHANGES Configure src/helpers GuessOS src/include ap_config.h src/os/unix os.c Log: Improved compilation and DSO support on Sequent DYNIX/ptx. PR: 4735 Submitted by: Ian Turner <[EMAIL PROTECTED]> Reviewed by: Roy Fielding Revision ChangesPath 1.59 +1 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /home/cvs/apache-1.3/INSTALL,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- INSTALL 1999/07/30 09:53:07 1.58 +++ INSTALL 1999/08/09 07:38:32 1.59 @@ -82,7 +82,7 @@ - Linux - SunOS - UnixWare - Mac OS X Server - FreeBSD - Solaris - AIX - Mac OS - OpenBSD - IRIX - SCO - OpenStep/Mach - - NetBSD- HPUX - ReliantUNIX + - NetBSD- HPUX - ReliantUNIX - DYNIX/ptx - BSDI - Digital Unix - DGUX o Entirely unsupported platforms are: 1.1413+10 -5 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1412 retrieving revision 1.1413 diff -u -r1.1412 -r1.1413 --- CHANGES 1999/08/09 00:04:30 1.1412 +++ CHANGES 1999/08/09 07:38:36 1.1413 @@ -1,5 +1,11 @@ Changes with Apache 1.3.8 + *) PORT: Improved compilation and DSO support on Sequent DYNIX/ptx. + [Ian Turner <[EMAIL PROTECTED]>] PR#4735 + + *) Local struct mmap in http_core.c conflicted with system structure + name on DYNIX -- changed to mmap_rec. [Roy Fielding] PR#4735 + *) Added updated mod_digest as modules/experimental/mod_auth_digest. [Ronald Tschalär <[EMAIL PROTECTED]>] @@ -13,17 +19,16 @@ *) RewriteLock/RewriteMap didn't work properly with virtual hosts. [Dmitry Khrustalev <[EMAIL PROTECTED]>] PR#3874 - *) Support for compaq/tandem/com. - [Ottati, Michael" <[EMAIL PROTECTED]>, dirkx] + *) PORT: Support for compaq/tandem/com. + [Michael Ottati <[EMAIL PROTECTED]>, dirkx] *) Added SHA1 password encryption support to easy migration from - Netscape servers. See support/SHA1 for more information; based - on the code contributed by Clinton Wong <[EMAIL PROTECTED]>. + Netscape servers. See support/SHA1 for more information. Caused the separation of ap_md5.c into md5, sha1 and a general ap_checkpass.c with just a validate_passwd routine. Added a couple of flags to support/htpasswd. Some reuse of the to64() function; hence renamed to ap_to64(). - [dirkx] + [Dirk-Willem van Gulik, Clinton Wong <[EMAIL PROTECTED]>] *) Change for EBCDIC platforms (TPF and BS2000) to correctly deal with ASCII/EBCDIC conversions in "ident" query. 1.367 +59 -3 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.366 retrieving revision 1.367 diff -u -r1.366 -r1.367 --- Configure 1999/08/06 22:15:54 1.366 +++ Configure 1999/08/09 07:38:37 1.367 @@ -699,11 +699,42 @@ OS='Paragon OSF/1' CFLAGS="$CFLAGS -DPARAGON" ;; -*DYNIX*) +*-sequent-ptx2.*.*) DEF_WANTHSREGEX=yes - OS='SEQUENT' - CFLAGS="$CFLAGS -DSEQUENT" + OS='SEQUENT DYNIX/ptx v2.*.*' + CFLAGS="$CFLAGS -DSEQUENT=20 -Wc,-pw" + LIBS="$LIBS -lsocket -linet -lnsl -lc -lseq" ;; +*-sequent-ptx4.0.*) + DEF_WANTHSREGEX=yes + OS='SEQUENT DYNIX/ptx v4.0.*' + CFLAGS="$CFLAGS -DSEQUENT=40 -Wc,-pw" + LIBS="$LIBS -lsocket -linet -lnsl -lc" + ;; +*-sequent-ptx4.[123].*) + DEF_WANTHSREGEX=yes + OS='SEQUENT DYNIX/ptx v4.1.*/v4.2.*' + CFLAGS="$CFLAGS -DSEQUENT=41 -Wc,-pw" + LIBS="$LIBS -lsocket -lnsl -lc" + ;; +*-sequent-ptx4.4.*) + DEF_WANTHSREGEX=yes + OS='SEQUENT DYNIX/ptx v4.4.*' + CFLAGS="$CFLAGS -DSEQUENT=44 -Wc,-pw" + LIBS="$LIBS -lsocket -lnsl -lc" + ;; +*-sequent-ptx4.5.*) + DEF_WANTHSREGEX=yes + OS='SEQUENT DYNIX/ptx v4.5.*' + CFLAGS="$CFLAGS -DSEQUENT=45 -Wc,-pw" + LIBS="$LIBS -lsocket -lnsl -lc" + ;; +*-sequent-ptx5.0.*) + DEF_WANTHSREGEX=yes + OS='S
cvs commit: apache-1.3/src/main http_main.c
fielding99/08/09 00:54:54
Modified:src/main http_main.c
Log:
Fix last warning fix -- uid_t is long on some platforms.
Revision ChangesPath
1.470 +3 -2 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- http_main.c 1999/08/08 13:31:50 1.469
+++ http_main.c 1999/08/09 07:54:52 1.470
@@ -3700,7 +3700,7 @@
#endif
setuid(ap_user_id) == -1)) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change to uid: %d", (int) ap_user_id);
+ "setuid: unable to change to uid: %ld", (long) ap_user_id);
clean_child_exit(APEXIT_CHILDFATAL);
}
#endif
@@ -4885,7 +4885,8 @@
/* Only try to switch if we're running as root */
if (!geteuid() && setuid(ap_user_id) == -1) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change to uid: %d", (int)
ap_user_id);
+ "setuid: unable to change to uid: %ld",
+ (long) ap_user_id);
exit(1);
}
#endif
cvs commit: apache-1.3 STATUS
fielding99/08/09 01:11:05 Modified:.STATUS Log: Clean up a bit ... needs better prioritization. Some day. Revision ChangesPath 1.738 +36 -53apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.737 retrieving revision 1.738 diff -u -r1.737 -r1.738 --- STATUS1999/08/09 00:04:29 1.737 +++ STATUS1999/08/09 08:11:03 1.738 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/09 00:04:29 $] + Last modified at [$Date: 1999/08/09 08:11:03 $] Release: @@ -22,82 +22,68 @@ 2.0 : In pre-alpha development, see apache-2.0 and apache-apr repository -Binaries (1.3.6): +Binaries (1.3.8): Platform Avail. Volunteer -- alpha-dec-osf3.0 no Sameer Parekh - alpha-dec-osf4.0 yes Lars Eilebrecht, Ken Coar - armv4l-whatever-linux2yes Rasmus Lerdorf + alpha-dec-osf4.0 no Lars Eilebrecht, Ken Coar + armv4l-whatever-linux2no Rasmus Lerdorf hppa1.1-hp-hpux no Rob Hartill i386-slackware-linux(a.out) no Sameer Parekh i386-sun-solaris2.5 no Sameer Parekh - i386-sun-solaris2.7 yes Cliff Skolnick + i386-sun-solaris2.7 no Cliff Skolnick i386-unixware-svr4no Sameer Parekh i386-unknown-freebsd2.1 no Andrew Wilson, Brian Tao - i386-unknown-freebsd2.2.8 yes Jim Jagielski - i386-whatever-freebsd3.0 yes Ken Coar - i386-whatever-freebsd3.0 yes Dirk-Willem van Gulik + i386-unknown-freebsd2.2.8 no Jim Jagielski + i386-whatever-freebsd3.0 no Ken Coar + i386-whatever-freebsd3.0 no Dirk-Willem van Gulik i686-pc-freebsd3.1no Ralf S. Engelschall - i586-unknown-linux2 yes Ralf S. Engelschall, Lars Eilebrecht - i686-unknown-linux2 yes Lars Eilebrecht - i686-whatever-linux2 yes Ken Coar + i586-unknown-linux2 no Ralf S. Engelschall, Lars Eilebrecht + i686-unknown-linux2 no Lars Eilebrecht + i686-whatever-linux2 no Ken Coar i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass i386-unknown-netBSD-1.2.1 N/A Lars Eilebrecht - i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht + i386-unknown-netBSD-1.3.2 no Lars Eilebrecht i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie - i386-sni-svr4 yes Martin Kraemer + i386-sni-svr4 no Martin Kraemer m68k-apple-aux3.1.1 no Jim Jagielski m88k-dg-dgux5.4R2.01 no Sameer parekh m88k-next-nextno Rob Hartill mips-sgi-irix5.3 no Mark Imbrianco - mips-sgi-irix6.2 yes Lars Eilebrecht + mips-sgi-irix6.2 no Lars Eilebrecht mips-sgi-irix6.4 no Lars Eilebrecht - mips-sni-svr4 yes Martin Kraemer - OS/2 yes Brian Havard + mips-sni-svr4 no Martin Kraemer + OS/2 no Brian Havard rs6000-ibm-aix3.2.5 no Sameer Parekh - rs6000-ibm-aix4.1 yes Lars Eilebrecht + rs6000-ibm-aix4.1 no Lars Eilebrecht rs6000-ibm-aix4.2 no Bill Stoddard rs6000-ibm-aix4.3.2 no Bill Stoddard - sparc-sun-solaris2.5 yes Lars Eilebrecht - sparc-sun-solaris2.6 yes Lars Eilebrecht - sparc-sun-solaris2.7 yes Cliff Skolnick - sparc-sun-sunos4.1.4 yes Lars Eilebrecht, Michael Douglass + sparc-sun-solaris2.5 no Lars Eilebrecht + sparc-sun-solaris2.6 no Lars Eilebrecht + sparc-sun-solaris2.7 no Cliff Skolnick + sparc-sun-sunos4.1.4 no Lars Eilebrecht, Michael Douglass sparc-sun-sunos4.1.3_U1 no Sameer Parekh - sparc-unknown-linux yes Lars Eilebrecht + sparc-unknown-linux no Lars Eilebrecht mips-dec-ultrix4.4no Sameer Parekh - mips-unknown-linuxyes Lars Eilebrecht + mips-unknown-linuxno Lars Eilebrecht RELEASE SHOWSTOPPERS: RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: -* David Harris' note of leakage problems in adding/removing - modules, plus additional findings by Dean and Jim. Discussion - in thread following message-ID below. - Messa
cvs commit: apache-devsite fetch-from-cvs.txt
fielding99/08/09 01:20:07
Modified:.fetch-from-cvs.txt
Log:
Update example to work with new directory names.
Submitted by: Magnus Bodin <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision ChangesPath
1.2 +13 -22apache-devsite/fetch-from-cvs.txt
Index: fetch-from-cvs.txt
===
RCS file: /export/home/cvs/apache-devsite/fetch-from-cvs.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetch-from-cvs.txt1998/04/17 22:05:34 1.1
+++ fetch-from-cvs.txt1999/08/09 08:20:06 1.2
@@ -1,28 +1,21 @@
+#!/usr/bin/perl -w
+#
+# Simple script to fetch the latest tarball in from-cvs/ and unpack it
+# in $dir.
+#
+# Script by Doug MacEachern <[EMAIL PROTECTED]>
+# minor fix by Magnus Bodin <[EMAIL PROTECTED]>
-From [EMAIL PROTECTED] Fri Apr 17 15:07:32 1998
-Date: Tue, 03 Feb 1998 09:00:23 +1300
-From: Doug MacEachern <[EMAIL PROTECTED]>
-Organization: SITEL Telebusiness NZ, Ltd.
-To: new-httpd@apache.org
-Subject: Re: Help me? The build isn't working.
-Reply-To: new-httpd@apache.org
-
-This script will fetch the latest tarball in from-cvs/ and unpack it in $dir
-I posted it a few months ago, maybe it should be made available somewhere on
-dev.apache.org?
-
--Doug
-
-#!/opt/perl5/bin/perl -w
-
use strict;
use URI::URL ();
use HTML::LinkExtor ();
use LWP::Simple;
use File::Path;
-my $dir = shift || "/tmp/apache_1.3-dev";
-my $cvs = "http://dev.apache.org/from-cvs/";;
+my $ver = '1.3';
+my $dir = shift || "/tmp/apache_$ver-dev";
+my $cvs = "http://dev.apache.org/from-cvs/apache-$ver/";;
+my $filptn = "apache-$ver\_";
rmtree $dir;
mkpath $dir, 0755;
@@ -34,10 +27,10 @@
sub cb {
my($tag, %links) = @_;
-return unless exists $links{href} and $links{href} =~ /apache_/;
+return unless exists $links{href} and $links{href} =~ /$fileptn/;
return unless ++$cnt == 4;
-my $file = URI::URL->new($links{href})->rel;
+my $file = URI::URL->new($links{href})->rel($cvs);
warn "mirror $links{href} => $file\n";
mirror $links{href} => $file;
@@ -46,6 +39,4 @@
}
$p->parse(get $cvs);
-
-
cvs commit: apache-devsite anoncvs.txt
fielding99/08/09 01:28:17 Modified:.anoncvs.txt Log: This is getting to be a frequently asked developer question. Revision ChangesPath 1.7 +18 -0 apache-devsite/anoncvs.txt Index: anoncvs.txt === RCS file: /export/home/cvs/apache-devsite/anoncvs.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- anoncvs.txt 1998/11/24 17:15:52 1.6 +++ anoncvs.txt 1999/08/09 08:28:16 1.7 @@ -1,3 +1,21 @@ +Anonymous CVS access is not currently working. There is, however, + +<http://www.apache.org/websrc/cvsweb.cgi> + +and an rsync server at dev.apache.org. Try + +rsync dev.apache.org:: + +to get a listing of the modules. + +rsync -avz dev.apache.org::module-name local-directory-name + +to grab or update a local copy of the "module-name" sources. + +The rest of this file can be ignored until we get anonymous CVS +access working again. + +== HOW TO USE ANONCVS ==
cvs commit: apache-1.3/src/main http_protocol.c
fielding99/08/09 02:41:41
Modified:src CHANGES
src/main http_protocol.c
Log:
Flush the output buffer immediately after sending an error or redirect
response, since the result will be needed by the client to abort a
long data transfer or restart a series of pipelined requests.
Submitted by: Tom Vaughan <[EMAIL PROTECTED]>, Roy Fielding
Revision ChangesPath
1.1414+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1413
retrieving revision 1.1414
diff -u -r1.1413 -r1.1414
--- CHANGES 1999/08/09 07:38:36 1.1413
+++ CHANGES 1999/08/09 09:41:36 1.1414
@@ -1,5 +1,10 @@
Changes with Apache 1.3.8
+ *) Flush the output buffer immediately after sending an error or redirect
+ response, since the result may be needed by the client to abort a
+ long data transfer or restart a series of pipelined requests.
+ [Tom Vaughan <[EMAIL PROTECTED]>, Roy Fielding]
+
*) PORT: Improved compilation and DSO support on Sequent DYNIX/ptx.
[Ian Turner <[EMAIL PROTECTED]>] PR#4735
1.277 +3 -5 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- http_protocol.c 1999/08/08 11:45:18 1.276
+++ http_protocol.c 1999/08/09 09:41:39 1.277
@@ -949,7 +949,6 @@
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
"request failed: URI too long");
ap_send_error_response(r, 0);
-ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -963,7 +962,6 @@
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
"request failed: error reading the headers");
ap_send_error_response(r, 0);
-ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -983,7 +981,6 @@
r->header_only = 0;
r->status = HTTP_BAD_REQUEST;
ap_send_error_response(r, 0);
-ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -1016,7 +1013,6 @@
"client sent HTTP/1.1 request without hostname "
"(see RFC2068 section 9, and 14.23): %s", r->uri);
ap_send_error_response(r, 0);
-ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -1037,7 +1033,6 @@
"client sent an unrecognized expectation value of "
"Expect: %s", expect);
ap_send_error_response(r, 0);
-ap_rflush(r);
(void) ap_discard_request_body(r);
ap_log_transaction(r);
return r;
@@ -2487,6 +2482,7 @@
if (r->header_only) {
ap_finalize_request_protocol(r);
+ap_rflush(r);
return;
}
}
@@ -2510,6 +2506,7 @@
ap_rputs(custom_response + 1, r);
ap_kill_timeout(r);
ap_finalize_request_protocol(r);
+ap_rflush(r);
return;
}
/*
@@ -2773,4 +2770,5 @@
}
ap_kill_timeout(r);
ap_finalize_request_protocol(r);
+ap_rflush(r);
}
cvs commit: apache-1.3/src CHANGES
fielding99/08/13 18:24:31 Modified:src CHANGES Log: Update to reflect the reality of changes since first 1.3.8. Revision ChangesPath 1.1420+59 -13apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1419 retrieving revision 1.1420 diff -u -r1.1419 -r1.1420 --- CHANGES 1999/08/13 06:37:51 1.1419 +++ CHANGES 1999/08/14 01:24:29 1.1420 @@ -1,23 +1,69 @@ Changes with Apache 1.3.9 - *) Fixed generated AddModule adjustments in APACI's `configure' script in - order to allow (new) modules like mod_vhost_alias to be handled correctly - (which was touched by the adjustments for mod_alias). + *) Translate module names to dll names for OS/2 so that they are no more + than 8 characters long and have an extension of "dll" instead of "so". + [Brian Havard] + + *) Print out pointer to Rule DEV_RANDOM when truerand lib not found. + Fix test-compile check to check for randbyte instead of trand32. + Use ap_base64encode_binary/decode instead of copy in mod_auth_digest.c + and tweak to make Amaya happier. [Ronald Tschalär] + + *) Ensure that the installed expat include files are world readable, + just like the other header files. [Martin Kraemer] + + *) Fixed generated AddModule adjustments in APACI's `configure' script + in order to allow (new) modules like mod_vhost_alias to be handled + correctly (which was touched by the adjustments for mod_alias). [Ralf S. Engelschall] + + *) For binary builds, add -R flag to apachectl to work around the lack of + an absolute path to the ./libexec directory where the libhttp.ep file + is needed for SHARED_CORE architectures. [Randy Terbush] - *) For binary builds, add -R flag to apachectl to work around the - lack of an absolute path to the ./libexec directory where - libhttp.ep file is needed for SHARED_CORE architectures. - [Randy Terbush [EMAIL PROTECTED] + *) WIN32: Create the CGI script process as DETACHED. This may solve the + problem observed by some Win95/98 users where they get CGI script + output sent to the console. [Bill Stoddard] *) Roll back (re)naming in the uuencode/decode section. The ap/ap_ - routines are now called ap_base64* and are 'plain'. I.e. no - pool access or anything clever. Inside apache the routines - acting like pstrdup are called ap_puuencode() and ap_uudecode(). - The odly named ap_uuencode(), ap_uudecode() is kept around for - now but depricated. [dirkx] + routines are now called ap_base64* and are 'plain' (i.e., no + pool access or anything clever). Inside apache the routines + acting like pstrdup are called ap_puuencode() and ap_puudecode(). + The oddly named ap_uuencode(), ap_uudecode() is kept around for + now but deprecated. [dirkx] + + *) WIN32: Migrate to InstallShield 5.5 and provide a bit more error + checking. Allow compiling on VS 6.0. [Randy Terbush] + + *) Fixed assumption of absolute paths in binbuild.sh. [Tony Finch] + + *) Use TestCompile to search for the truerand library (rather than blindly + assuming its existence). If it is not found, complain (but do not + exit - yet). [Martin Kraemer] + + *) We forgot to add the new exported function names to + src/support/httpd.exp. [Bill Stoddard, Randy Terbush] + + *) Add description of -T command-line option to usage(). + [Ralf S. Engelschall] + + *) For "some" platforms (notably, EBCDIC based ones), libos needs to be + searched only AFTER libap has been searched, because libap needs + some symbols from libos. [Martin Kraemer] + + *) Fix conflict with original mod_digest related to the symbol of the + module dispatch list (which has to be unique for DSO and follow the + usual conventions for the installation procedure). + [Ralf S. Engelschall] + + *) Add a dbm-library check for the "usual places" (-ldbm, -lndbm, -ldb) + for other platforms as well. [Martin Kraemer] + + *) Make ap_sha1.c compile for EBCDIC platforms: replace remaining LONG + types by AP_LONG and replace reference to renamed variable 'ubuf' + by 'buffer'. [Martin Kraemer] -Changes with Apache 1.3.8 +Changes with Apache 1.3.8 [not released] *) Flush the output buffer immediately after sending an error or redirect response, since the result may be needed by the client to abort a
cvs commit: apache-1.3 configure
fielding99/08/14 01:29:06
Modified:.configure
Log:
Don't include mod_auth_digest unless explicitly requested,
even if they asked for all modules.
Revision ChangesPath
1.102 +2 -1 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- configure 1999/08/13 15:05:48 1.101
+++ configure 1999/08/14 08:29:05 1.102
@@ -742,6 +742,7 @@
eval "module_${module}=yes"
done
IFS="$OOIFS"
+ module_auth_digest=no # conflict with mod_digest
;;
most )
OOIFS="$IFS"
@@ -754,7 +755,7 @@
module_mmap_static=no # not all platforms have
mmap()
module_so=no # not all platforms have
dlopen()
module_example=no # only for developers
-module_auth_digest=no # experimental
+ module_auth_digest=no # conflict with mod_digest
module_log_agent=no # deprecated
module_log_referer=no # deprecated
;;
cvs commit: apache-1.3/src/support httpd.exp
fielding99/08/14 01:35:55 Modified:src ApacheCore.def ApacheCoreOS2.def CHANGES Configuration.tmpl src/ap ap_base64.c ap_checkpass.c ap_md5c.c ap_sha1.c src/include ap_md5.h ap_sha1.h httpd.h src/main http_protocol.c util.c src/modules/experimental mod_auth_digest.c src/modules/proxy proxy_ftp.c src/modules/standard mod_unique_id.c src/support httpd.exp Log: Clean up the base64 and SHA1 additions and make sure they are represented in the ApacheCore.def, ApacheCoreOS2.def, and httpd.exp files. I am very unhappy with the implementation assumptions between ap_validate_password and the various encoding routines, like the length of an encoded password never being greater than 120 characters, but I have no time to fix them right now. Not to mention all the other usages of magic numbers with no explanation. Yuck. Revision ChangesPath 1.19 +17 -3 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ApacheCore.def1999/08/09 15:31:08 1.18 +++ ApacheCore.def1999/08/14 08:35:42 1.19 @@ -343,6 +343,20 @@ ap_standalone @337 ap_server_confname @338 ap_sub_req_method_uri @339 - ap_sha1_base64 @340 - ap_puudecode@341 - ap_puuencode@342 + ap_regerror @341 + ap_regexec @342 + ap_field_noparam @343 + ap_pbase64decode @344 + ap_pbase64encode @345 + ap_base64encode @346 + ap_base64encode_binary @347 + ap_base64encode_len @348 + ap_base64decode @349 + ap_base64decode_binary @350 + ap_base64decode_len @351 + ap_SHA1Init @352 + ap_SHA1Update_binary @353 + ap_SHA1Update @354 + ap_SHA1Final @355 + ap_sha1_base64 @356 + 1.5 +16 -5 apache-1.3/src/ApacheCoreOS2.def Index: ApacheCoreOS2.def === RCS file: /home/cvs/apache-1.3/src/ApacheCoreOS2.def,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheCoreOS2.def 1999/08/10 16:12:20 1.4 +++ ApacheCoreOS2.def 1999/08/14 08:35:42 1.5 @@ -268,7 +268,7 @@ ;os_stat @261 ;readdir @262 regcomp @263 - ap_regexec @264 + regexec @264 regfree @265 ;access_module @266 ;alias_module @267 @@ -349,7 +349,18 @@ ap_dummy_mutex @343 ap_signal @344 ap_regerror @345 - ap_puudecode @346 - ap_puuencode @347 - ap_sha1_base64 @348 - ap_field_noparam @349 + ap_regexec @346 + ap_field_noparam @347 + ap_pbase64decode @348 + ap_pbase64encode @349 + ap_base64encode @350 + ap_base64encode_binary @351 + ap_base64encode_len @352 + ap_base64decode @353 + ap_base64decode_binary @354 + ap_base64decode_len @355 + ap_SHA1Init @356 + ap_SHA1Update_binary@357 + ap_SHA1Update @358 + ap_SHA1Final@359 + ap_sha1_base64 @360 1.1421+12 -4 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1420 retrieving revision 1.1421 diff -u -r1.1420 -r1.1421 --- CHANGES 1999/08/14 01:24:29 1.1420 +++ CHANGES 1999/08/14 08:35:43 1.1421 @@ -1,5 +1,9 @@ Changes with Apache 1.3.9 + *) Don't allow configure to include mod_auth_digest unless it is + explicitly requested, even if the user asked for all modules. + [Roy Fielding] + *) Translate module names to dll names for OS/2 so that they are no more than 8 characters long and have an extension of "dll" instead of "so". [Brian Havard] @@ -25,12 +29,16 @@ problem observed by some Win95/98 users where they get CGI script output sent to the console. [Bill Stoddard] - *) Roll back (re)naming in the uuencode/decode section. The ap/ap_ + *) Fix (re)naming in the uuencode/decode section. The ap/ap_ routines are now called ap_base64* and are 'plain' (i.e., no - pool access or anything clever). Inside apache the routines - acting like pstrdup are called ap_puuencode() and ap_puudecode(). - The oddly named ap_uuencode(), ap_uudecode() is kept around for + pool access or anything clever). Inside util.c the routines acting + like pstrdup are called ap_pbase64encode() and ap_pbase64decode(). + The oddly named ap
cvs commit: apache-1.3/src/include ap_mmn.h
fielding99/08/14 01:53:49 Modified:src/include ap_mmn.h Log: Minor MMN bump to note the addition of all the 1.3.6-9 functions. Revision ChangesPath 1.41 +10 -4 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- ap_mmn.h 1999/07/29 17:53:55 1.40 +++ ap_mmn.h 1999/08/14 08:53:48 1.41 @@ -217,9 +217,15 @@ * 19990320.1 - add ap_vrprintf() * 19990320.2 - add cmd_parms.context, ap_set_config_vectors, *export ap_add_file_conf - * 19990320.3 - add ap_regexec() - * 19990604.4 - add ap_field_noparam() - * 19990621.5 - add local_ip/host to conn_rec for mass-vhost + * 19990320.3 - add ap_regexec() and ap_regerror() + * 19990320.4 - add ap_field_noparam() + * 19990320.5 - add local_ip/host to conn_rec for mass-vhost + * 19990320.6 - add ap_SHA1Final(), ap_SHA1Init(), + *ap_SHA1Update_binary(), ap_SHA1Update(), + *ap_base64encode(), ap_base64encode_binary(), + *ap_base64encode_len(), ap_base64decode(), + *ap_base64decode_binary(), ap_base64decode_len(), + *ap_pbase64decode(), ap_pbase64encode() */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */ @@ -227,7 +233,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 19990320 #endif -#define MODULE_MAGIC_NUMBER_MINOR 5 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ /* Useful for testing for features. */
cvs commit: apache-1.3/src/main http_protocol.c
fielding99/08/14 02:21:20
Modified:src CHANGES
src/main http_protocol.c
Log:
Remove bogus error message when a redirect doesn't set Location.
Instead, use an empty string to avoid coredump if the error message
was supposed to include a location but doesn't.
Revision ChangesPath
1.1422+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1421
retrieving revision 1.1422
diff -u -r1.1421 -r1.1422
--- CHANGES 1999/08/14 08:35:43 1.1421
+++ CHANGES 1999/08/14 09:21:15 1.1422
@@ -1,5 +1,9 @@
Changes with Apache 1.3.9
+ *) Remove bogus error message when a redirect doesn't set Location.
+ Instead, use an empty string to avoid coredump if the error message
+ was supposed to include a location. [Roy Fielding]
+
*) Don't allow configure to include mod_auth_digest unless it is
explicitly requested, even if the user asked for all modules.
[Roy Fielding]
1.279 +7 -18 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- http_protocol.c 1999/08/14 08:35:48 1.278
+++ http_protocol.c 1999/08/14 09:21:19 1.279
@@ -2450,24 +2450,13 @@
ap_clear_table(r->err_headers_out);
if (ap_is_HTTP_REDIRECT(status) || (status == HTTP_CREATED)) {
- if ((location != NULL) && *location) {
- ap_table_setn(r->headers_out, "Location", location);
- }
- else {
- /*
- * We're supposed to tell the client to go somewhere,
- * but the destination was omitted. Turn this into
- * a 500 status with an explanatory note in the error log.
- */
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
- "resource created or redirection requested "
- "(status=%03d) but no Location field set "
- "(URI=%s)",
- r->status, r->unparsed_uri);
- r->status = status = HTTP_INTERNAL_SERVER_ERROR;
- r->status_line = NULL;
- }
- }
+if ((location != NULL) && *location) {
+ ap_table_setn(r->headers_out, "Location", location);
+}
+else {
+location = ""; /* avoids coredump when printing, below */
+}
+}
r->content_language = NULL;
r->content_languages = NULL;
cvs commit: apache-1.3/src/ap ap_md5c.c
fielding99/08/14 02:31:05 Modified:src/ap ap_md5c.c Log: Quiet warning -- strange that gcc doesn't auto-cast the literal string to match the argument type. Revision ChangesPath 1.30 +1 -1 apache-1.3/src/ap/ap_md5c.c Index: ap_md5c.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_md5c.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ap_md5c.c 1999/08/14 08:35:45 1.29 +++ ap_md5c.c 1999/08/14 09:31:04 1.30 @@ -487,7 +487,7 @@ /* * Then our magic string */ -ap_MD5Update(&ctx, AP_MD5PW_ID, AP_MD5PW_IDLEN); +ap_MD5Update(&ctx, (const unsigned char *) AP_MD5PW_ID, AP_MD5PW_IDLEN); /* * Then the raw salt
cvs commit: apache-1.3 STATUS
fielding99/08/14 02:36:37 Modified:.STATUS Log: bedtime Revision ChangesPath 1.741 +53 -58apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.740 retrieving revision 1.741 diff -u -r1.740 -r1.741 --- STATUS1999/08/13 07:17:08 1.740 +++ STATUS1999/08/14 09:36:34 1.741 @@ -1,11 +1,12 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/13 07:17:08 $] + Last modified at [$Date: 1999/08/14 09:36:34 $] Release: -1.3.9-dev: current. +1.3.9-dev: COUNTDOWN started at 08/14 2:30am PDT + Tarball planned for Sunday morning unless problems found. -1.3.8: Rolled on August 9. +1.3.8: Not released. 1.3.7: Not released. 1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th. 1.3.5: Not released. @@ -17,63 +18,8 @@ 2.0 : In pre-alpha development, see apache-2.0 and apache-apr repository -Binaries (1.3.8): - - Platform Avail. Volunteer - -- - alpha-dec-osf3.0 no Sameer Parekh - alpha-dec-osf4.0 no Lars Eilebrecht, Ken Coar - armv4l-whatever-linux2no Rasmus Lerdorf - hppa1.1-hp-hpux no Rob Hartill - i386-slackware-linux(a.out) no Sameer Parekh - i386-sun-solaris2.5 no Sameer Parekh - i386-sun-solaris2.7 no Cliff Skolnick - i386-unixware-svr4no Sameer Parekh - i386-unknown-freebsd2.1 no Andrew Wilson, Brian Tao - i386-unknown-freebsd2.2.8 no Jim Jagielski - i386-whatever-freebsd3.0 no Ken Coar - i386-whatever-freebsd3.0 no Dirk-Willem van Gulik - i686-pc-freebsd3.1no Ralf S. Engelschall - i586-unknown-linux2 no Ralf S. Engelschall, Lars Eilebrecht - i686-unknown-linux2 no Lars Eilebrecht - i686-whatever-linux2 no Ken Coar - i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass - i386-unknown-netBSD-1.2.1 N/A Lars Eilebrecht - i386-unknown-netBSD-1.3.2 no Lars Eilebrecht - i386-unknown-sco3 no Ben Laurie - i386-unknown-sco5 no Ben Laurie - i386-sni-svr4 no Martin Kraemer - m68k-apple-aux3.1.1 no Jim Jagielski - m88k-dg-dgux5.4R2.01 no Sameer parekh - m88k-next-nextno Rob Hartill - mips-sgi-irix5.3 no Mark Imbrianco - mips-sgi-irix6.2 no Lars Eilebrecht - mips-sgi-irix6.4 no Lars Eilebrecht - mips-sni-svr4 no Martin Kraemer - OS/2 no Brian Havard - rs6000-ibm-aix3.2.5 no Sameer Parekh - rs6000-ibm-aix4.1 no Lars Eilebrecht - rs6000-ibm-aix4.2 no Bill Stoddard - rs6000-ibm-aix4.3.2 no Bill Stoddard - sparc-sun-solaris2.5 no Lars Eilebrecht - sparc-sun-solaris2.6 no Lars Eilebrecht - sparc-sun-solaris2.7 no Cliff Skolnick - sparc-sun-sunos4.1.4 no Lars Eilebrecht, Michael Douglass - sparc-sun-sunos4.1.3_U1 no Sameer Parekh - sparc-unknown-linux no Lars Eilebrecht - mips-dec-ultrix4.4no Sameer Parekh - mips-unknown-linuxno Lars Eilebrecht - RELEASE SHOWSTOPPERS: -* Responses with a return code HTTP_NOT_MODIFIED or HTTP_MULTIPLE_CHOICES - are broken if they do not supply a "Location:" header. - mod_speling ceases to work because of this bug. - Message-ID: <[EMAIL PROTECTED]> - Status: patch available, but Tony Finch suggests fixing the - ap_is_HTTP_REDIRECT() macro - - RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * long pathnames with many components and no AllowOverride None @@ -496,3 +442,52 @@ * apparently either "BrowserMatch" or the "nokeepalive" variable cause instability - see PR#1729. + + +Binaries (1.3.9): + + Platform Avail. Volunteer + -- + alpha-dec-osf3.0 no Sameer Parekh + alpha-dec-osf4.0 no Lars Eilebrecht, Ken Coar + armv4l-whatever-linux2no Rasmus Lerdorf + hppa1.1-hp-hpux no Rob Hartill + i386-slackware-linux(a.out) no Sameer Parekh + i386-sun-solaris2.5 no Sameer Parekh + i386-sun-solaris2.7 no C
cvs commit: apache-1.3/htdocs/manual/mod core.html
fielding99/08/14 23:55:49
Modified:htdocs/manual/mod core.html
Log:
The current documentation on the Rlimit{CPU,MEM,Nproc} directives
uses the wording "for all processes", which leads one to believe that
the limit applies to all of the Apache children processes.
However, this is not the case. The resource limits are applied in
ap_call_exec() which is only called by mod_cgi and mod_include.
Submitted by: David Harris <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision ChangesPath
1.155 +15 -0 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- core.html 1999/07/29 18:17:43 1.154
+++ core.html 1999/08/15 06:55:48 1.155
@@ -2460,6 +2460,11 @@
configuration. Raising the maximum resource limit requires that the server
is running as root, or in the initial startup phase.
+This applies to processes forked off from Apache children servicing requests,
+not the Apache children themselves. This includes CGI scripts and SSI
+exec commands, but not any processes forked off from the Apache parent
+such as piped logs.
+
CPU resource limits are expressed in seconds per process.
See also RLimitMEM or
@@ -2498,6 +2503,11 @@
configuration. Raising the maximum resource limit requires that the
server is running as root, or in the initial startup phase.
+This applies to processes forked off from Apache children servicing requests,
+not the Apache children themselves. This includes CGI scripts and SSI
+exec commands, but not any processes forked off from the Apache parent
+such as piped logs.
+
Memory resource limits are expressed in bytes per process.
See also RLimitCPU or
@@ -2535,6 +2545,11 @@
that the limit should be set to the maximum allowed by the operating system
configuration. Raising the maximum resource limit requires that the server
is running as root, or in the initial startup phase.
+
+This applies to processes forked off from Apache children servicing requests,
+not the Apache children themselves. This includes CGI scripts and SSI
+exec commands, but not any processes forked off from the Apache parent
+such as piped logs.
Process limits control the number of processes per user.
cvs commit: apache-1.3 STATUS
fielding99/08/15 00:09:01 Modified:.STATUS Log: hello? anybody home? Revision ChangesPath 1.742 +11 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.741 retrieving revision 1.742 diff -u -r1.741 -r1.742 --- STATUS1999/08/14 09:36:34 1.741 +++ STATUS1999/08/15 07:08:59 1.742 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/14 09:36:34 $] + Last modified at [$Date: 1999/08/15 07:08:59 $] Release: @@ -22,6 +22,12 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: +* HPUX binary build failure due to the fact that it is building + libstandard.a and adding .so objects to the libstandard.a starting + with mod_vhost_alias.so. +Message-ID: <[EMAIL PROTECTED]> + Status: Randy needs someone familiar with HPUX to look at it. + * long pathnames with many components and no AllowOverride None Workaround is to define with AllowOverride None, which is something all sites should do in any case. @@ -36,6 +42,10 @@ Available Patches: + +* David Harris's [patch] make does not propagate src/support errors +Message-ID: <[EMAIL PROTECTED]> + Status: * Paul Reder's patch to fix Allow/Deny (.htaccess parsing) in regex processing.
cvs commit: apache-1.3 STATUS
fielding99/08/16 02:52:26 Modified:.STATUS Log: I knew I forgot something ... Revision ChangesPath 1.745 +5 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.744 retrieving revision 1.745 diff -u -r1.744 -r1.745 --- STATUS1999/08/16 09:19:48 1.744 +++ STATUS1999/08/16 09:52:25 1.745 @@ -1,11 +1,11 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/16 09:19:48 $] + Last modified at [$Date: 1999/08/16 09:52:25 $] Release: -1.3.9-dev: COUNTDOWN started at 08/14 2:30am PDT - Tarball planned for Sunday morning unless problems found. - Votes for rolling: Ralf +1, Martin +1 +1.3.9-dev: COUNTDOWN restarted at 08/15 3:00pm PDT + Tarball planned for Monday morning unless problems found. + Votes for rolling: Ralf +1, Martin +1, Roy +1 1.3.8: Not released. 1.3.7: Not released. @@ -27,7 +27,7 @@ libstandard.a and adding .so objects to the libstandard.a starting with mod_vhost_alias.so. Message-ID: <[EMAIL PROTECTED]> - Status: Randy needs someone familiar with HPUX to look at it. + Status: Randy committed a temporary fix * long pathnames with many components and no AllowOverride None Workaround is to define with AllowOverride None,
cvs commit: apache-2.0/src/main alloc.c http_config.c http_protocol.c
fielding99/08/27 15:03:20
Modified:src/main alloc.c http_config.c http_protocol.c
Log:
Reverse the errors from bad merges that were found while
rebuilding the repository.
Revision ChangesPath
1.5 +7 -7 apache-2.0/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-2.0/src/main/alloc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alloc.c 1999/08/26 15:17:06 1.4
+++ alloc.c 1999/08/27 22:03:05 1.5
@@ -2074,14 +2074,14 @@
if (pipe_in) {
close(in_fds[0]);
close(in_fds[1]);
- }
+ }
if (pipe_out) {
close(out_fds[0]);
close(out_fds[1]);
- }
+ }
errno = save_errno;
return 0;
- }
+}
#ifdef WIN32
@@ -2230,10 +2230,10 @@
close(out_fds[0]);
close(out_fds[1]);
}
- if (pipe_err) {
+ if (pipe_err) {
close(err_fds[0]);
close(err_fds[1]);
- }
+ }
errno = save_errno;
return 0;
}
@@ -2254,11 +2254,11 @@
close(in_fds[0]);
}
- if (pipe_err) {
+ if (pipe_err) {
close(err_fds[0]);
dup2(err_fds[1], STDERR_FILENO);
close(err_fds[1]);
- }
+ }
/* HP-UX SIGCHLD fix goes here, if someone will remind me what it is...
*/
signal(SIGCHLD, SIG_DFL); /* Was that it? */
1.6 +22 -21apache-2.0/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- http_config.c 1999/08/26 16:30:34 1.5
+++ http_config.c 1999/08/27 22:03:06 1.6
@@ -1088,27 +1088,28 @@
/* loop through the access names and find the first one */
-while (!f && access_name[0]) {
-char * w = ap_getword_conf(r->pool, &access_name);
-filename = ap_make_full_path(r->pool, d, w);
- f = ap_pcfg_openfile(r->pool, filename);
-}
-if (f) {
-dc = ap_create_per_dir_config(r->pool);
-
- parms.config_file = f;
-
- errmsg = ap_srm_command_loop(&parms, dc);
-
- ap_cfg_closefile(f);
-
- if (errmsg) {
- ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r,
- "%s: %s", filename, errmsg);
- return HTTP_INTERNAL_SERVER_ERROR;
- }
- *result = dc;
-}
+while (access_name[0]) {
+filename = ap_make_full_path(r->pool, d,
+ ap_getword_conf(r->pool, &access_name));
+
+if ((f = ap_pcfg_openfile(r->pool, filename)) != NULL) {
+
+dc = ap_create_per_dir_config(r->pool);
+
+parms.config_file = f;
+
+errmsg = ap_srm_command_loop(&parms, dc);
+
+ap_cfg_closefile(f);
+
+if (errmsg) {
+ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r,
+ "%s: %s", filename, errmsg);
+return HTTP_INTERNAL_SERVER_ERROR;
+}
+*result = dc;
+break;
+}
else if (errno != ENOENT && errno != ENOTDIR) {
ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
"%s pcfg_openfile: unable to check htaccess file, "
1.10 +3 -3 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- http_protocol.c 1999/08/26 16:30:36 1.9
+++ http_protocol.c 1999/08/27 22:03:06 1.10
@@ -1558,9 +1558,6 @@
r->sent_bodyct = 1;
return;
}
-else {
- fixup_vary(r);
-}
/*
* Now that we are ready to send a response, we need to combine the two
@@ -1580,6 +1577,9 @@
ap_table_unset(r->headers_out, "Vary");
r->proto_num = HTTP_VERSION(1,0);
ap_table_set(r->subprocess_env, "force-response-1.0", "1");
+}
+else {
+ fixup_vary(r);
}
ap_basic_http_header(r);
cvs commit: apache-2.0/src/modules/proxy proxy_cache.c
fielding99/08/27 15:18:59
Modified:src/include util_date.h
src/main http_protocol.c util_date.c util_script.c
src/modules/proxy proxy_cache.c
Log:
Reverse the unnecessary change to the interface of ap_parseHTTPdate()
that was discovered while rebuilding the repository.
Revision ChangesPath
1.3 +1 -1 apache-2.0/src/include/util_date.h
Index: util_date.h
===
RCS file: /home/cvs/apache-2.0/src/include/util_date.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util_date.h 1999/08/26 14:53:20 1.2
+++ util_date.h 1999/08/27 22:18:45 1.3
@@ -76,7 +76,7 @@
API_EXPORT(int) ap_checkmask(const char *data, const char *mask);
API_EXPORT(time_t) ap_tm2sec(const struct tm *t);
-API_EXPORT(time_t) ap_parseHTTPdate(const char *date, time_t * retval);
+API_EXPORT(time_t) ap_parseHTTPdate(const char *date);
#ifdef __cplusplus
}
1.11 +7 -12 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- http_protocol.c 1999/08/27 22:03:06 1.10
+++ http_protocol.c 1999/08/27 22:18:48 1.11
@@ -428,12 +428,10 @@
*/
if_unmodified = ap_table_get(r->headers_in, "If-Unmodified-Since");
if (if_unmodified != NULL) {
- /* ZZZ we are changing time funcs to AP time thread funcs.
-and we need to check return values of ap_parseHTTPdate. */
-time_t ius ;
- if (ap_parseHTTPdate(if_unmodified, &ius) == 1
- && (mtime > ius)) {
- return HTTP_PRECONDITION_FAILED;
+time_t ius = ap_parseHTTPdate(if_unmodified);
+
+if ((ius != BAD_DATE) && (mtime > ius)) {
+return HTTP_PRECONDITION_FAILED;
}
}
}
@@ -483,12 +481,9 @@
else if ((r->method_number == M_GET)
&& ((if_modified_since =
ap_table_get(r->headers_in, "If-Modified-Since")) !=
NULL)) {
-time_t ims;
- if (ap_parseHTTPdate(if_modified_since, &ims) != 1) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING,
- r->server, "bogus if-modified-since-header");
- }
-else if ((ims >= mtime) && (ims <= r->request_time)) {
+time_t ims = ap_parseHTTPdate(if_modified_since);
+
+if ((ims >= mtime) && (ims <= r->request_time)) {
return HTTP_NOT_MODIFIED;
}
}
1.3 +3 -5 apache-2.0/src/main/util_date.c
Index: util_date.c
===
RCS file: /home/cvs/apache-2.0/src/main/util_date.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util_date.c 1999/08/26 14:53:23 1.2
+++ util_date.c 1999/08/27 22:18:49 1.3
@@ -214,7 +214,7 @@
* but many changes since then.
*
*/
-API_EXPORT(time_t) ap_parseHTTPdate(const char *date, time_t * retval)
+API_EXPORT(time_t) ap_parseHTTPdate(const char *date)
{
struct tm ds;
int mint, mon;
@@ -228,7 +228,7 @@
('S' << 16) | ('e' << 8) | 'p', ('O' << 16) | ('c' << 8) | 't',
('N' << 16) | ('o' << 8) | 'v', ('D' << 16) | ('e' << 8) | 'c'};
-if (!date) /* ZZZ return AP_FAILURE on all errors. */
+if (!date)
return BAD_DATE;
while (*date && ap_isspace(*date)) /* Find first non-whitespace
char */
@@ -317,7 +317,5 @@
ds.tm_mon = mon;
-/* ZZZ return AP_SUCCESS. use AP Implode time func for this. */
-*retval = ap_tm2sec(&ds);
-return 1;
+return ap_tm2sec(&ds);
}
1.6 +4 -5 apache-2.0/src/main/util_script.c
Index: util_script.c
===
RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- util_script.c 1999/08/26 14:53:24 1.5
+++ util_script.c 1999/08/27 22:18:49 1.6
@@ -588,11 +588,10 @@
* pass it on blindly because of restrictions on future values.
*/
else if (!strcasecmp(w, "Last-Modified")) {
- time_t mtime;
- if (ap_pars
cvs commit: apache-1.3/src/main http_config.c
fielding99/08/27 16:38:11
Modified:src CHANGES
src/main http_config.c
Log:
Move "handler not found" warning message to below the check
for a wildcard handler. Gee, you'd think someone would have
fixed it before seven PRs.
PR: 2584, 3349, 3436, 3548, 4384, 4795, 4807
Submitted by: Dirk <[EMAIL PROTECTED]>, Roy Fielding
Revision ChangesPath
1.1425+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1424
retrieving revision 1.1425
diff -u -r1.1424 -r1.1425
--- CHANGES 1999/08/19 09:07:32 1.1424
+++ CHANGES 1999/08/27 23:38:05 1.1425
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) Move "handler not found" warning message to below the check
+ for a wildcard handler. [Dirk <[EMAIL PROTECTED]>, Roy Fielding]
+ PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
+
*) Build errors in src/support stop with an error, just like all the
other recursive make calls. [David Harris <[EMAIL PROTECTED]>]
1.147 +4 -5 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- http_config.c 1999/08/06 16:21:33 1.146
+++ http_config.c 1999/08/27 23:38:10 1.147
@@ -512,11 +512,6 @@
}
}
-if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler) {
-ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
-"handler \"%s\" not found for: %s", r->handler, r->filename);
-}
-
/* Pass two --- wildcard matches */
for (handp = wildhandlers; handp->hr.content_type; ++handp) {
@@ -529,6 +524,10 @@
}
}
+if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler && r->filename) {
+ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
+"handler \"%s\" not found for: %s", r->handler, r->filename);
+}
return HTTP_INTERNAL_SERVER_ERROR;
}
cvs commit: apache-2.0/src/main http_config.c
fielding99/08/27 16:47:10
Modified:src CHANGES
src/main http_config.c
Log:
Move "handler not found" warning message to below the check
for a wildcard handler. Gee, you'd think someone would have
fixed it before seven PRs.
PR: 2584, 3349, 3436, 3548, 4384, 4795, 4807
Submitted by: Dirk <[EMAIL PROTECTED]>, Roy Fielding
Revision ChangesPath
1.3 +4 -0 apache-2.0/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CHANGES 1999/08/27 14:37:13 1.2
+++ CHANGES 1999/08/27 23:47:08 1.3
@@ -1,5 +1,9 @@
Changes with Apache 2.0-dev
+ *) Move "handler not found" warning message to below the check
+ for a wildcard handler. [Dirk <[EMAIL PROTECTED]>, Roy Fielding]
+ PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
+
*) Support line-continuation feature in config.option file.
[Ralf S. Engelschall]
1.7 +4 -5 apache-2.0/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- http_config.c 1999/08/27 22:03:06 1.6
+++ http_config.c 1999/08/27 23:47:09 1.7
@@ -338,11 +338,6 @@
}
}
-if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler) {
-ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
-"handler \"%s\" not found for: %s", r->handler, r->filename);
-}
-
/* Pass two --- wildcard matches */
for (handp = wildhandlers; handp->hr.content_type; ++handp) {
@@ -355,6 +350,10 @@
}
}
+if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler && r->filename) {
+ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
+"handler \"%s\" not found for: %s", r->handler, r->filename);
+}
return HTTP_INTERNAL_SERVER_ERROR;
}
cvs commit: apache-2.0/src CHANGES
fielding99/08/27 17:36:41 Modified:src CHANGES Log: make that eight PRs. Revision ChangesPath 1.4 +1 -1 apache-2.0/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-2.0/src/CHANGES,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CHANGES 1999/08/27 23:47:08 1.3 +++ CHANGES 1999/08/28 00:36:40 1.4 @@ -2,7 +2,7 @@ *) Move "handler not found" warning message to below the check for a wildcard handler. [Dirk <[EMAIL PROTECTED]>, Roy Fielding] - PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 + PR#2584, PR#2751, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 *) Support line-continuation feature in config.option file. [Ralf S. Engelschall]
cvs commit: apache-1.3/src CHANGES
fielding99/08/27 17:59:04 Modified:src CHANGES Log: make that eight PRs Revision ChangesPath 1.1426+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1425 retrieving revision 1.1426 diff -u -r1.1425 -r1.1426 --- CHANGES 1999/08/27 23:38:05 1.1425 +++ CHANGES 1999/08/28 00:58:54 1.1426 @@ -2,7 +2,7 @@ *) Move "handler not found" warning message to below the check for a wildcard handler. [Dirk <[EMAIL PROTECTED]>, Roy Fielding] - PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 + PR#2584, PR#2751, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 *) Build errors in src/support stop with an error, just like all the other recursive make calls. [David Harris <[EMAIL PROTECTED]>]
cvs commit: apache-1.3/htdocs .cvsignore
fielding99/08/27 18:11:49 Modified:..cvsignore Removed: htdocs .cvsignore Log: Don't ignore everything when everything isn't supposed to be ignored. If this bugs configure users, then fix configure so that it uses a distinctive prefix that won't match Makefile.tmpl. Submitted by: Roy Fielding, Sander van Zoest Revision ChangesPath 1.4 +0 -1 apache-1.3/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-1.3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore1998/06/16 03:28:45 1.3 +++ .cvsignore1999/08/28 01:11:47 1.4 @@ -1,4 +1,3 @@ Makefile config.status -Makefile.* src.*
cvs commit: apache-2.0 .cvsignore
fielding99/08/27 18:13:27 Modified:..cvsignore Log: Don't ignore everything when everything isn't supposed to be ignored. If this bugs configure users, then fix configure so that it uses a distinctive prefix that won't match Makefile.tmpl. Submitted by: Roy Fielding, Sander van Zoest Revision ChangesPath 1.3 +0 -1 apache-2.0/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1999/08/26 04:57:01 1.2 +++ .cvsignore1999/08/28 01:13:22 1.3 @@ -1,5 +1,4 @@ Makefile config.status config.status.* -Makefile.* src.*
cvs commit: apache-2.0/src/main http_core.c
fielding99/08/27 19:38:00
Modified:src/main http_core.c
Log:
Remove error message that was missed in an earlier merge with 1.3.x.
Revision ChangesPath
1.9 +1 -6 apache-2.0/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- http_core.c 1999/08/26 16:34:13 1.8
+++ http_core.c 1999/08/28 02:37:59 1.9
@@ -2480,18 +2480,13 @@
int convert_flag;
#endif
-if (r->handler) {
-ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING,
- r->server, "handler \"%s\" not found, using default "
- "handler for : %s", r->handler, r->filename);
-}
/* This handler has no use for a request body (yet), but we still
* need to read and discard it if the client sent one.
*/
if ((errstatus = ap_discard_request_body(r)) != OK) {
return errstatus;
}
-
+
r->allowed |= (1 << M_GET) | (1 << M_OPTIONS);
if (r->method_number == M_INVALID) {
cvs commit: apache-2.0 STATUS
fielding99/08/27 19:44:10 Modified:.STATUS Log: no shortage of things TODO Revision ChangesPath 1.3 +3 -1 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- STATUS1999/08/27 19:02:51 1.2 +++ STATUS1999/08/28 02:44:09 1.3 @@ -1,5 +1,5 @@ Apache 2.0 STATUS: -Last modified at [$Date: 1999/08/27 19:02:51 $] +Last modified at [$Date: 1999/08/28 02:44:09 $] Release: @@ -57,6 +57,8 @@ * Finish infrastructure in core for async MPMs Status: ? + +* TODO in source -- just do an egrep on "TODO" and see what's there * Work on other MPMs. Possible MPMs discussed or in progress include:
cvs commit: apache-1.3/src/main http_core.c
fielding99/08/27 19:51:32
Modified:src/main http_core.c
Log:
Reverse a change that was made in rev 1.227 because the old version
was better (and consistent with what was left in Apache 2.0).
Revision ChangesPath
1.272 +4 -10 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- http_core.c 1999/08/09 07:29:29 1.271
+++ http_core.c 1999/08/28 02:51:31 1.272
@@ -3037,16 +3037,10 @@
}
if (r->finfo.st_mode == 0 || (r->path_info && *r->path_info)) {
- char *emsg;
-
- emsg = "File does not exist: ";
- if (r->path_info == NULL) {
- emsg = ap_pstrcat(r->pool, emsg, r->filename, NULL);
- }
- else {
- emsg = ap_pstrcat(r->pool, emsg, r->filename, r->path_info, NULL);
- }
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, "%s", emsg);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
+ "File does not exist: %s",r->path_info ?
+ ap_pstrcat(r->pool, r->filename, r->path_info, NULL)
+ : r->filename);
return HTTP_NOT_FOUND;
}
if (r->method_number != M_GET) {
cvs commit: apache-2.0/src/regex regex2.h
fielding99/08/27 20:03:35 Modified:src/include hsregex.h src/lib/apr/include hsregex.h src/regex regex2.h Log: Change defined(RHAPSODY) to defined(MAC_OS) || defined(MAC_OS_X_SERVER) to match the rest of the server. Revision ChangesPath 1.3 +1 -1 apache-2.0/src/include/hsregex.h Index: hsregex.h === RCS file: /home/cvs/apache-2.0/src/include/hsregex.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hsregex.h 1999/08/26 07:21:43 1.2 +++ hsregex.h 1999/08/28 03:03:32 1.3 @@ -16,7 +16,7 @@ #endif #endif -#if defined(RHAPSODY) +#if defined(MAC_OS) || defined(MAC_OS_X_SERVER) #define ap_private_extern __private_extern__ #else #define ap_private_extern 1.2 +1 -1 apache-2.0/src/lib/apr/include/hsregex.h Index: hsregex.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/include/hsregex.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hsregex.h 1999/08/17 15:59:53 1.1 +++ hsregex.h 1999/08/28 03:03:34 1.2 @@ -16,7 +16,7 @@ #endif #endif -#if defined(RHAPSODY) +#if defined(MAC_OS) || defined(MAC_OS_X_SERVER) #define ap_private_extern __private_extern__ #else #define ap_private_extern 1.9 +1 -1 apache-2.0/src/regex/regex2.h Index: regex2.h === RCS file: /home/cvs/apache-2.0/src/regex/regex2.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- regex2.h 1998/10/19 02:16:28 1.8 +++ regex2.h 1999/08/28 03:03:34 1.9 @@ -8,7 +8,7 @@ = #endif = #endif = - = #if defined(RHAPSODY) + = #if defined(MAC_OS) || defined(MAC_OS_X_SERVER) = #define ap_private_extern __private_extern__ = #else = #define ap_private_extern
cvs commit: apache-1.3/src/regex regex2.h
fielding99/08/27 20:07:32 Modified:src/regex regex2.h Log: Change defined(RHAPSODY) to defined(MAC_OS) || defined(MAC_OS_X_SERVER) to match the rest of the server. Revision ChangesPath 1.9 +1 -1 apache-1.3/src/regex/regex2.h Index: regex2.h === RCS file: /home/cvs/apache-1.3/src/regex/regex2.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- regex2.h 1998/10/19 02:16:28 1.8 +++ regex2.h 1999/08/28 03:07:32 1.9 @@ -8,7 +8,7 @@ = #endif = #endif = - = #if defined(RHAPSODY) + = #if defined(MAC_OS) || defined(MAC_OS_X_SERVER) = #define ap_private_extern __private_extern__ = #else = #define ap_private_extern
cvs commit: apache-2.0 STATUS
fielding99/08/27 20:25:05 Modified:.STATUS Log: Enough for one week. Revision ChangesPath 1.4 +17 -1 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- STATUS1999/08/28 02:44:09 1.3 +++ STATUS1999/08/28 03:25:04 1.4 @@ -1,5 +1,5 @@ Apache 2.0 STATUS: -Last modified at [$Date: 1999/08/28 02:44:09 $] +Last modified at [$Date: 1999/08/28 03:25:04 $] Release: @@ -53,6 +53,11 @@ behavior. Dean has suggested getting rid of regex containers completely. +* Areas where APRFile is being used need to be cleaned-up + +* mod_mmap_static hides ap_block_alarms() and ap_unblock_alarms() + This should really be done in some header file elsewhere. + Other features that need writing: * Finish infrastructure in core for async MPMs @@ -60,6 +65,8 @@ * TODO in source -- just do an egrep on "TODO" and see what's there +* Odd comments in source (egrep for "ZZZ") need to be cleaned-up + * Work on other MPMs. Possible MPMs discussed or in progress include: - David Reid's <[EMAIL PROTECTED]> Beos MPM @@ -82,6 +89,12 @@ Status: Ben Laurie has written some hooks documentation (apache-2.0/htdocs/hooks.html) +* Changes since 1.3.9 can be more easily seen in the commitlog file + dev.apache.org:/home/cvs/CVSROOT/commitlogs/apache-2.0 + which includes some of Roy's comments when the changes were + committed in rough change-sets by purpose. Note that the commitlog + does not show the contents of new files until later. + Available Patches: * Mike Abbott's <[EMAIL PROTECTED]> patches to improve @@ -94,3 +107,6 @@ * What do we do about mod_proxy? * Which MPMs will be included with Apache 2.0? + + * Is conf/highperformance.conf-dist obsolete? It looks obsolete. +
cvs commit: apache-2.0/src/modules/standard Makefile.tmpl
fielding99/09/01 15:48:17 Modified:src CHANGES Configuration.tmpl src/modules README src/modules/experimental Makefile.tmpl src/modules/standard Makefile.tmpl Removed: src/modules/experimental mod_auth_digest.c Log: Moved mod_auth_digest.c from experimental to standard. Revision ChangesPath 1.8 +2 -0 apache-2.0/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-2.0/src/CHANGES,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CHANGES 1999/08/31 21:57:32 1.7 +++ CHANGES 1999/09/01 22:48:10 1.8 @@ -1,5 +1,7 @@ Changes with Apache 2.0-dev + *) Moved mod_auth_digest.c from experimental to standard. [Roy Fielding] + *) Change all pools to APR contexts. This is the first step to incorporating APR into Apache. [Ryan Bloom] 1.4 +2 -3 apache-2.0/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /home/cvs/apache-2.0/src/Configuration.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Configuration.tmpl1999/08/30 07:16:49 1.3 +++ Configuration.tmpl1999/09/01 22:48:11 1.4 @@ -374,8 +374,7 @@ ## "auth_digest" implements HTTP/1.1 Digest Authentication (RFC 2617) ## rather than the less secure Basic Auth used by the other modules. -## This is an updated version of mod_digest, but it is not as well tested -## and is therefore marked experimental. Use either the one above, or +## This is an updated version of mod_digest. Use either the one above, or ## this one below, but not both digest modules. ## Note: if you add this module in then you might also need the ## truerand library (available for example from @@ -386,7 +385,7 @@ ## WWW-Authenticate and Proxy-Authenticate headers are parsed in the ## post-read-request phase and it needs to know if this is a proxy request. -# AddModule modules/experimental/mod_auth_digest.o +# AddModule modules/standard/mod_auth_digest.o ## Optional Proxy ## 1.2 +0 -4 apache-2.0/src/modules/README Index: README === RCS file: /home/cvs/apache-2.0/src/modules/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README1999/08/24 06:55:06 1.1 +++ README1999/09/01 22:48:13 1.2 @@ -17,10 +17,6 @@ evolve radically in the future. This code isn't supported officially. -extra/ - - This is the directory for third-party modules, such as mod_jserv. - test/ This directory houses modules which test various components 1.2 +0 -9 apache-2.0/src/modules/experimental/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/src/modules/experimental/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.tmpl 1999/08/24 06:55:12 1.1 +++ Makefile.tmpl 1999/09/01 22:48:14 1.2 @@ -12,12 +12,3 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ $(INCDIR)/http_request.h $(INCDIR)/http_core.h -mod_digest.o: mod_digest.c $(INCDIR)/httpd.h \ - $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \ - $(INCDIR)/ap_md5.h 1.4 +9 -0 apache-2.0/src/modules/standard/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/src/modules/standard/Makefile.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.tmpl 1999/09/01 14:38:40 1.3 +++ Makefile.tmpl 1999/09/01 22:48:17 1.4 @@ -102,6 +102,15 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h +mod_auth_digest.o: mod_auth_digest.c $(INCDIR)/httpd.h \ + $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \ + $(INCDIR)/ap_md5.h
cvs commit: apache-site httpd.html
fielding99/09/10 18:54:45 Modified:.httpd.html Log: Revert last change -- it screws up mirroring. Revision ChangesPath 1.82 +0 -1 apache-site/httpd.html Index: httpd.html === RCS file: /export/home/cvs/apache-site/httpd.html,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- httpd.html1999/09/09 19:16:25 1.81 +++ httpd.html1999/09/11 01:54:43 1.82 @@ -1,7 +1,6 @@ Apache Project -http://www.apache.org/";>
cvs commit: apache-2.0/src/lib/apr/include apr_errno.h
fielding99/10/21 09:13:25
Modified:src/lib/apr/include apr_errno.h
Log:
Sorry to butt-in, but all these magic offsets make me itch.
Add APR_OS_START_STATUS, APR_OS_START_SYSERR, and APR_OS_START_USEERR.
Revision ChangesPath
1.8 +114 -94 apache-2.0/src/lib/apr/include/apr_errno.h
Index: apr_errno.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr_errno.h 1999/10/21 15:16:10 1.7
+++ apr_errno.h 1999/10/21 16:13:24 1.8
@@ -62,366 +62,386 @@
extern "C" {
#endif /* __cplusplus */
+/* Define four layers of status code offsets so that we don't interfere
+ * with the predefined errno codes on the operating system. Codes beyond
+ * APR_OS_START_USEERR are reserved for applications that use APR that
+ * layer their own error codes along with APR's.
+ */
+#ifndef APR_OS_START_ERROR
#define APR_OS_START_ERROR 4000
+#endif
+#ifndef APR_OS_START_STATUS
+#define APR_OS_START_STATUS (APR_OS_START_ERROR + 500)
+#endif
+#ifndef APR_OS_START_SYSERR
+#define APR_OS_START_SYSERR (APR_OS_START_STATUS + 500)
+#endif
+#ifndef APR_OS_START_USEERR
+#define APR_OS_START_USEERR (APR_OS_START_SYSERR + 500)
+#endif
/* If this definition of APRStatus changes, then we can remove this, but
right
- now, the decision was to use an errno-like implementation.
-*/
+ * now, the decision was to use an errno-like implementation.
+ */
typedef int ap_status_t;
#define APR_SUCCESS 0
+/* APR ERROR VALUES */
+#define APR_ENOSTAT(APR_OS_START_ERROR + 1)
+#define APR_ENOPOOL(APR_OS_START_ERROR + 2)
+#define APR_ENOFILE(APR_OS_START_ERROR + 3)
+#define APR_EBADDATE (APR_OS_START_ERROR + 4)
+#define APR_ENOCONT(APR_OS_START_ERROR + 5)
+#define APR_ENOPROC(APR_OS_START_ERROR + 6)
+#define APR_ENOTIME(APR_OS_START_ERROR + 7)
+#define APR_ENODIR (APR_OS_START_ERROR + 8)
+#define APR_ENOLOCK(APR_OS_START_ERROR + 9)
+#define APR_ENOPOLL(APR_OS_START_ERROR + 10)
+#define APR_ENOSOCKET (APR_OS_START_ERROR + 11)
+#define APR_ENOTHREAD (APR_OS_START_ERROR + 12)
+#define APR_ENOTHDKEY (APR_OS_START_ERROR + 13)
+#define APR_ENOTTHREADSAFE (APR_OS_START_ERROR + 14)
+
+/* APR STATUS VALUES */
+#define APR_INCHILD(APR_OS_START_STATUS + 1)
+#define APR_INPARENT (APR_OS_START_STATUS + 2)
+#define APR_DETACH (APR_OS_START_STATUS + 3)
+#define APR_NOTDETACH (APR_OS_START_STATUS + 4)
+#define APR_CHILD_DONE (APR_OS_START_STATUS + 5)
+#define APR_CHILD_NOTDONE (APR_OS_START_STATUS + 6)
+#define APR_TIMEUP (APR_OS_START_STATUS + 7)
+#define APR_INVALSOCK (APR_OS_START_STATUS + 8)
+#define APR_ALLSTD (APR_OS_START_STATUS + 9)
+#define APR_STDOUT (APR_OS_START_STATUS + 10)
+#define APR_STDERR (APR_OS_START_STATUS + 11)
+#define APR_BADCH (APR_OS_START_STATUS + 12)
+#define APR_BADARG (APR_OS_START_STATUS + 13)
+#define APR_EOF(APR_OS_START_STATUS + 14)
+#define APR_NOTFOUND (APR_OS_START_STATUS + 15)
+
+/* A simple value to be used to initialze a status variable. */
+#define APR_EINIT (APR_OS_START_STATUS + 16)
+
+/* Not implemented either because we haven't gotten to it yet, or
+ * because it is not possible to do correctly.
+ */
+#define APR_ENOTIMPL (APR_OS_START_STATUS + 17)
+
+/*
+ * APR equivalents to what should be standard errno codes.
+ */
#ifdef EACCES
#define APR_EACCES EACCES
#else
-#define APR_EACCES (APR_OS_START_ERROR + 1000)
+#define APR_EACCES (APR_OS_START_SYSERR + 0)
#endif
#ifdef EEXIST
#define APR_EEXIST EEXIST
#else
-#define APR_EEXIST (APR_OS_START_ERROR + 1001)
+#define APR_EEXIST (APR_OS_START_SYSERR + 1)
#endif
#ifdef EISDIR
#define APR_EISDIR EISDIR
#else
-#define APR_EISDIR (APR_OS_START_ERROR + 1002)
+#define APR_EISDIR (APR_OS_START_SYSERR + 2)
#endif
#ifdef ENAMETOOLONG
#define APR_ENAMETOOLONG ENAMETOOLONG
#else
-#define APR_ENAMETOOLONG (APR_OS_START_ERROR + 1003)
+#define APR_ENAMETOOLONG (APR_OS_START_SYSERR + 3)
#endif
#ifdef ENOENT
#define APR_ENOENT ENOENT
#else
-#define APR_ENOENT (APR_OS_START_ERROR + 1004)
+#define APR_ENOENT (APR_OS_START_SYSERR + 4)
#endif
#ifdef ENOTDIR
#define APR_ENOTDIR ENOTDIR
#else
-#define APR_ENOTDIR (APR_OS_START_ERROR + 1005)
+#define APR_ENOTDIR (APR_OS_START_SYSERR + 5)
#endif
#ifdef ENXIO
#define APR_ENXIO ENXIO
#else
-#define APR_ENXIO (APR_OS_START_ERROR + 1006)
+#define APR_ENXIO (APR_OS_START_SYSERR + 6)
#endif
#ifdef ENO
cvs commit: apache-1.3/src/main http_main.c
fielding00/01/11 19:38:25
Modified:src CHANGES
src/main http_main.c
Log:
this patch is intended to avoid a problem witnessed in apache
installations with certain third party libraries: if there are many
children, and then take sufficiently long to shut down, then apache's
reclaim child processes sends the remaining children SIGKILL. that's
alright with me -- shutdown shouldn't take so long -- but the current code
doesn't wait around for them to die; if they haven't all finished
terminating right away, it sleeps for approximately 16 seconds before
noticing that they're dead. thus, the total time required to shut down is
generally a bit more than twenty seconds ... the last 16 seconds of which
is quite unnecessary.
anyway, what this patch does is change things so that after SIGKILL has
been sent, the parent checks a couple of times (approx: 16ms, 84ms, 350ms,
1.4sec) and then decides that the SIGKILL failed. i could easily adjust
this so that the total time spent waiting for the SIGKILL to fail is what
it was -- 16 seconds, give or take -- but in writing this, i figured that
if they haven't died after 1.4 seconds, then the SIGKILL wasn't
sufficient; it's not instant, but it should never take that long.
Submitted by: Ed Korthof <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision ChangesPath
1.1496+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1495
retrieving revision 1.1496
diff -u -r1.1495 -r1.1496
--- CHANGES 2000/01/12 01:15:20 1.1495
+++ CHANGES 2000/01/12 03:38:14 1.1496
@@ -1,5 +1,10 @@
Changes with Apache 1.3.10
+ *) Reduce the time that a parent waits for its children to die
+ after SIGKILL has been sent, since there isn't much point in waiting
+ another 16 seconds beyond the initial SIGTERM waiting period.
+ [Ed Korthof]
+
*) Revert to the 1.3.3 way of getting the server name from the
scoreboard, with a modification to make it respect the
UseCanonicalName setting. This makes things work better with
1.488 +7 -2 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- http_main.c 2000/01/12 01:13:23 1.487
+++ http_main.c 2000/01/12 03:38:19 1.488
@@ -2380,7 +2380,7 @@
ap_sync_scoreboard_image();
-for (tries = terminate ? 4 : 1; tries <= 9; ++tries) {
+for (tries = terminate ? 4 : 1; tries <= 12; ++tries) {
/* don't want to hold up progress any more than
* necessary, but we need to allow children a few moments to exit.
* Set delay with an exponential backoff.
@@ -2435,8 +2435,13 @@
"child process %d still did not exit, sending a SIGKILL",
pid);
kill(pid, SIGKILL);
+ waittime = 1024 * 16; /* give them some time to die */
break;
- case 9: /* 14 sec */
+ case 9: /* 6 sec */
+ case 10:/* 6.1 sec */
+ case 11:/* 6.4 sec */
+ break;
+ case 12:/* 7.4 sec */
/* gave it our best shot, but alas... If this really
* is a child we are trying to kill and it really hasn't
* exited, we will likely fail to bind to the port
cvs commit: apache-1.3/src/main http_vhost.c
fielding00/01/16 12:59:59
Modified:src/main http_vhost.c
Log:
Squash warnings by using ap_isalnum and ap_isdigit.
Revision ChangesPath
1.18 +2 -2 apache-1.3/src/main/http_vhost.c
Index: http_vhost.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_vhost.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- http_vhost.c 1999/12/20 18:16:50 1.17
+++ http_vhost.c 2000/01/16 20:59:59 1.18
@@ -670,7 +670,7 @@
src = r->hostname;
dst = host;
while (*src) {
- if (!isalnum(*src) && *src != '.' && *src != '-') {
+ if (!ap_isalnum(*src) && *src != '.' && *src != '-') {
if (*src == ':')
break;
else
@@ -682,7 +682,7 @@
/* check the port part */
if (*src++ == ':') {
while (*src) {
- if (!isdigit(*src++)) {
+ if (!ap_isdigit(*src++)) {
goto bad;
}
}
cvs commit: apache-site related_projects.html
fielding00/01/27 15:30:18 Modified:.related_projects.html Log: Add mention of kshIndex Submitted by: Dana French <[EMAIL PROTECTED]> Revision ChangesPath 1.44 +12 -0 apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- related_projects.html 2000/01/21 21:22:42 1.43 +++ related_projects.html 2000/01/27 23:30:15 1.44 @@ -34,6 +34,7 @@ Apache Documentation Project Apache Quick Reference Card Webmonkey XSSI Extensions +kshIndex fancy index utility Commercial Products @@ -226,6 +227,17 @@ You can http://www.hotwired.com/webmonkey/javascript/code_library/wm_dwxssi_ext/";>obtain the extensions here. + + +kshIndex fancy index utility + +http://www.aigsupport.com/fancyIndex/Tools/CGI/kshIndex/";>kshIndex +is a set of utilities and scripts built around the +Apache fancyIndex functions. It allows webmasters to provide +a variety of functions to users including automated indexing +of URL's, files, and directories, user authorization management, +cascading user customization, events calendars, contact lists, etc. Apache Week
cvs commit: apache-1.3/src/modules/proxy proxy_util.c
fielding00/02/07 16:34:44 Modified:src/main http_protocol.c src/modules/proxy proxy_util.c Log: Fix a few more cases where we were not properly html_escaping text for error-notes that came from the untrusted client request. Revision ChangesPath 1.288 +2 -2 apache-1.3/src/main/http_protocol.c Index: http_protocol.c === RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- http_protocol.c 2000/02/02 20:43:50 1.287 +++ http_protocol.c 2000/02/08 00:34:36 1.288 @@ -958,7 +958,7 @@ r->status = HTTP_BAD_REQUEST; ap_table_setn(r->notes, "error-notes", ap_pstrcat(r->pool, "Size of a request header field exceeds server limit.\n" -"\n", field, "\n", NULL)); +"\n", ap_escape_html(r->pool, field), "\n", NULL)); return; } copy = ap_palloc(r->pool, len + 1); @@ -968,7 +968,7 @@ r->status = HTTP_BAD_REQUEST; /* or abort the bad request */ ap_table_setn(r->notes, "error-notes", ap_pstrcat(r->pool, "Request header field is missing colon separator.\n" -"\n", copy, "\n", NULL)); +"\n", ap_escape_html(r->pool, copy), "\n", NULL)); return; } 1.85 +3 -2 apache-1.3/src/modules/proxy/proxy_util.c Index: proxy_util.c === RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- proxy_util.c 2000/02/02 20:43:57 1.84 +++ proxy_util.c 2000/02/08 00:34:40 1.85 @@ -845,13 +845,14 @@ ap_pstrcat(r->pool, "The proxy server could not handle the request " "pool, r->uri), - "\">", r->method, " ", + "\">", ap_escape_html(r->pool, r->method), + " ", ap_escape_html(r->pool, r->uri), ".\n" "Reason: ", ap_escape_html(r->pool, message), "", NULL)); -/* Allow the "error-notes" string to be printed by ap_send_error_response() */ +/* Allow "error-notes" string to be printed by ap_send_error_response() */ ap_table_setn(r->notes, "verbose-error-to", ap_pstrdup(r->pool, "*")); r->status_line = ap_psprintf(r->pool, "%3.3u Proxy Error", statuscode);
cvs commit: apache-site related_projects.html
fielding00/02/08 16:04:59 Modified:.related_projects.html Log: Add pointer for Vision For Apache Submitted by: Lawrie Scovell <[EMAIL PROTECTED]> Revision ChangesPath 1.47 +13 -0 apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- related_projects.html 2000/02/08 21:05:52 1.46 +++ related_projects.html 2000/02/09 00:04:57 1.47 @@ -50,6 +50,7 @@ Red Hat Secure Server Stronghold WebTen, a MacOS port of Apache +Vision For Apache @@ -330,6 +331,18 @@ For more information visit http://www.tenon.com/products/webten/";>Tenon's web site. + + + +Vision For Apache + +Vision For Apache is a 100% Java graphical user interface for the Apache +HTTP server. Free for non-commercial use. Commercial license includes online +support and updates. + + +For more information visit +http://www.focus-array.com/";>The Focus Array's web site.
cvs commit: apachen/src/main util_script.c
fielding97/10/15 16:37:48
Modified:src/main util_script.c
Log:
Fix warning on Solaris due to snprintf conversion of system-dependent type.
Revision ChangesPath
1.78 +6 -4 apachen/src/main/util_script.c
Index: util_script.c
===
RCS file: /export/home/cvs/apachen/src/main/util_script.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- util_script.c 1997/10/07 20:05:03 1.77
+++ util_script.c 1997/10/15 23:37:47 1.78
@@ -794,9 +794,9 @@
if ((gr = getgrgid(user_gid)) == NULL) {
if ((grpname = palloc(r->pool, 16)) == NULL)
- return (pid);
+ return (pid);
else
- ap_snprintf(grpname, 16, "%d", user_gid);
+ ap_snprintf(grpname, 16, "%ld", (long) user_gid);
}
else
grpname = gr->gr_name;
@@ -804,14 +804,16 @@
else {
if ((pw = getpwuid(r->server->server_uid)) == NULL) {
aplog_error(APLOG_MARK, APLOG_ERR, r->server,
- "getpwuid: invalid userid %d", r->server->server_uid);
+ "getpwuid: invalid userid %ld",
+ (long) r->server->server_uid);
return (pid);
}
execuser = pstrdup(r->pool, pw->pw_name);
if ((gr = getgrgid(r->server->server_gid)) == NULL) {
aplog_error(APLOG_MARK, APLOG_ERR, r->server,
- "getgrgid: invalid groupid %d", r->server->server_gid);
+ "getgrgid: invalid groupid %ld",
+ (long) r->server->server_gid);
return (pid);
}
grpname = gr->gr_name;
cvs commit: apachen/src/test - New directory
fielding97/11/03 18:40:51 apachen/src/test - New directory
cvs commit: apachen/src/test README test_date.c test_select.c time-sem.c
fielding97/11/03 18:47:14
Added: src/test README test_date.c test_select.c time-sem.c
Log:
Test harnesses are an important part of project knowledge that
needs to be kept around where we can find it. Whether or not we
should distribute this code is an open question.
Revision ChangesPath
1.1 apachen/src/test/README
Index: README
===
This directory contains useful test code for testing various bits
of Apache functionality. This stuff is for the developers only,
so we might remove it on public releases.
1.1 apachen/src/test/test_date.c
Index: test_date.c
===
/* This program tests the parseHTTPdate routine in ../main/util_date.c.
*
* It is only semiautomated in that I would run it, modify the code to
* use a different algorithm or seed, recompile and run again, etc.
* Obviously it should use an argument for that, but I never got around
* to changing the implementation.
*
* gcc -g -O2 -I../main -o test_date ../main/util_date.o test_date.c
* test_date | egrep '^No '
*
* Roy Fielding, 1996
*/
#define API_EXPORT(x) x
#include
#include
#include "util_date.h"
static const long year2secs[] = {
0L,/* 1970 */
31536000L,/* 1971 */
63072000L,/* 1972 */
94694400L,/* 1973 */
126230400L,/* 1974 */
157766400L,/* 1975 */
189302400L,/* 1976 */
220924800L,/* 1977 */
252460800L,/* 1978 */
283996800L,/* 1979 */
315532800L,/* 1980 */
347155200L,/* 1981 */
378691200L,/* 1982 */
410227200L,/* 1983 */
441763200L,/* 1984 */
473385600L,/* 1985 */
504921600L,/* 1986 */
536457600L,/* 1987 */
567993600L,/* 1988 */
599616000L,/* 1989 */
631152000L,/* 1990 */
662688000L,/* 1991 */
694224000L,/* 1992 */
725846400L,/* 1993 */
757382400L,/* 1994 */
788918400L,/* 1995 */
820454400L,/* 1996 */
852076800L,/* 1997 */
883612800L,/* 1998 */
915148800L,/* 1999 */
946684800L,/* 2000 */
978307200L,/* 2001 */
1009843200L,/* 2002 */
1041379200L,/* 2003 */
1072915200L,/* 2004 */
1104537600L,/* 2005 */
1136073600L,/* 2006 */
1167609600L,/* 2007 */
1199145600L,/* 2008 */
1230768000L,/* 2009 */
1262304000L,/* 2010 */
129384L,/* 2011 */
1325376000L,/* 2012 */
1356998400L,/* 2013 */
1388534400L,/* 2014 */
1420070400L,/* 2015 */
1451606400L,/* 2016 */
1483228800L,/* 2017 */
1514764800L,/* 2018 */
1546300800L,/* 2019 */
1577836800L,/* 2020 */
1609459200L,/* 2021 */
1640995200L,/* 2022 */
1672531200L,/* 2023 */
1704067200L,/* 2024 */
1735689600L,/* 2025 */
1767225600L,/* 2026 */
1798761600L,/* 2027 */
1830297600L,/* 2028 */
186192L,/* 2029 */
1893456000L,/* 2030 */
1924992000L,/* 2031 */
1956528000L,/* 2032 */
1988150400L,/* 2033 */
2019686400L,/* 2034 */
2051222400L,/* 2035 */
2082758400L,/* 2036 */
2114380800L,/* 2037 */
2145916800L /* 2038 */
};
const char month_snames[12][4] = {
"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"
};
void gm_timestr_822(char *ts, time_t sec)
{
static const char *const days[7]=
{"Sun","Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
struct tm *tms;
tms = gmtime(&sec);
sprintf(ts, "%s, %.2d %s %d %.2d:%.2d:%.2d GMT", days[tms->tm_wday],
tms->tm_mday, month_snames[tms->tm_mon], tms->tm_year + 1900,
tms->tm_hour, tms->tm_min, tms->tm_sec);
}
void gm_timestr_850(char *ts, time_t sec)
{
static const char *const days[7]=
{"Sunday","Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
"Saturday"};
struct tm *tms;
int year;
tms = gmtime(&sec);
year = tms->tm_year;
if (year >= 100) year -= 100;
sprintf(ts, "%s, %.2d-%s-%.2d %.2d:%.2d:%.2d GMT", days[tms->tm_wday],
tms->tm_mday, month_snames[tms->tm
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 @@ ExpiresDefault "access plus 4 weeks" -ExpiresDefault "access plus 30 days" +ExpiresDefault "access plus 30 days" @@ -264,7 +264,7 @@ ExpiresByType text/html "access plus 1 month 15 days 2 hours" -ExpiresByType image/gif "modification plus 5 hours 3 minutes" +ExpiresByType image/gif "modification plus 5 hours 3 minutes"
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 === Apache Project Guidelines and Voting Rules Apache Project Guidelines and Voting Rules DRAFT: These guidelines are not yet approved. 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. 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. The following define some common terms: Apache Group The 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. Membership 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. Apache Developers All 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. mailing list The Apache developers' primary mailing list for discussion of issues and changes related to the project (new-httpd@apache.org). Subscription to the list is open, but only subscribers can post directly to the list. private list The 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. CVS All of the Apache products are maintained in shared information repositories using CVS on dev.apache.org. Only some of the Apache developers have write access to these repositories; everyone has read access via anonymous CVS. Developers who want write access need to ask for it on the mailing list and, if approved, need to ask the admin of dev.apache.org for a user account. STATUS 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. 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 must be raised on the mailing list and added to the relevant STATUS file. All action items may be voted on, but not all of them will require a formal vote. Voting Any of the Apache Developers may vote on any issue or action item. However, the only binding votes are those cast by active members of the Apache Group; if the vote is about a change to source code or documentation, the primary author of what is being changed may also cast a binding vote on that issue. All other votes are non-binding. All developers are encouraged to participate in decisions, but the decision it
cvs commit: apache STATUS
fielding98/01/13 15:52:13 Modified:.Tag: APACHE_1_2_X STATUS Log: was raining, but now sunny and clear 68F Revision ChangesPath No revision No revision 1.1.2.10 +4 -4 apache/Attic/STATUS Index: STATUS === RCS file: /export/home/cvs/apache/Attic/STATUS,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -r1.1.2.9 -r1.1.2.10 --- STATUS1998/01/13 23:47:11 1.1.2.9 +++ STATUS1998/01/13 23:52:11 1.1.2.10 @@ -21,15 +21,15 @@ * Ralf's mod_rewrite bugfix for %3f see below - Status: Ralf +1, Dean +1 + Status: Ralf +1, Dean +1, Roy +1 * Something from the FreeBSD port -- more #define wrappers see below - Status: Ralf +1, Dean +1, Martin +1 + Status: Ralf +1, Dean +1, Martin +1, Roy +1 * Dean's backport of the bputc()/chunking bugfix. <[EMAIL PROTECTED]> - Status: Dean +1, Martin +1 + Status: Dean +1, Martin +1, Roy +1 This fix does fix Henrik's HTTP/1.1 chunking problem. * Marc's "headers too big" patch, repost it please? @@ -37,7 +37,7 @@ * backport of the netscape header padding fix, it's needed for 255 as well as 256, 257 bytes <[EMAIL PROTECTED]> - Status: Dean +1, Martin +1 + Status: Dean +1, Martin +1, Roy +1 Needs patch:
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 @@ -Apache Project Guidelines and Voting Rules +Apache Project Guidelines DRAFT: These guidelines are not yet approved. -This document defines the rules and guidelines for the Apache Project. +This document defines the guidelines for the +http://dev.apache.org/";>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. @@ -32,9 +33,9 @@ to be resolved. - -The following define some common terms: - + +People, Places, and Things + Apache Group The 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. Membership in the Apache Group is by invitation only and must be approved by consensus of the active Apache Group members. @@ -76,16 +77,15 @@ CVS All of the Apache products are maintained in shared information - repositories using CVS on + repositories using CVS on dev.apache.org. Only some of the Apache developers have write access to these repositories; everyone has read access via - anonymous CVS. Developers who want write + anonymous CVS. Developers who want write access need to ask for it on the mailing list and, if approved, need to ask the admin of dev.apache.org for a user account. - STATUS @@ -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. @@ -160,12 +160,15 @@ -An action item requiring consensus must receive +An action item requiring consensus approval must receive at least 3 binding +1 votes and no vetos. -An action item requiring simple approval must receive +An action item requiring majority approval must receive at least 3 binding +1 votes and more +1 votes than -1 votes (i.e., a majority with a minimum -quorum of three positive votes). +quorum of three positive votes). All other action items are considered +to have lazy approval until someone votes -1, +after which point they are decided by either consensus or a majority vote, +depending upon the type of action item. @@ -178,38 +181,6 @@ Types of Action Items - Release Testing - Release Plan - Showstoppers - - Code Changes - Code 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 below. - All those participating in a patch vote must be willing and able - to test the patched system. However, see the section on - "To Commit, or Not to Commit?" - below, which modifies this paragraph. - - Documentation Changes - Documentation changes are only voted on after (or during) the change. - The author of the changes must notify the mailing list, preferably - in advance of the work to avoid duplicate efforts, of where the - changes are being made. If the changes are to existing documents, - the existing documents should not be replaced until at least - 24 hours after notifying the list. Any group member may veto a - change, but must then provide real assistance to the author - in correcting the problem if it can be corrected, and must rescind - the veto once the problem has been corrected (this may be assumed - in good faith). - - Short Term Plans - Short term plans
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 @@ -http://www.apache-ssl.org/"; ->Apache-SSL +http://www.apache-ssl.org/";>Apache-SSL Apache-SSL is an encrypting web server, based on Apache and SSLeay, which implements 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 Stronghold. -http://modules.apache.org/"; ->Apache Module Registry +http://modules.apache.org/"; +>Apache Module Registry 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. -http://www.php.net/";>PHP Project +http://www.php.net/";>PHP Project 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. -http://perl.apache.org/"; ->Apache/Perl Integration Project +http://perl.apache.org/"; +>Apache/Perl Integration Project The Apache/Perl integration project brings together the full power of the http://www.perl.com/perl/";>Perl programming language @@ -91,8 +90,8 @@ the penalty of Perl start-up time. -http://www.slink.com/ApacheOS2/"; ->Apache for OS/2 +http://www.slink.com/ApacheOS2/"; +>Apache for OS/2 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. -http://www.xs4all.nl/~albertv/apache"; ->Apache for Amiga +http://www.xs4all.nl/~albertv/apache"; +>Apache for Amiga Apache has now been ported to Amiga, and is maintained as a separate project. -http://java.apache.org/"; ->The Java-Apache Project +http://java.apache.org/"; +>The Java-Apache Project 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 , 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-Authenticate? ?
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
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 symb
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 *
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 , +for features against , 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.26If-None-Match ? ? -
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 @@ +IBM News, 22 June 1998: +http://www.ibm.com/News/1998/06/223.phtml";> +IBM ... Bundles leading-edge tools and technologies from +Apache and NetObjects into IBM WebSphere Application Server + +"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." + + + +Software Development, June 1998: +Apache: An Open-Source Software Success Story +by Warren Keuffel + + +Fast Company, May 1998, Issue 14, page 38: +http://www.fastcompany.com/online/14/rftf.html";> +The Best Things in Life Are Free + +"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." + + + Perfomance Computing, May 1998: http://www.performancecomputing.com/columns/web/9805.shtml";> The Apache HTTP Server
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 @@ Other press about this announcement: +Apache Group press release 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 http://www.zdnet.com/pcweek/news/0615/19mibm.html";>PC Week: IBM backs freeware Apachein new app server 1.1 apache-site/press/22Jun98.html Index: 22Jun98.html === IBM joins the Apache Project, Plans to bundle and support the Apache HTTP Server IBM joins the Apache Project, Plans to bundle and support the Apache HTTP Server 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. 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. "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." 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." "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." "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." "I am excited to see IBM join the large group of individuals and companies that develop and support open-source software," said Dean Gaudet, Apache Group member. "I can't help but feel that we'll see more companies begin experimenting with the open d
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/> - June 1997 + June 1998 @@ -136,7 +136,7 @@ - Current Apache Group in alphabetical order as of 23 April 1998: + Current Apache Group in alphabetical order as of 24 June 1998: @@ -167,6 +167,12 @@ + Roy T. Fielding + + UC Irvine, California + + + Dean Gaudet @@ -272,12 +278,6 @@ - Roy T. Fielding - - UC Irvine, California - - - Chuck Murcko The Topsail Group, Pennsylvania @@ -488,14 +488,5 @@ Thanks for using Apache! - - - Roy Fielding, June 1997 - - - If you are interested in other WWW history, see - <http://www.webhistory.org/"; - >http://www.webhistory.org/>. 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. -Current Apache Group in alphabetical order as of 23 April 1998: +Current Apache Group in alphabetical order as of 24 June 1998: @@ -39,6 +39,9 @@ Ralf S. Engelschall Dr. Cosmetics, mod_rewrite, DSO support, Configure, APACI, apxs, etc. + Roy T. Fielding + Standards Cop. + Dean Gaudet Performance freak. @@ -82,9 +85,6 @@ Apache Emeritae (old group members now off doing other things) - Roy T. Fielding - Standards Cop. - Chuck Murcko UnixWare, IRIX, BSD porting. @@ -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. + submit a few patches, and squeeze out an agenda.
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 ge
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 @@ Ambarish Malpani (NT port). - Ben Hyde (multi-platform build tests). - Many 3rd-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_protocol.c
fielding98/08/08 23:37:19 Modified:src CHANGES src/include http_config.h httpd.h src/main http_config.c http_protocol.c Log: Added default 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 message body. Bumped MMN for addition of limit_req_line, limit_req_fields, limit_req_fieldsize and limit_req_body variables to server_rec. Revision ChangesPath 1.1012+6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1011 retrieving revision 1.1012 diff -u -r1.1011 -r1.1012 --- CHANGES 1998/08/08 13:26:04 1.1011 +++ CHANGES 1998/08/09 06:37:12 1.1012 @@ -1,5 +1,11 @@ Changes with Apache 1.3.2 + *) SECURITY: Added default 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 + message body. [Roy Fielding] + *) Make status module aware of DNS and logging states, even if STATUS not defined. [Jim Jagielski] 1.92 +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.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- http_config.h 1998/08/06 17:30:23 1.91 +++ http_config.h 1998/08/09 06:37:15 1.92 @@ -275,7 +275,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19980806 +#define MODULE_MAGIC_NUMBER 19980808 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL /* Generic accessors for other modules to get at their own module-specific 1.231 +29 -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.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- httpd.h 1998/08/06 19:13:52 1.230 +++ httpd.h 1998/08/09 06:37:16 1.231 @@ -541,6 +541,28 @@ #define REQUEST_CHUNKED_DECHUNK 2 #define REQUEST_CHUNKED_PASS 3 +/* 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. These limits can be reset on a + * per-server basis using the LimitRequestLine, LimitRequestFields, + * LimitRequestFieldSize, and LimitRequestBody configuration directives. + */ +#ifndef DEFAULT_LIMIT_REQUEST_LINE +#define DEFAULT_LIMIT_REQUEST_LINE 8190 +#endif /* default limit on bytes in Request-Line (Method+URI+HTTP-version) */ +#ifndef DEFAULT_LIMIT_REQUEST_FIELDS +#define DEFAULT_LIMIT_REQUEST_FIELDS 100 +#endif /* default limit on number of header fields */ +#ifndef DEFAULT_LIMIT_REQUEST_FIELDSIZE +#define DEFAULT_LIMIT_REQUEST_FIELDSIZE 8190 +#endif /* default limit on bytes in any one field */ +#ifndef DEFAULT_LIMIT_REQUEST_BODY +#define DEFAULT_LIMIT_REQUEST_BODY 33554432ul +#endif /* default limit on bytes in request body */ + /* Things which may vary per file-lookup WITHIN a request --- * e.g., state of MIME config. Basically, the name of an object, info * about the object, and any other info we may ahve which may need to @@ -821,9 +843,14 @@ array_header *names; /* Normal names for ServerAlias servers */ array_header *wild_names;/* Wildcarded names for ServerAlias servers */ + +uid_t server_uid;/* effective user id when calling exec wrapper */ +gid_t server_gid;/* effective group id when calling exec wrapper */ -uid_t server_uid;/* effective user id when calling exec wrapper */ -gid_t server_gid;/* effective group id when calling exec wrapper */ +unsigned int limit_req_line; /* limit on bytes in Request-Line */ +unsigned int limit_req_fields;/* limit on number of header fields */ +unsigned long limit_req_fieldsize; /* limit on bytes in any one field */ +unsigned long limit_req_body; /* limit on bytes in request body */ }; /* These
cvs commit: apache-1.3/src/test test_limits.c
fielding98/08/09 18:20:58
Added: src/test test_limits.c
Log:
A quick and dirty program for testing request limits.
Obtained from: Dag-Erling Coidan <[EMAIL PROTECTED]>, plus changes by Roy
Revision ChangesPath
1.1 apache-1.3/src/test/test_limits.c
Index: test_limits.c
===
/**
* test_limits.c
*
* A simple program for sending abusive requests to a server, based
* on the sioux.c exploit code that this nimrod posted (see below).
* Roy added options for testing long header fieldsize (-t h), long
* request-lines (-t r), and a long request body (-t b).
*
* FreeBSD 2.2.x, FreeBSD 3.0, IRIX 5.3, IRIX 6.2:
* gcc -o test_limits test_limits.c
*
* Solaris 2.5.1:
* gcc -o test_limits test_limits.c -lsocket -lnsl
*
*
* Message-ID: <[EMAIL PROTECTED]>
* Date: Fri, 7 Aug 1998 19:04:27 +0200
* Sender: Bugtraq List <[EMAIL PROTECTED]>
* From: Dag-Erling Coidan =?ISO-8859-1?Q?Sm=F8rgrav?= <[EMAIL PROTECTED]>
* Subject: YA Apache DoS attack
*
* Copyright (c) 1998 Dag-Erling Codan Smrgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer
*in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in the
*documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
*derived from this software withough specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/*
* Kudos to Mark Huizer who originally suggested this on freebsd-current
*/
#include
#include
#include
#include
#include
#include
#include
#include
#include
#define TEST_LONG_REQUEST_LINE 1
#define TEST_LONG_REQUEST_FIELDS2
#define TEST_LONG_REQUEST_FIELDSIZE 3
#define TEST_LONG_REQUEST_BODY 4
void
usage(void)
{
fprintf(stderr,
"usage: test_limits [-t (r|n|h|b)] [-a address] [-p port] [-n num]\n");
exit(1);
}
int
main(int argc, char *argv[])
{
struct sockaddr_in sin;
struct hostent *he;
FILE *f;
int o, sd;
/* default parameters */
char *addr = "localhost";
int port = 80;
int num = 1000;
int testtype = TEST_LONG_REQUEST_FIELDS;
/* get options */
while ((o = getopt(argc, argv, "t:a:p:n:")) != EOF)
switch (o) {
case 't':
if (*optarg == 'r')
testtype = TEST_LONG_REQUEST_LINE;
else if (*optarg == 'n')
testtype = TEST_LONG_REQUEST_FIELDS;
else if (*optarg == 'h')
testtype = TEST_LONG_REQUEST_FIELDSIZE;
else if (*optarg == 'b')
testtype = TEST_LONG_REQUEST_BODY;
break;
case 'a':
addr = optarg;
break;
case 'p':
port = atoi(optarg);
break;
case 'n':
num = atoi(optarg);
break;
default:
usage();
}
if (argc != optind)
usage();
/* connect */
if ((he = gethostbyname(addr)) == NULL) {
perror("gethostbyname");
exit(1);
}
bzero(&sin, sizeof(sin));
bcopy(he->h_addr, (char *)&sin.sin_addr, he->h_length);
sin.sin_family = he->h_addrtype;
sin.sin_port = htons(port);
if ((sd = socket(sin.sin_family, SOCK_STREAM, IPPROTO_TCP)) == -1) {
perror("sock
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 in
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-1.3/src/main http_config.c http_core.c http_protocol.c
fielding98/08/11 02:26:25 Modified:src CHANGES src/include http_config.h httpd.h src/main http_config.c http_core.c http_protocol.c Log: Once more, with feeling... add back limit_req_line, limit_req_fieldsize, and limit_req_fields to server_rec so that they can be configurable by the new directives LimitRequestLine, LimitRequestFieldsize, and LimitRequestFields. Do not allow the user to set LimitRequestLine and LimitRequestFieldsize higher than the compiled buffer sizes. Revision ChangesPath 1.1018+7 -6 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1017 retrieving revision 1.1018 diff -u -r1.1017 -r1.1018 --- CHANGES 1998/08/11 00:09:41 1.1017 +++ CHANGES 1998/08/11 09:26:20 1.1018 @@ -7,12 +7,13 @@ *) SECURITY: Eliminate O(n^2) space DoS attacks (and other O(n^2) cpu time attacks) in header parsing. [Dean Gaudet] - *) 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, and size of any one header field. Also added a configurable - directive LimitRequestBody for limiting the size of the request - message body. [Roy Fielding] + *) SECURITY: Added compile-time and configurable limits for + various aspects of reading a client request to avoid some simple + denial of service attacks, including limits on maximum request-line + size (LimitRequestLine), number of header fields (LimitRequestFields), + and size of any one header field (LimitRequestFieldsize). 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 STATUS not defined. [Jim Jagielski] 1.94 +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.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- http_config.h 1998/08/10 04:16:12 1.93 +++ http_config.h 1998/08/11 09:26:22 1.94 @@ -275,7 +275,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19980809 +#define MODULE_MAGIC_NUMBER 19980811 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL /* Generic accessors for other modules to get at their own module-specific 1.235 +18 -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.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- httpd.h 1998/08/10 04:23:02 1.234 +++ httpd.h 1998/08/11 09:26:22 1.235 @@ -377,18 +377,23 @@ * 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. + * Internal buffer sizes are two bytes more than the DEFAULT_LIMIT_REQUEST_LINE + * and DEFAULT_LIMIT_REQUEST_FIELDSIZE below, which explains the 8190. + * These two limits can be lowered (but not raised) by the server config + * directives LimitRequestLine and LimitRequestFieldsize, respectively. + * + * DEFAULT_LIMIT_REQUEST_FIELDS can be modified or disabled (set = 0) by + * the server config directive LimitRequestFields. */ -#ifndef AP_LIMIT_REQUEST_LINE -#define AP_LIMIT_REQUEST_LINE 8190 +#ifndef DEFAULT_LIMIT_REQUEST_LINE +#define DEFAULT_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 8190 +#ifndef DEFAULT_LIMIT_REQUEST_FIELDSIZE +#define DEFAULT_LIMIT_REQUEST_FIELDSIZE 8190 #endif /* default limit on bytes in any one header field */ +#ifndef DEFAULT_LIMIT_REQUEST_FIELDS +#define DEFAULT_LIMIT_REQUEST_FIELDS 100 +#endif /* default limit on number of request header fields */ /* * The below defines the base string of the Server: header. Additional @@ -845,6 +850,10 @@ uid_t server_uid;/* effective user id when calling exec wrapper */ gid_t server_gid
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 @@ KeepAlive KeepAliveTimeout <Limit> +LimitRequestBody +LimitRequestFields +LimitRequestFieldsize +LimitRequestLine Listen ListenBacklog <Location> @@ -1324,7 +1328,201 @@ OPTIONS. The method name is case-sensitive. If GET is used it will also restrict HEAD requests. If you wish to limit all methods, do not include any -<Limit> directive at all. +<Limit> directive at all. + + + +LimitRequestBody directive + +Syntax: LimitRequestBody number +Default: LimitRequestBody 0 +Context: server config +Status: core +Compatibility: LimitRequestBody is only available in +Apache 1.3.2 and later. + + +Number is a long integer from 0 (meaning unlimited) to 2147483647 +(2GB). The default value is defined by the compile-time constant +DEFAULT_LIMIT_REQUEST_BODY (0 as distributed). + + +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. + + +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. + + + + +LimitRequestFields directive + +Syntax: LimitRequestFields number +Default: LimitRequestFields 100 +Context: server config +Status: core +Compatibility: LimitRequestFields is only available in +Apache 1.3.2 and later. + + +Number is an integer from 0 (meaning unlimited) to 32767. +The default value is defined by the compile-time constant +DEFAULT_LIMIT_REQUEST_FIELDS (100 as distributed). + + +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. + + +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 that indicates too many +fields were sent in the request. + + + +LimitRequestFieldsize directive + +Syntax: LimitRequestFieldsize number +Default: LimitRequestFieldsize 8190 +Context: server config +Status: core +Compatibility: LimitRequestFieldsize is only available in +Apache 1.3.2 and later. + + +Number is an integer size in bytes from 0 to the value of the +compile-time constant DEFAULT_LIMIT_REQUEST_FIELDSIZE +(8190 as distributed). + + +The LimitRequestFieldsize directive allows the server administrator to reduce +the limit on the allowed size of an HTTP request header field below the +normal input buffer size compiled with the server. A server needs this +value to be large enough to hold any one header field from a normal client +request. The size of a normal request header field will vary greatly +among different client implementations, often depending upon the extent +to which a user has configured their browser to support detailed +content negotiation. + + +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. Under normal conditions, th
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 @@ Context: server config +>Context: server config, virtual host, directory, +.htaccess
cvs commit: apache-1.3/src/main http_main.c
fielding98/09/14 18:19:35 Modified:src/main http_main.c Log: Fix gcc warning on Solaris --> pid_t and %d don't match. Revision ChangesPath 1.391 +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.390 retrieving revision 1.391 diff -u -r1.390 -r1.391 --- http_main.c 1998/09/15 00:15:19 1.390 +++ http_main.c 1998/09/15 01:19:32 1.391 @@ -4294,9 +4294,10 @@ const char *pidfile = NULL; pidfile = ap_server_root_relative (pconf, ap_pid_fname); if ( pidfile != NULL && unlink(pidfile) == 0) - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf, - "httpd: removed PID file %s (pid=%d)", - pidfile, getpid()); + ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, + server_conf, + "httpd: removed PID file %s (pid=%ld)", + pidfile, (long)getpid()); } ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
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
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/19 23:50:57 Modified:.STATUS Log: A day spent on the beach chucking horse shoes is better than a night spent hacking on Apache. Revision ChangesPath 1.480 +12 -16apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.479 retrieving revision 1.480 diff -u -r1.479 -r1.480 --- STATUS1998/09/19 21:54:54 1.479 +++ STATUS1998/09/20 06:50:56 1.480 @@ -3,9 +3,8 @@ Release: 1.3.2: In preparation for a release. - - Tarball rolling proposed for Monday, September 21th, 1998 - - Release and announcement proposed for Wednesday, September 23th, - 1998 + - Tarball rolling proposed for Mon, 21 Sep 1998 + - Release and announcement proposed for Wed, 23 Sep 1998 - Ralf is the release manager. Current test status: @@ -24,6 +23,7 @@ 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) @@ -49,19 +49,10 @@ db1 or else make sure that people know to update their DB files (or are we calling db2 files different names?) -WIN32 1.3.2 RELEASE SHOWSTOPPERS: + Roy: I don't understand why we should stop everything for this. + Does the current cvs work with existing db files, or not? + If not, let's fix it. If unknown, it isn't a showstopper. -* can not build tarball until someone verifies the final code - will build on win32. Want to avoid changes-after-tag that - happened with 1.3.0. - -* fix O(n^2) attack in mod_isapi.c ... i.e. recopy the code from - scan_script_headers_err_core. - -Unix 1.3.2 RELEASE SHOWSTOPPERS: - -* none - Documentation that needs writing: * Need a document explaining mod_rewrite/"UseCanonicalName off" based @@ -300,6 +291,11 @@ Win32 specific issues: + Important + +* fix O(n^2) attack in mod_isapi.c ... i.e. recopy the code from + scan_script_headers_err_core. + In progress: * Ben's ASP work... All agree it sounds cool. @@ -421,7 +417,7 @@ * apparently either "BrowserMatch" or the "nokeepalive" variable cause instability - see PR#1729. -Delayed until after 1.3.0, unless someone happens to get to it: +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:
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
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.\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, "\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.\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, "\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.\n", fd);
+ if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
+ ap_bvputs(fd, error_notes, "\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.\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, "\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 ) Record of changes to the - module magic number + http://www.apache.org/websrc/cvsweb.cgi/apache-1.3/src/include/ap_mmn.h";>module magic number - (last modified on ) 1.1 apache-devsite/mmn.txt.asis Index: mmn.txt.asis === Status: 200 OK Content-type: text/html Module Magic Number Module Magic Number The table of module magic numbers has been moved to the include file http://www.apache.org/websrc/cvsweb.cgi/apache-1.3/src/include/ap_mmn.h";>src/include/ap_mmn.h distributed with the Apache HTTP Server source code.
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]>]
