cvs commit: apache-1.3/src/ap ap_snprintf.c
jim 99/11/28 07:47:02 Modified:src CHANGES src/ap ap_snprintf.c Log: The real fix for ap_snprintf :) Revision ChangesPath 1.1462+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1461 retrieving revision 1.1462 diff -u -r1.1461 -r1.1462 --- CHANGES 1999/11/28 14:15:32 1.1461 +++ CHANGES 1999/11/28 15:46:59 1.1462 @@ -6,7 +6,7 @@ [Ralf S. Engelschall] *) Fixed `quad integer' (aka `long long') handling in ap_snprintf.c - [Ralf S. Engelschall] + [Jim Jagielski, Ralf S. Engelschall] *) Fixed error handling in dbmmanage script. [Andrew McRae <[EMAIL PROTECTED]>] PR#4973 1.40 +4 -3 apache-1.3/src/ap/ap_snprintf.c Index: ap_snprintf.c === RCS file: /export/home/cvs/apache-1.3/src/ap/ap_snprintf.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ap_snprintf.c 1999/11/28 13:53:40 1.39 +++ ap_snprintf.c 1999/11/28 15:47:02 1.40 @@ -410,10 +410,11 @@ u_widest_int magnitude; /* - * If the value is less than the maximum unsigned long value, - * then we know we aren't using quads, so use the faster function + * We see if we can use the faster non-quad version by checking the + * number against the largest long value it can be. If <=, we + * punt to the quicker version. */ -if (num <= ULONG_MAX && is_unsigned) +if ((num <= ULONG_MAX && is_unsigned) || (num <= LONG_MAX && !is_unsigned)) return(conv_10( (wide_int)num, is_unsigned, is_negative, buf_end, len));
cvs commit: apache-1.3/src/helpers fmn.sh
rse 99/11/28 06:25:44 Modified:src/helpers fmn.sh Log: Allow /tmp path to be overridden by $TMPDIR variable. Revision ChangesPath 1.7 +1 -1 apache-1.3/src/helpers/fmn.sh Index: fmn.sh === RCS file: /home/cvs/apache-1.3/src/helpers/fmn.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fmn.sh1999/04/21 14:30:29 1.6 +++ fmn.sh1999/11/28 14:25:43 1.7 @@ -14,7 +14,7 @@ modfile=$1 # the part from the Configure script -tmpfile=/tmp/fmn.tmp.$$ +tmpfile=${TMPDIR-/tmp}/fmn.tmp.$$ rm -f $tmpfile modname='' ext=`echo $modfile | sed 's/^.*\.//'`
cvs commit: apache-1.3 configure
rse 99/11/28 06:15:37 Modified:src CHANGES .configure Log: Add --iconsdir, --htdocsdir, and --cgidir option to top-level configure script to allow one to override the corresponding variables from config.layout. Revision ChangesPath 1.1461+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1460 retrieving revision 1.1461 diff -u -r1.1460 -r1.1461 --- CHANGES 1999/11/28 13:51:49 1.1460 +++ CHANGES 1999/11/28 14:15:32 1.1461 @@ -1,5 +1,10 @@ Changes with Apache 1.3.10 + *) Add --iconsdir, --htdocsdir, and --cgidir option to top-level + configure script to allow one to override the corresponding + variables from config.layout. + [Ralf S. Engelschall] + *) Fixed `quad integer' (aka `long long') handling in ap_snprintf.c [Ralf S. Engelschall] 1.110 +12 -0 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- configure 1999/11/28 11:36:53 1.109 +++ configure 1999/11/28 14:15:35 1.110 @@ -628,6 +628,18 @@ datadir="$apc_optarg" autosuffix_datadir=no ;; +--iconsdir=*) +iconsdir="$apc_optarg" +autosuffix_iconsdir=no +;; +--htdocsdir=*) +htdocsdir="$apc_optarg" +autosuffix_htdocsdir=no +;; +--cgidir=*) +cgidir="$apc_optarg" +autosuffix_cgidir=no +;; --includedir=*) includedir="$apc_optarg" autosuffix_includedir=no
cvs commit: apache-1.3/src/modules/standard mod_auth_db.module
rse 99/11/28 06:01:05 Modified:src/modules/standard mod_auth_db.module Log: Ops, forgot to commit the corresponding changes to mod_auth_db.module for supporting Berkeley-DB/3.x Revision ChangesPath 1.7 +15 -16apache-1.3/src/modules/standard/mod_auth_db.module Index: mod_auth_db.module === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth_db.module,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_auth_db.module1998/09/19 12:12:35 1.6 +++ mod_auth_db.module1999/11/28 14:01:05 1.7 @@ -2,22 +2,21 @@ ConfigStart DB_VERSION='' DB_LIB='' -if ./helpers/TestCompile func db_open; then +if ./helpers/TestCompile func db_create; then +DB_VERSION='Berkeley-DB/3.x' +elif ./helpers/TestCompile lib db db_create; then +DB_VERSION='Berkeley-DB/3.x' +DB_LIB='-ldb' +elif ./helpers/TestCompile func db_open; then DB_VERSION='Berkeley-DB/2.x' -else -if ./helpers/TestCompile lib db db_open; then -DB_VERSION='Berkeley-DB/2.x' -DB_LIB='-ldb' -else -if ./helpers/TestCompile func dbopen; then -DB_VERSION='Berkeley-DB/1.x' -else -if ./helpers/TestCompile lib db dbopen; then -DB_VERSION='Berkeley-DB/1.x' -DB_LIB='-ldb' -fi -fi -fi +elif ./helpers/TestCompile lib db db_open; then +DB_VERSION='Berkeley-DB/2.x' +DB_LIB='-ldb' +elif ./helpers/TestCompile func dbopen; then +DB_VERSION='Berkeley-DB/1.x' +elif ./helpers/TestCompile lib db dbopen; then +DB_VERSION='Berkeley-DB/1.x' +DB_LIB='-ldb' fi if [ ".$DB_VERSION" != . ]; then if [ ".$DB_LIB" != . ]; then @@ -27,7 +26,7 @@ echo " using $DB_VERSION for mod_auth_db (-lc)" fi else -echo "Error: Neither Berkeley-DB/1.x nor Berkeley-DB/2.x library found." +echo "Error: None of Berkeley-DB 1.x, 2.x or 3.x libraries found." echo " Either disable mod_auth_db or provide us with the paths" echo " to the Berkeley-DB include and library files." echo " (Hint: INCLUDES, LDFLAGS, LIBS)"
cvs commit: apache-1.3/src/ap ap_snprintf.c
rse 99/11/28 05:53:41 Modified:src/ap ap_snprintf.c Log: Remove a useless #define which was left over from xinetd days. Revision ChangesPath 1.39 +0 -1 apache-1.3/src/ap/ap_snprintf.c Index: ap_snprintf.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_snprintf.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ap_snprintf.c 1999/11/28 13:51:54 1.38 +++ ap_snprintf.c 1999/11/28 13:53:40 1.39 @@ -84,7 +84,6 @@ #define AP_LONGEST_LONG long #endif #define NUL '\0' -#define INT_NULL ((int *)0) #define WIDE_INT long #define WIDEST_INT AP_LONGEST_LONG
cvs commit: apache-1.3/src/ap ap_snprintf.c
rse 99/11/28 05:51:54 Modified:src CHANGES src/ap ap_snprintf.c Log: Fixed `quad integer' (aka `long long') handling in ap_snprintf.c More details were described in my original posting two weeks ago: --- Today (on my birthday ;) I've hacked on and cleaned up snprintf implementations for a forthcoming string library and discovered the following bug in ap_snprintf. If one tries to print a "long long" value which is just a little bit lower than the maximimum "unsigned long" (not "unsigned long long"!) value, ap_snprintf treats the value as a (signed) "long" instead of a "long long": | $ cat test.c | #include | #include "ap_config.h" | #include "ap.h" | | int main(int argc, char *argv[]) | { | char buf[1024]; | | ap_snprintf(buf, sizeof(buf), "%qd %qd", 4294967290ULL, 4294967297ULL); | printf("ap_snprintf: \"%s\"\n", buf); | | sprintf(buf, "%qd %qd", 4294967290ULL, 4294967297ULL); | printf("sprintf: \"%s\"\n", buf); | } | $ cc -I../os/unix -I../include -o test test.c libap.a && ./test | ap_snprintf: "-6 4294967297" | sprintf: "4294967290 4294967297" The reason is a wrong optimization test in ap_snprintf.c which can be fixed this way: Index: ap_snprintf.c === RCS file: /e/apache/REPOS/apache-1.3/src/ap/ap_snprintf.c,v retrieving revision 1.37 diff -u -r1.37 ap_snprintf.c --- ap_snprintf.c 1999/10/21 20:44:10 1.37 +++ ap_snprintf.c 1999/11/17 12:22:11 @@ -414,7 +413,7 @@ * If the value is less than the maximum unsigned long value, * then we know we aren't using quads, so use the faster function */ -if (num <= ULONG_MAX) +if (num <= ULONG_MAX && is_unsigned) return(conv_10( (wide_int)num, is_unsigned, is_negative, buf_end, len)); With this patch ap_snprintf and the (FreeBSD) vendor sprintf print the same values: | $ cc -I../os/unix -I../include -o test test.c libap.a && ./test | ap_snprintf: "4294967290 4294967297" | sprintf: "4294967290 4294967297" I think the patch is correct, although I have to admit that because of time I've not checked the whole quad-fiddling in ap_snprintf.c now. So I do not commit this myself. Instead someone else should review this first. --- Revision ChangesPath 1.1460+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1459 retrieving revision 1.1460 diff -u -r1.1459 -r1.1460 --- CHANGES 1999/11/28 13:37:50 1.1459 +++ CHANGES 1999/11/28 13:51:49 1.1460 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) Fixed `quad integer' (aka `long long') handling in ap_snprintf.c + [Ralf S. Engelschall] + *) Fixed error handling in dbmmanage script. [Andrew McRae <[EMAIL PROTECTED]>] PR#4973 1.38 +1 -1 apache-1.3/src/ap/ap_snprintf.c Index: ap_snprintf.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_snprintf.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ap_snprintf.c 1999/10/21 20:44:10 1.37 +++ ap_snprintf.c 1999/11/28 13:51:54 1.38 @@ -414,7 +414,7 @@ * If the value is less than the maximum unsigned long value, * then we know we aren't using quads, so use the faster function */ -if (num <= ULONG_MAX) +if (num <= ULONG_MAX && is_unsigned) return(conv_10( (wide_int)num, is_unsigned, is_negative, buf_end, len));
cvs commit: apache-1.3/src/support dbmmanage
rse 99/11/28 05:37:53 Modified:src CHANGES src/support dbmmanage Log: Fixed error handling in dbmmanage script. Submitted by: Andrew McRae <[EMAIL PROTECTED]> Reviewed by: Ralf S. Engelschall PR: 4973 Revision ChangesPath 1.1459+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1458 retrieving revision 1.1459 diff -u -r1.1458 -r1.1459 --- CHANGES 1999/11/28 13:28:05 1.1458 +++ CHANGES 1999/11/28 13:37:50 1.1459 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) Fixed error handling in dbmmanage script. + [Andrew McRae <[EMAIL PROTECTED]>] PR#4973 + *) Fixed NEXT/OpenStep building by adding an fallback typedef for rlim_t to ap_config.h. [Mark Miller <[EMAIL PROTECTED]>] PR#4906 1.14 +1 -1 apache-1.3/src/support/dbmmanage Index: dbmmanage === RCS file: /home/cvs/apache-1.3/src/support/dbmmanage,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dbmmanage 1999/01/01 19:05:33 1.13 +++ dbmmanage 1999/11/28 13:37:53 1.14 @@ -91,7 +91,7 @@ my($mode, $flags) = $command =~ /^(?:view|check)$/ ? (0644, O_RDONLY) : (0644, O_RDWR|O_CREAT); -tie %DB, "AnyDBM_File", $file, $flags, $mode || die "Can't tie $file: $!"; +tie (%DB, "AnyDBM_File", $file, $flags, $mode) || die "Can't tie $file: $!"; dbmc->$command(); untie %DB;
cvs commit: apache-2.0/src/ap ap_hooks.c
bjh 99/11/28 05:32:16 Modified:src/ap ap_hooks.c Log: Fix hook sorting. When walking a linked list it's a good idea to start at the head rather than the first element of the array. This makes mod_userdir actually work. Revision ChangesPath 1.8 +1 -1 apache-2.0/src/ap/ap_hooks.c Index: ap_hooks.c === RCS file: /home/cvs/apache-2.0/src/ap/ap_hooks.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ap_hooks.c1999/10/04 16:36:44 1.7 +++ ap_hooks.c1999/11/28 13:32:15 1.8 @@ -120,7 +120,7 @@ ap_create_context(&p, g_pHookPool); pSort=prepare(p,(TSortData *)pHooks->elts,pHooks->nelts); -tsort(pSort,pHooks->nelts); +pSort=tsort(pSort,pHooks->nelts); pNew=ap_make_array(g_pHookPool,pHooks->nelts,sizeof(TSortData)); if(g_bDebugHooks) printf("Sorting %s:",szName);
cvs commit: apache-1.3/src/include ap_config.h
rse 99/11/28 05:28:08 Modified:src CHANGES src/include ap_config.h Log: Fixed NEXT/OpenStep building by adding an fallback typedef for rlim_t to ap_config.h. Submitted by: Mark Miller <[EMAIL PROTECTED]> PR: 4906 Revision ChangesPath 1.1458+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1457 retrieving revision 1.1458 diff -u -r1.1457 -r1.1458 --- CHANGES 1999/11/28 13:21:47 1.1457 +++ CHANGES 1999/11/28 13:28:05 1.1458 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) Fixed NEXT/OpenStep building by adding an fallback typedef for + rlim_t to ap_config.h. + [Mark Miller <[EMAIL PROTECTED]>] PR#4906 + *) Fix SHARED_CORE feature for HPUX by backing-out a change (comitted between 1.3.7 and 1.3.9) which changed the DSO extension from `sl' to `so'. This worked only for modules (where we load the DSO manually), but 1.274 +1 -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.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- ap_config.h 1999/11/28 12:28:06 1.273 +++ ap_config.h 1999/11/28 13:28:07 1.274 @@ -350,6 +350,7 @@ #elif defined(NEXT) typedef unsigned short mode_t; +typedef int rlim_t; #define HAVE_GMTOFF 1 #undef NO_KILLPG #define NO_SETSID
cvs commit: apache-1.3/src CHANGES Configure
rse 99/11/28 05:21:51 Modified:src CHANGES Configure Log: Fix SHARED_CORE feature for HPUX by backing-out a change (comitted between 1.3.7 and 1.3.9) which changed the DSO extension from `sl' to `so'. This worked only for modules (where we load the DSO manually), but horribly fails under HPUX for DSO-based/shared libraries (where our $SHLIB_SUFFIX_NAME is used, too). Submitted by: Gary Silverman <[EMAIL PROTECTED]> Reviewed by: Ralf S. Engelschall PR: 4974 Revision ChangesPath 1.1457+7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1456 retrieving revision 1.1457 diff -u -r1.1456 -r1.1457 --- CHANGES 1999/11/28 12:59:49 1.1456 +++ CHANGES 1999/11/28 13:21:47 1.1457 @@ -1,4 +1,11 @@ Changes with Apache 1.3.10 + + *) Fix SHARED_CORE feature for HPUX by backing-out a change (comitted + between 1.3.7 and 1.3.9) which changed the DSO extension from `sl' to + `so'. This worked only for modules (where we load the DSO manually), but + horribly fails under HPUX for DSO-based/shared libraries (where our + $SHLIB_SUFFIX_NAME is used, too). + [Gary Silverman <[EMAIL PROTECTED]>] PR#4974 *) Added support for Berkeley-DB/3.x to mod_auth_db. [Steve Atkins <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#5382 1.375 +2 -0 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.374 retrieving revision 1.375 diff -u -r1.374 -r1.375 --- Configure 1999/11/28 10:55:28 1.374 +++ Configure 1999/11/28 13:21:48 1.375 @@ -1224,6 +1224,7 @@ LDFLAGS_SHLIB="-b" LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB LDFLAGS_SHLIB_EXPORT="-Wl,-E -Wl,-B,deferred" + SHLIB_SUFFIX_NAME=sl ;; *-hp-hpux10.*|*-hp-hpux11.*) case $CC in @@ -1233,6 +1234,7 @@ LDFLAGS_SHLIB="-b" LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB LDFLAGS_SHLIB_EXPORT="-Wl,-E -Wl,-B,deferred -Wl,+s" + SHLIB_SUFFIX_NAME=sl ;; *-ibm-aix*) case $CC in
cvs commit: apache-1.3/src/modules/standard mod_auth_db.c
rse 99/11/28 04:59:52 Modified:src CHANGES src/modules/standard mod_auth_db.c Log: Added support for Berkeley-DB/3.x to mod_auth_db. Submitted by: Steve Atkins <[EMAIL PROTECTED]> Cleaned up and reviewed by: Ralf S. Engelschall PR: 5382 Revision ChangesPath 1.1456+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1455 retrieving revision 1.1456 diff -u -r1.1455 -r1.1456 --- CHANGES 1999/11/28 12:41:54 1.1455 +++ CHANGES 1999/11/28 12:59:49 1.1456 @@ -1,4 +1,7 @@ Changes with Apache 1.3.10 + + *) Added support for Berkeley-DB/3.x to mod_auth_db. + [Steve Atkins <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#5382 *) Fixed mod_auth_digest.c: result of an open() call was being checked against the wrong failure value. 1.43 +12 -4 apache-1.3/src/modules/standard/mod_auth_db.c Index: mod_auth_db.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- mod_auth_db.c 1999/08/02 20:50:22 1.42 +++ mod_auth_db.c 1999/11/28 12:59:51 1.43 @@ -97,9 +97,14 @@ #include "http_protocol.h" #include -#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 2) +#if defined(DB_VERSION_MAJOR) +#if (DB_VERSION_MAJOR == 2) #define DB2 #endif +#if (DB_VERSION_MAJOR == 3) +#define DB3 +#endif +#endif typedef struct { @@ -161,7 +166,10 @@ q.data = user; q.size = strlen(q.data); -#ifdef DB2 +#if defined(DB3) +if ( db_create(&f, NULL, 0) != 0 +|| f->open(f, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) { +#elif defined(DB2) if (db_open(auth_dbpwfile, DB_HASH, DB_RDONLY, 0664, NULL, NULL, &f) != 0) { #else if (!(f = dbopen(auth_dbpwfile, O_RDONLY, 0664, DB_HASH, NULL))) { @@ -171,7 +179,7 @@ return NULL; } -#ifdef DB2 +#if defined(DB2) || defined(DB3) if (!((f->get) (f, NULL, &q, &d, 0))) { #else if (!((f->get) (f, &q, &d, 0))) { @@ -181,7 +189,7 @@ pw[d.size] = '\0'; /* Terminate the string */ } -#ifdef DB2 +#if defined(DB2) || defined(DB3) (f->close) (f, 0); #else (f->close) (f);
cvs commit: apache-1.3/src/modules/experimental mod_auth_digest.c
rse 99/11/28 04:42:01 Modified:src CHANGES src/modules/experimental mod_auth_digest.c Log: Fixed mod_auth_digest.c: result of an open() call was being checked against the wrong failure value. Submitted by: Rick Ohnemus <[EMAIL PROTECTED]> Reviewed by: Ralf S. Engelschall PR: 5292 Revision ChangesPath 1.1455+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1454 retrieving revision 1.1455 diff -u -r1.1454 -r1.1455 --- CHANGES 1999/11/28 12:28:02 1.1454 +++ CHANGES 1999/11/28 12:41:54 1.1455 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) Fixed mod_auth_digest.c: result of an open() call was being + checked against the wrong failure value. + [Rick Ohnemus <[EMAIL PROTECTED]>] PR#5292 + *) Removed the variable name "template" from a prototype for SunOS4 in ap_config.h to make C++ compiler happy, too. [SAKAI Kiyotaka <[EMAIL PROTECTED]>] PR#5363 1.11 +1 -1 apache-1.3/src/modules/experimental/mod_auth_digest.c Index: mod_auth_digest.c === RCS file: /home/cvs/apache-1.3/src/modules/experimental/mod_auth_digest.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mod_auth_digest.c 1999/09/19 21:28:34 1.10 +++ mod_auth_digest.c 1999/11/28 12:41:59 1.11 @@ -317,7 +317,7 @@ #ifdef DEV_RANDOM #define XSTR(x) #x #define STR(x) XSTR(x) -if ((rnd = open(STR(DEV_RANDOM), O_RDONLY)) == NULL) { +if ((rnd = open(STR(DEV_RANDOM), O_RDONLY)) == -1) { ap_log_error(APLOG_MARK, APLOG_CRIT, s, "Digest: Couldn't open " STR(DEV_RANDOM)); exit(EXIT_FAILURE);
cvs commit: apache-1.3/src/include ap_config.h
rse 99/11/28 04:28:06 Modified:src CHANGES src/include ap_config.h Log: Removed the variable name "template" from a prototype for SunOS4 in ap_config.h to make C++ compiler happy, too. Submitted by: SAKAI Kiyotaka <[EMAIL PROTECTED]> Reviewed by: Ralf S. Engelschall PR: 5363 Revision ChangesPath 1.1454+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1453 retrieving revision 1.1454 diff -u -r1.1453 -r1.1454 --- CHANGES 1999/11/28 12:14:18 1.1453 +++ CHANGES 1999/11/28 12:28:02 1.1454 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) Removed the variable name "template" from a prototype for SunOS4 + in ap_config.h to make C++ compiler happy, too. + [SAKAI Kiyotaka <[EMAIL PROTECTED]>] PR#5363 + *) Added missing links to htdocs/manual/mod/directives.html for AllowCONNECT and ProxyDomain. [Patrik Grip-Jansson <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#5319 1.273 +1 -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.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- ap_config.h 1999/10/28 17:57:28 1.272 +++ ap_config.h 1999/11/28 12:28:06 1.273 @@ -160,7 +160,7 @@ #undef NO_KILLPG #undef NO_SETSID char *crypt(const char *pw, const char *salt); -char *mktemp(char *template); +char *mktemp(char *); #define HAVE_MMAP 1 #define USE_MMAP_SCOREBOARD #define USE_MMAP_FILES
cvs commit: apache-1.3/htdocs/manual/mod directives.html
rse 99/11/28 04:14:22 Modified:src CHANGES htdocs/manual/mod directives.html Log: Added missing links to htdocs/manual/mod/directives.html for AllowCONNECT and ProxyDomain. Submitted by: Patrik Grip-Jansson <[EMAIL PROTECTED]>, Ralf S. Engelschall Reviewed by: Ralf S. Engelschall PR: 5319 Revision ChangesPath 1.1453+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1452 retrieving revision 1.1453 diff -u -r1.1452 -r1.1453 --- CHANGES 1999/11/28 11:41:53 1.1452 +++ CHANGES 1999/11/28 12:14:18 1.1453 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) Added missing links to htdocs/manual/mod/directives.html + for AllowCONNECT and ProxyDomain. [Patrik Grip-Jansson + <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#5319 + *) Fixed typo in htdocs/manual/install.html. [Chris Pepper <[EMAIL PROTECTED]>] PR#5360 1.59 +2 -0 apache-1.3/htdocs/manual/mod/directives.html Index: directives.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- directives.html 1999/06/24 16:38:34 1.58 +++ directives.html 1999/11/28 12:14:21 1.59 @@ -44,6 +44,7 @@ Alias AliasMatch allow +AllowCONNECT AllowOverride Anonymous Anonymous_Authoritative @@ -155,6 +156,7 @@ PidFile Port ProxyBlock +ProxyDomain ProxyPass ProxyPassReverse ProxyReceiveBufferSize
cvs commit: apache-1.3/src CHANGES
rse 99/11/28 03:41:55 Modified:src CHANGES Log: Make entry complete: the actual patch was written by me... Revision ChangesPath 1.1452+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1451 retrieving revision 1.1452 diff -u -r1.1451 -r1.1452 --- CHANGES 1999/11/28 11:38:56 1.1451 +++ CHANGES 1999/11/28 11:41:53 1.1452 @@ -18,7 +18,7 @@ *) Made stripping of a trailing slash in directory names in top-level configure script more robust and this way support also a plain `/' as the argument without resulting in an empty name. - [Matthias Lohmann <[EMAIL PROTECTED]>] PR#5291 + [Matthias Lohmann <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#5291 *) Made `tr' usage in top-level configure script more portable by always using square brackets consistently.
cvs commit: apache-1.3/htdocs/manual install.html
rse 99/11/28 03:38:58 Modified:src CHANGES htdocs/manual install.html Log: Fixed typo in htdocs/manual/install.html. Submitted by: Chris Pepper <[EMAIL PROTECTED]> PR: 5360 Revision ChangesPath 1.1451+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1450 retrieving revision 1.1451 diff -u -r1.1450 -r1.1451 --- CHANGES 1999/11/28 11:36:51 1.1450 +++ CHANGES 1999/11/28 11:38:56 1.1451 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) Fixed typo in htdocs/manual/install.html. + [Chris Pepper <[EMAIL PROTECTED]>] PR#5360 + *) Fix $AWK/awk usage in top-level configure script: We confused ourself and replaced the wrong "$AWK" with a plain "awk" in the last releases. So we now both fix this and move the comment which already tried to explain it 1.27 +1 -1 apache-1.3/htdocs/manual/install.html Index: install.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/install.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- install.html 1999/04/27 08:26:55 1.26 +++ install.html 1999/11/28 11:38:58 1.27 @@ -215,7 +215,7 @@ If when you run httpd it complained about being unable to "bind" to an address, then either some other process is already using the port you have configured Apache to use, or you are running httpd -as a normal user but trying to use port below 1024 (such as the +as a normal user but trying to use a port below 1024 (such as the default port 80).
cvs commit: apache-1.3 configure
rse 99/11/28 03:36:54 Modified:src CHANGES .configure Log: Fix $AWK/awk usage in top-level configure script: We confused ourself and replaced the wrong "$AWK" with a plain "awk" in the last releases. So we now both fix this and move the comment which already tried to explain it more closer to the location to which it applies. Submitted by: Paul Gilmartin <[EMAIL PROTECTED]> Extended and reviewed by: Ralf S. Engelschall PR: 5304 Revision ChangesPath 1.1450+6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1449 retrieving revision 1.1450 diff -u -r1.1449 -r1.1450 --- CHANGES 1999/11/28 11:24:25 1.1449 +++ CHANGES 1999/11/28 11:36:51 1.1450 @@ -1,4 +1,10 @@ Changes with Apache 1.3.10 + + *) Fix $AWK/awk usage in top-level configure script: We confused ourself and + replaced the wrong "$AWK" with a plain "awk" in the last releases. So we + now both fix this and move the comment which already tried to explain it + more closer to the location to which it applies. + [Paul Gilmartin <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#5304 *) Replaced pipes with commas in GuessOS' fallback output (displayed for not explicitly recognized platforms) to avoid side-effects with APACI's 1.109 +4 -4 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- configure 1999/11/28 11:17:57 1.108 +++ configure 1999/11/28 11:36:53 1.109 @@ -546,9 +546,7 @@ ;; esac # determine GNU platform triple -# (the use of `awk' and not `$AWK' here is correct, because this -# Makefile is for platform bootstrapping, so don't hardcode paths) -gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | awk '{ printf("%s",$1); }'` +gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | $AWK '{ printf("%s",$1); }'` # create Makefile wrapper (the first time only) if [ "x`ls $top/src.* 2>/dev/null`" = "x" ]; then if [ "x$quiet" = "xno" ]; then @@ -563,7 +561,9 @@ else echo "SHADOW=." >> Makefile fi -echo "GNUTRIPLE=\`$aux/GuessOS | sed -e 's:/:-:g' | $AWK '{ printf(\"%s\",\$\$1); }'\`" >> Makefile +# (the use of `awk' and not `$AWK' here is correct, because this +# Makefile is for platform bootstrapping, so don't hardcode paths) +echo "GNUTRIPLE=\`$aux/GuessOS | sed -e 's:/:-:g' | awk '{ printf(\"%s\",\$\$1); }'\`" >> Makefile echo "" >> Makefile echo "all build install install-quiet clean distclean:" >> Makefile echo " @cd \$(SHADOW); \$(MAKE) -f Makefile.\$(GNUTRIPLE) \$(MFLAGS) \$@" >> Makefile
cvs commit: apache-1.3/src/helpers GuessOS
rse 99/11/28 03:24:27 Modified:src CHANGES src/helpers GuessOS Log: Replaced pipes with commas in GuessOS' fallback output (displayed for not explicitly recognized platforms) to avoid side-effects with APACI's --shadow feature and similar uses where GuessOS' output is used directly on the filesystem (where pipes are meta-characters!). Submitted by: Paul Gilmartin <[EMAIL PROTECTED]> Adjusted and reviewed by: Ralf S. Engelschall PR: 5303 Revision ChangesPath 1.1449+6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1448 retrieving revision 1.1449 diff -u -r1.1448 -r1.1449 --- CHANGES 1999/11/28 11:17:50 1.1448 +++ CHANGES 1999/11/28 11:24:25 1.1449 @@ -1,4 +1,10 @@ Changes with Apache 1.3.10 + + *) Replaced pipes with commas in GuessOS' fallback output (displayed for not + explicitly recognized platforms) to avoid side-effects with APACI's + --shadow feature and similar uses where GuessOS' output is used directly + on the filesystem (where pipes are meta-characters!). + [Paul Gilmartin <[EMAIL PROTECTED]>] PR#5303 *) Made stripping of a trailing slash in directory names in top-level configure script more robust and this way support also a plain `/' 1.64 +1 -1 apache-1.3/src/helpers/GuessOS Index: GuessOS === RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- GuessOS 1999/08/09 07:38:44 1.63 +++ GuessOS 1999/11/28 11:24:27 1.64 @@ -326,5 +326,5 @@ # At this point we gone through all the one's # we know of: Punt -echo "${MACHINE}-whatever-${SYSTEM}|${RELEASE}|${VERSION}" +echo "${MACHINE}-whatever-${SYSTEM},${RELEASE},${VERSION}" exit 0
cvs commit: apache-1.3 configure
rse 99/11/28 03:17:58 Modified:src CHANGES .configure Log: Made stripping of a trailing slash in directory names in top-level configure script more robust and this way support also a plain `/' as the argument without resulting in an empty name. PR: 5291 Revision ChangesPath 1.1448+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1447 retrieving revision 1.1448 diff -u -r1.1447 -r1.1448 --- CHANGES 1999/11/28 11:10:48 1.1447 +++ CHANGES 1999/11/28 11:17:50 1.1448 @@ -1,4 +1,9 @@ Changes with Apache 1.3.10 + + *) Made stripping of a trailing slash in directory names in top-level + configure script more robust and this way support also a plain `/' + as the argument without resulting in an empty name. + [Matthias Lohmann <[EMAIL PROTECTED]>] PR#5291 *) Made `tr' usage in top-level configure script more portable by always using square brackets consistently. 1.108 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- configure 1999/11/28 11:10:52 1.107 +++ configure 1999/11/28 11:17:57 1.108 @@ -1038,7 +1038,7 @@ localstatedir runtimedir logfiledir proxycachedir \ suexec_docroot suexec_logexec; do eval "val=\"\$$var\""; -val=`echo $val | sed -e 's:/*$::'` +val=`echo $val | sed -e 's:\(.\)/*$:\1:'` eval "$var=\"$val\"" # expand value eval "val=\$$var"
cvs commit: apache-1.3 configure
rse 99/11/28 03:10:53 Modified:src CHANGES .configure Log: Made `tr' usage in top-level configure script more portable by always using square brackets consistently. Submitted by: Masashi Kizaki <[EMAIL PROTECTED]> Reviewed by: Ralf S. Engelschall PR: 5230 Revision ChangesPath 1.1447+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1446 retrieving revision 1.1447 diff -u -r1.1446 -r1.1447 --- CHANGES 1999/11/28 10:55:28 1.1446 +++ CHANGES 1999/11/28 11:10:48 1.1447 @@ -1,4 +1,8 @@ Changes with Apache 1.3.10 + + *) Made `tr' usage in top-level configure script more portable + by always using square brackets consistently. + [Masashi Kizaki <[EMAIL PROTECTED]>] PR#5230 *) Fixed ap_config_auto.h generation in src/Configure: there for the ``quad integer'' stuff ``#ifndef+#undef+#endif'' pairs were generated instead of 1.107 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- configure 1999/11/17 19:12:45 1.106 +++ configure 1999/11/28 11:10:52 1.107 @@ -257,7 +257,7 @@ for rule in `grep '^Rule' $src/Configuration.tmpl`; do rule=`echo "$rule" | sed -e 's/^Rule[]*//'` name=`echo "$rule" | sed -e 's/=.*$//'` -namelow=`echo "$name" | tr 'A-Z' 'a-z'` +namelow=`echo "$name" | tr '[A-Z]' '[a-z]'` arg=`echo "$rule" | sed -e 's/^.*=//'` eval "rule_$namelow=$arg" rules="$rules:$namelow"
cvs commit: apache-1.3/src CHANGES Configure
rse 99/11/28 02:55:31 Modified:src CHANGES Configure Log: Fixed ap_config_auto.h generation in src/Configure: there for the ``quad integer'' stuff ``#ifndef+#undef+#endif'' pairs were generated instead of ``#ifdef+#undef+#endif'' pairs. Submitted by: Greg Siebers <[EMAIL PROTECTED]> Reviewed by: Ralf S. Engelschall PR: 5231 Revision ChangesPath 1.1446+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1445 retrieving revision 1.1446 diff -u -r1.1445 -r1.1446 --- CHANGES 1999/11/25 10:49:32 1.1445 +++ CHANGES 1999/11/28 10:55:28 1.1446 @@ -1,4 +1,9 @@ Changes with Apache 1.3.10 + + *) Fixed ap_config_auto.h generation in src/Configure: there for the ``quad + integer'' stuff ``#ifndef+#undef+#endif'' pairs were generated instead of + ``#ifdef+#undef+#endif'' pairs. + [Greg Siebers <[EMAIL PROTECTED]>] PR#5231 *) EBCDIC: fix the hsregex package to correctly deal with [a-zA-Z] type character ranges (the alphabet is non-contiguous in EBCDIC) and with 1.374 +2 -2 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.373 retrieving revision 1.374 diff -u -r1.373 -r1.374 --- Configure 1999/10/27 09:30:19 1.373 +++ Configure 1999/11/28 10:55:28 1.374 @@ -2063,7 +2063,7 @@ else echo "" >>$AP_CONFIG_AUTO_H echo "/* determine: is off_t a quad */" >>$AP_CONFIG_AUTO_H -echo "#ifndef AP_OFF_T_IS_QUAD" >>$AP_CONFIG_AUTO_H +echo "#ifdef AP_OFF_T_IS_QUAD" >>$AP_CONFIG_AUTO_H echo "#undef AP_OFF_T_IS_QUAD" >>$AP_CONFIG_AUTO_H echo "#endif" >>$AP_CONFIG_AUTO_H fi @@ -2085,7 +2085,7 @@ else echo "" >>$AP_CONFIG_AUTO_H echo "/* determine: is void * a quad */" >>$AP_CONFIG_AUTO_H -echo "#ifndef AP_VOID_P_IS_QUAD" >>$AP_CONFIG_AUTO_H +echo "#ifdef AP_VOID_P_IS_QUAD" >>$AP_CONFIG_AUTO_H echo "#undef AP_VOID_P_IS_QUAD" >>$AP_CONFIG_AUTO_H echo "#endif" >>$AP_CONFIG_AUTO_H fi