cvs commit: apache-1.3 STATUS
dgaudet 98/04/15 11:29:26 Modified:.STATUS Log: someone else needs to do this. Revision ChangesPath 1.297 +5 -10 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- STATUS1998/04/15 17:50:22 1.296 +++ STATUS1998/04/15 18:29:25 1.297 @@ -195,6 +195,11 @@ * proxy security fixes from 1.2.5 need to be brought forward +* Someone other than Dean has to do a security/correctness review on + psprintf(), bprintf(), and ap_snprintf(). In particular these routines + do lots of fun pointer manipulations and such and possibly have overflow + errors. The respective flush_funcs also need to be exercised. + Needs patch: * Documentation for: @@ -285,16 +290,6 @@ Randy: I would also argue that 1.3b6 is _not_ stable. I've been having real fits keeping it alive on a dual processor machine. Could be OS problems.. - - * vformatter TODO: -- double check logic in ap_vformatter(), and especially psprintf() -- add in and use the inaddr formatting codes that started the whole - debate last october -- ... so that we can finally start fixing all the log messages that - were previously log_reason(), which included the client address, - but now using aplog_error() they're without the client address, and - that sucks -- bump mmn and make it official (wanna make sure the api is right first) Win32 specific issues:
cvs commit: apache-1.3/src .gdbinit
dgaudet 98/04/15 11:14:39 Modified:src .gdbinit Log: whatever Revision ChangesPath 1.2 +3 -0 apache-1.3/src/.gdbinit Index: .gdbinit === RCS file: /export/home/cvs/apache-1.3/src/.gdbinit,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .gdbinit 1998/01/27 06:02:50 1.1 +++ .gdbinit 1998/04/15 18:14:38 1.2 @@ -1,3 +1,6 @@ +# gdb macros which may be useful for folks using gdb to debug +# apache. Delete it if it bothers you. + define dump_table set $t = (table_entry *)((array_header *)$arg0)->elts set $n = ((array_header *)$arg0)->nelts
cvs commit: apache-devsite how-to-release.html
jim 98/04/15 10:52:35 Modified:.how-to-release.html Log: At least for now, keep .indent.pro and .gdbinit Revision ChangesPath 1.36 +2 -3 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- how-to-release.html 1998/04/15 09:31:26 1.35 +++ how-to-release.html 1998/04/15 17:52:34 1.36 @@ -162,10 +162,9 @@ Remove STATUS, RULES.CVS, HTTP_Features.tsv, src/INDENT, various .cvsignore and - .indent.pro files and the developer's test subdirectories: - $ rm STATUS RULES.CVS HTTP_Features.tsv src/INDENT src/.gdbinit + the developer's test subdirectories: + $ rm STATUS RULES.CVS HTTP_Features.tsv src/INDENT $ find . -name ".cvsignore" -exec rm {} \; - $ find . -name ".indent.pro" -exec rm {} \; $ rm -rf src/test $ rm -rf src/modules/test
cvs commit: apache-1.3 STATUS
jim 98/04/15 10:50:23 Modified:.STATUS Log: Maintain the tradition of betas... Revision ChangesPath 1.296 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- STATUS1998/04/15 17:25:13 1.295 +++ STATUS1998/04/15 17:50:22 1.296 @@ -42,7 +42,7 @@ - Wednesday, April 15: Rolling the 1.3b6 tarball and pushing the version - number to Apache 1.3.0-dev + number to Apache 1.3b7 - Thursday, April 16: Double-checking the rolled 1.3b6 tarball
cvs commit: apache-1.3 STATUS
rse 98/04/15 10:25:14 Modified:.STATUS Log: Update our state Revision ChangesPath 1.295 +3 -7 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- STATUS1998/04/14 02:38:16 1.294 +++ STATUS1998/04/15 17:25:13 1.295 @@ -2,8 +2,8 @@ Release: -1.3b6: freeze; release proposed for Friday, April 17. Need - a RM (if no one volunteers, Jim will do it). +1.3b6: freeze; release proposed for Friday, April 17. + Jim is the RM and rolls the release in the next 24h 1.3b5: Tagged APACHE_1_3b5 and released 2.0 : In pre-alpha development, see apache-2.0 repository @@ -40,11 +40,6 @@ Apache 1.3b6 Release: - - from Saturday, April 11 to Tuesday, April 14: - FINAL TEST PERIOD FOR APACHE 1.3b6 - (no more major code changes, only bugfixes - and documentation enhancements!) - - Wednesday, April 15: Rolling the 1.3b6 tarball and pushing the version number to Apache 1.3.0-dev @@ -180,6 +175,7 @@ * THE BIG SYMBOL RENAMING * Ralf's DSO configuration updates for the UnixWare platform * Ralf's DSO support for the HP/UX platform by emulating dlopen +* Clean up warnings on Ultrix and HPUX. Available Patches:
cvs commit: apache-devsite todo.html project-plan.html
dgaudet 98/04/15 10:15:48 Modified:.todo.html project-plan.html Log: these are out of date Revision ChangesPath 1.4 +12 -0 apache-devsite/todo.html Index: todo.html === RCS file: /export/home/cvs/apache-devsite/todo.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- todo.html 1998/02/12 14:39:24 1.3 +++ todo.html 1998/04/15 17:15:47 1.4 @@ -4,6 +4,18 @@ Apache Bugs List / To Do List / Wish List + +THIS LIST IS COMPLETELY AND UTTERLY OUT OF DATE. But nobody +ever gets around to cleaning it up... because we've got an entirely +different method of tracking these things. The real todo lists are +in STATUS messages regularly posted to the new-httpd mailing list, +and available in the STATUS file in the root of each development +tree (1.2, 1.3, and 2.0). The todo also includes various bugs in +the http://bugs.apache.org/";>bug database. + + +You've been warned! + BUGS 1.4 +7 -0 apache-devsite/project-plan.html Index: project-plan.html === RCS file: /export/home/cvs/apache-devsite/project-plan.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project-plan.html 1998/01/12 14:20:46 1.3 +++ project-plan.html 1998/04/15 17:15:47 1.4 @@ -4,6 +4,13 @@ Apache Server Project Plan + +THIS DOCUMENT IS COMPLETELY AND UTTERLY OUT OF DATE. But nobody +ever gets around to cleaning it up... there is no well defined plan +for apache 1.3 and beyond. + + +You've been warned! This document aims to encapsulate our plans for world domination, uh, I mean, further work on the Apache web server. This is simply a
cvs commit: apache-1.3/src CHANGES Configure
dgaudet 98/04/15 10:10:20 Modified:src CHANGES Configure Log: clean up warnings on hpux 10.01 Submitted by: Ben Hyde Revision ChangesPath 1.769 +1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.768 retrieving revision 1.769 diff -u -r1.768 -r1.769 --- CHANGES 1998/04/15 17:09:25 1.768 +++ CHANGES 1998/04/15 17:10:17 1.769 @@ -1,6 +1,6 @@ Changes with Apache 1.3b6 - *) PORT: Clean up warnings on Ultrix. [Ben Hyde] + *) PORT: Clean up warnings on Ultrix and HPUX. [Ben Hyde] *) Adding DSO support for the HP/UX platform by emulating the dlopen-style interface via the similar but proprietary HP/UX shl_xxx-style system 1.238 +7 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- Configure 1998/04/12 15:49:26 1.237 +++ Configure 1998/04/15 17:10:18 1.238 @@ -341,6 +341,13 @@ *-hp-hpux10.*) OS='HP-UX 10' CFLAGS="$CFLAGS -DHPUX10" + case "$PLAT" in + *-hp-hpux10.01) +# We know this is a problem in 10.01. + # Not a problem in 10.20. Otherwise, who knows? + CFLAGS="$CFLAGS -DSELECT_NEEDS_CAST" + ;; + esac DEF_WANTHSREGEX=yes ;; *-hp-hpux*)
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
dgaudet 98/04/15 10:09:30 Modified:src CHANGES src/include conf.h src/main alloc.c src/modules/proxy proxy_cache.c src/modules/standard mod_autoindex.c Log: clean up warnings on ultrix Submitted by: Ben Hyde Revision ChangesPath 1.768 +2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.767 retrieving revision 1.768 diff -u -r1.767 -r1.768 --- CHANGES 1998/04/12 15:49:25 1.767 +++ CHANGES 1998/04/15 17:09:25 1.768 @@ -1,4 +1,6 @@ Changes with Apache 1.3b6 + + *) PORT: Clean up warnings on Ultrix. [Ben Hyde] *) Adding DSO support for the HP/UX platform by emulating the dlopen-style interface via the similar but proprietary HP/UX shl_xxx-style system 1.201 +6 -0 apache-1.3/src/include/conf.h Index: conf.h === RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- conf.h1998/04/09 08:20:24 1.200 +++ conf.h1998/04/15 17:09:27 1.201 @@ -965,6 +965,12 @@ #define ap_selectselect #endif +#ifdef ULTRIX_BRAIN_DEATH +#define ap_fdopen(d,m) fdopen((d), (char *)(m)) +#else +#define ap_fdopen(d,m) fdopen((d), (m)) +#endif + #ifndef ap_inet_addr #define ap_inet_addr inet_addr #endif 1.88 +6 -6 apache-1.3/src/main/alloc.c Index: alloc.c === RCS file: /export/home/cvs/apache-1.3/src/main/alloc.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- alloc.c 1998/04/11 12:00:28 1.87 +++ alloc.c 1998/04/15 17:09:28 1.88 @@ -1557,7 +1557,7 @@ modeFlags); if (desc >= 0) { desc = ap_slack(desc, AP_SLACK_LOW); - fd = fdopen(desc, mode); + fd = ap_fdopen(desc, mode); } } else { @@ -1575,7 +1575,7 @@ FILE *f; ap_block_alarms(); -f = fdopen(fd, mode); +f = ap_fdopen(fd, mode); if (f != NULL) ap_note_cleanups_for_file(a, f); ap_unblock_alarms(); @@ -1753,7 +1753,7 @@ #define os_pipe(fds) pipe(fds) #endif /* WIN32 */ -/* for fdopen, to get binary mode */ +/* for ap_fdopen, to get binary mode */ #if defined (__EMX__) || defined (WIN32) #define BINMODE "b" #else @@ -1969,7 +1969,7 @@ } if (pipe_out) { - *pipe_out = fdopen(fd_out, "r" BINMODE); + *pipe_out = ap_fdopen(fd_out, "r" BINMODE); if (*pipe_out) ap_note_cleanups_for_file(p, *pipe_out); else @@ -1977,7 +1977,7 @@ } if (pipe_in) { - *pipe_in = fdopen(fd_in, "w" BINMODE); + *pipe_in = ap_fdopen(fd_in, "w" BINMODE); if (*pipe_in) ap_note_cleanups_for_file(p, *pipe_in); else @@ -1985,7 +1985,7 @@ } if (pipe_err) { - *pipe_err = fdopen(fd_err, "r" BINMODE); + *pipe_err = ap_fdopen(fd_err, "r" BINMODE); if (*pipe_err) ap_note_cleanups_for_file(p, *pipe_err); else 1.37 +3 -0 apache-1.3/src/modules/proxy/proxy_cache.c Index: proxy_cache.c === RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- proxy_cache.c 1998/04/11 12:00:39 1.36 +++ proxy_cache.c 1998/04/15 17:09:29 1.37 @@ -636,6 +636,9 @@ int ap_proxy_cache_update(struct cache_req *c, array_header *resp_hdrs, const int is_HTTP1, int nocache) { +#ifdef ULTRIX_BRAIN_DEATH + extern char *mktemp(char *template); +#endif request_rec *r = c->req; char *p; int i; 1.75 +0 -4 apache-1.3/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- mod_autoindex.c 1998/04/13 18:05:15 1.74 +++ mod_autoindex.c 1998/04/15 17:09:29 1.75 @@ -1113,12 +1113,8 @@ p = p->next; } -#ifdef ULTRIX_BRAIN_DEATH - qsort((void *) ar, num_ent, sizeof(struct ent *), (int (*)) dsortf); -#else qsort((void *) ar, num_ent, sizeof(struct ent *), (int (*)(const void *, const void *)) dsortf); -#endif } output_directories(ar, num_ent, autoindex_con
cvs commit: apache-1.3 Announcement
jim 98/04/15 09:18:02 Modified:.Announcement Log: Some reformating and changing the - to o (- looks so negative :) ) Revision ChangesPath 1.15 +22 -23apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Announcement 1998/04/15 08:30:19 1.14 +++ Announcement 1998/04/15 16:18:00 1.15 @@ -4,20 +4,19 @@ The Apache Group is pleased to announce the release of the 1.3b6 version of Apache, the latest beta release of the Apache HTTP server. 1.3b6 is - a release candidate for Apache 1.3.0; This version is stable under UNIX - but remains beta-level under Win32. No new features are expected between - 1.3b6 and 1.3.0, so please give this version a good thrashing in order - to provide as much feedback as possible to the Apache Group before the - release of 1.3.0. + a release candidate for Apache 1.3.0. + + This version is stable under UNIX but remains beta-level under Win32. No + new features are expected between 1.3b6 and 1.3.0, so please give this + version a good thrashing in order to provide as much feedback as possible + to the Apache Group before the release of 1.3.0. Apache has been the most popular web server on the Internet since April of 1996. The Web Server Survey by Netcraft (http://www.netcraft.co.uk/Survey/) found that more web servers were using Apache than any other software. Apache and its derivatives are run on over 50% of all web domains on the Internet. - The Apache project has been organized in an attempt to answer some of the - concerns regarding active development of a public domain HTTP server for - Unix. The goal of this project is to provide an open-source, secure, + The Apache project has been organized to provide an open-source, secure, efficient and extensible server which provides HTTP services in sync with the current HTTP standards. For more information about the Apache project check out http://www.apache.org/. @@ -33,10 +32,10 @@ is a short summary of all major changes between Apache 1.2 and 1.3 (changes which are new with version 1.3b6 are tagged '+'): - - Ported to Windows 95/NT + o Ported to Windows 95/NT http://www.apache.org/dist/apache-1.3b6/htdocs/manual/windows http://www.apache.org/dist/apache-1.3b6/README.NT - - Ported to BS2000/OSD, a mainframe OS with EBCDIC charset + o Ported to BS2000/OSD, a mainframe OS with EBCDIC charset http://www.apache.org/dist/apache-1.3b6/htdocs/manual/ebcdic + Apache Autoconf-style Interface (APACI) for out-of-the-box installation http://www.apache.org/dist/apache-1.3b6/README.configure @@ -50,37 +49,37 @@ http://www.apache.org/dist/apache-1.3b6/src/support/ + Enhanced configuration support: Include and Line-Continuation http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1_3 - - New `Magic' MIME-typing module for content type guessing + o New `Magic' MIME-typing module for content type guessing http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_mime_magic - - Regular Expression support for Alias and Redirect directives + o Regular Expression support for Alias and Redirect directives http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_alias + Overhauled and enhanced URL Rewriting Engine http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_rewrite - - Spell-checking module for on-the-fly URL corrections + o Spell-checking module for on-the-fly URL corrections http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_speling - - Additional access control via CIDR and Netmasks + o Additional access control via CIDR and Netmasks http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_access - - Improved HTTP/1.1-style Virtual Host support + o Improved HTTP/1.1-style Virtual Host support http://www.apache.org/dist/apache-1.3b6/htdocs/manual/vhost/index - - Less Buffering of CGI Script Output (makes nph- obsolete) + o Less Buffering of CGI Script Output (makes nph- obsolete) http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1_3 + Various Proxy Enhancements (NoProxy, ProxyDomain, ProxyPassReverse) http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_proxy - - Various internal performance improvements + o Various internal performance improvements http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1_3 - - Various fixes to the hostname DNS lookup handling + o Various fixes to the hostname DNS lookup handling http://www.apache.org/d
cvs commit: apache-1.3/htdocs/manual/misc perf.html
martin 98/04/15 05:21:46 Modified:htdocs/manual/misc perf.html Log: Add notice about some inefficient SVR4 implementations of time zones in gettimeofday() Revision ChangesPath 1.20 +49 -0 apache-1.3/htdocs/manual/misc/perf.html Index: perf.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/perf.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -u -r1.19 -r1.20 --- perf.html 1998/02/05 20:04:30 1.19 +++ perf.html 1998/04/15 12:21:45 1.20 @@ -30,6 +30,7 @@ Linux Solaris SunOS 4.x +SVR4 @@ -117,6 +118,54 @@ More information on tuning SOMAXCONN on SunOS can be found at http://www.islandnet.com/~mark/somaxconn.html";> http://www.islandnet.com/~mark/somaxconn.html. + + + + +SVR4 + + +Some SVR4 versions waste three system calls on every +gettimeofday() call. Depending on the syntactic +form of the TZ environment variable, these +systems have several different algorithms to determine the +local time zone (presumably compatible with +something). The following example uses the central european +time zone to demonstrate this: + + TZ=:MET + This form delegates the knowledge of the time zone + information to an external compiled zoneinfo file + (à la BSD). + Caveat: Each time the gettimeofday() + function is called, the external zone info is read in + again (at least on some SVR4 systems). That results in + three wasted system calls with every apache request + served. + open("/usr/lib/locale/TZ/MET", O_RDONLY) = 3 + read(3, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 7944) = 778 + close(3)= 0 + + TZ=MET-1MDT,M3.5.0/02:00:00,M10.5.0/03:00:00 + This syntax form (à la SYSV) contains all the + knowledge about time zone beginning and ending times in + its external representation. It has to be parsed each + time it is evaluated, resulting in a slight computing + overhead, but it requires no system call. Though the + table lookup à la BSD is the more sophisticated + technical solution, the bad SVR4 implementation makes + this the preferred syntax on systems which otherwise + access the external zone info file repeatedly. + +You should use the truss utility on a +single-process apache server (started with the -X +debugging switch) to determine whether your system can profit +from the second form of the TZ environment +variable. If it does, you could integrate the setting of the +preferred TZ syntax into the httpd startup +script, which is usually simply a copy of (or symbolic link +to) the apachectl utility script, or into the +system's /etc/TIMEZONE script.
cvs commit: apache-1.3 configure
rse 98/04/15 03:03:47 Modified:.configure Log: Last minute fix: Be even more friendly and conservative: Only append the "/apache" prefix to installation paths when the PREFIX does not contain it _AND_ the user didn't customize it via explicit options. Revision ChangesPath 1.10 +16 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure 1998/04/15 06:23:08 1.9 +++ configure 1998/04/15 10:03:46 1.10 @@ -141,6 +141,13 @@ localstatesubdir_logs='logs' includedir='$prefix/include' +# customization flags for +# automatic "apache" suffix +customized_sysconfdir=0 +customized_datadir=0 +customized_localstatedir=0 +customized_includedir=0 + # check and debug layout=0 @@ -324,15 +331,19 @@ ;; --sysconfdir=*) sysconfdir="$apc_optarg" +customized_sysconfdir=1 ;; --datadir=*) datadir="$apc_optarg" +customized_datadir=1 ;; --localstatedir=*) localstatedir="$apc_optarg" +customized_localstatedir=1 ;; --includedir=*) includedir="$apc_optarg" +customized_includedir=1 ;; --compat) prefix='/usr/local/apache' @@ -600,7 +611,11 @@ eval "val=\$$var" case $val in *apache | *apache* ) ;; - * ) eval "$var=\$$var/apache" ;; + * ) eval "customized=\$customized_$var" + if [ ".$customized" = .0 ]; then + eval "$var=\$$var/apache" + fi + ;; esac ;; esac
cvs commit: apache-1.3/src/support apxs.pl
rse 98/04/15 02:46:58 Modified:src/support apxs.pl Log: Final cosmetics: Create LoadModule lines with same style as APACI's "make install" target. Revision ChangesPath 1.4 +1 -1 apache-1.3/src/support/apxs.pl Index: apxs.pl === RCS file: /export/home/cvs/apache-1.3/src/support/apxs.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- apxs.pl 1998/04/03 13:29:07 1.3 +++ apxs.pl 1998/04/15 09:46:57 1.4 @@ -410,7 +410,7 @@ my $dir = $CFG_LIBEXECDIR; $dir =~ s|^$CFG_PREFIX/?||; $dir =~ s|(.)$|$1/|; -push(@lmd, "LoadModule ${name}_module $dir$t"); +push(@lmd, sprintf("LoadModule %-18s %s", "${name}_module", "$dir$t")); } # execute the commands
cvs commit: apache-devsite how-to-release.html
rse 98/04/15 02:31:27 Modified:.how-to-release.html Log: Remove another dotfile which need not be distributed: src/.gdbinit Revision ChangesPath 1.35 +1 -1 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- how-to-release.html 1998/04/15 07:05:00 1.34 +++ how-to-release.html 1998/04/15 09:31:26 1.35 @@ -163,7 +163,7 @@ Remove STATUS, RULES.CVS, HTTP_Features.tsv, src/INDENT, various .cvsignore and .indent.pro files and the developer's test subdirectories: - $ rm STATUS RULES.CVS HTTP_Features.tsv src/INDENT + $ rm STATUS RULES.CVS HTTP_Features.tsv src/INDENT src/.gdbinit $ find . -name ".cvsignore" -exec rm {} \; $ find . -name ".indent.pro" -exec rm {} \; $ rm -rf src/test
cvs commit: apache-1.3/htdocs/manual/misc API.html
martin 98/04/15 01:50:37 Modified:htdocs/manual/misc API.html Log: Oops: csubst missed a couple of old names. Revision ChangesPath 1.14 +45 -45apache-1.3/htdocs/manual/misc/API.html Index: API.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/API.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -u -r1.13 -r1.14 --- API.html 1998/04/15 08:31:24 1.13 +++ API.html 1998/04/15 08:50:37 1.14 @@ -240,10 +240,10 @@ response (which modules can add to at will), and environment variables for any subprocesses which are spawned off in the course of servicing the request. These tables are manipulated using the -table_get and table_set routines. +ap_table_get and ap_table_set routines. Note that the Content-type header value cannot be - set by module content-handlers using the table_*() + set by module content-handlers using the ap_table_*() routines. Rather, it is set by pointing the content_type field in the request_rec structure to an appropriate string. E.g., @@ -397,7 +397,7 @@ response handlers have to actually send a request back to the client. They should begin by sending an HTTP response header, using the -function send_http_header. (You don't have to do +function ap_send_http_header. (You don't have to do anything special to skip sending the header for HTTP/0.9 requests; the function figures out on its own that it shouldn't do anything). If the request is marked header_only, that's all they should @@ -414,11 +414,11 @@ of code, which is the handler which handles GET requests which have no more specific handler; it also shows how conditional GETs can be handled, if it's desirable to do so in a -particular response handler --- set_last_modified checks +particular response handler --- ap_set_last_modified checks against the If-modified-since value supplied by the client, if any, and returns an appropriate code (which will, if nonzero, be USE_LOCAL_COPY). No similar considerations apply for -set_content_length, but it returns an error code for +ap_set_content_length, but it returns an error code for symmetry. @@ -430,8 +430,8 @@ if (r->method_number != M_GET) return DECLINED; if (r->finfo.st_mode == 0) return NOT_FOUND; -if ((errstatus = set_content_length (r, r->finfo.st_size)) -|| (errstatus = set_last_modified (r, r->finfo.st_mtime))) +if ((errstatus = ap_set_content_length (r, r->finfo.st_size)) + || (errstatus = ap_set_last_modified (r, r->finfo.st_mtime))) return errstatus; f = fopen (r->filename, "r"); @@ -443,10 +443,10 @@ } register_timeout ("send", r); -send_http_header (r); +ap_send_http_header (r); if (!r->header_only) send_fd (f, r); -pfclose (r->pool, f); +ap_pfclose (r->pool, f); return OK; } @@ -456,11 +456,11 @@ has not yet produced any output can simply return an error code, in which case the server will automatically produce an error response. Secondly, it can punt to some other handler by invoking -internal_redirect, which is how the internal redirection +ap_internal_redirect, which is how the internal redirection machinery discussed above is invoked. A response handler which has internally redirected should always return OK. -(Invoking internal_redirect from handlers which are +(Invoking ap_internal_redirect from handlers which are not response handlers will lead to serious confusion). Special considerations for authentication handlers @@ -471,12 +471,12 @@ Authentication-phase handlers not invoked unless auth is configured for the directory. Common auth configuration stored in the core per-dir - configuration; it has accessors auth_type, - auth_name, and requires. + configuration; it has accessors ap_auth_type, + ap_auth_name, and ap_requires. Common routines, to handle the protocol end of things, at least - for HTTP basic authentication (get_basic_auth_pw, + for HTTP basic authentication (ap_get_basic_auth_pw, which sets the connection->user structure field - automatically, and note_basic_auth_failure, which + automatically, and ap_note_basic_auth_failure, which arranges for the proper WWW-Authenticate: header to be sent back). @@ -537,7 +537,7 @@ documented here). However, there are two benefits to using it: resources allocated to a pool never leak (even if you allocate a scratch string, and just forget about it); also, for memory -allocation, palloc is generally faster than +allocation, ap_palloc is generally faster than malloc. We begin here by describing how memory is allocated to pools, and then
cvs commit: apache-1.3/htdocs/manual/misc client_block_api.html API.html
martin 98/04/15 01:31:25 Modified:htdocs/manual/misc client_block_api.html API.html Log: Document renamed functions instead of old names Revision ChangesPath 1.10 +6 -6 apache-1.3/htdocs/manual/misc/client_block_api.html Index: client_block_api.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/client_block_api.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -u -r1.9 -r1.10 --- client_block_api.html 1998/02/05 20:04:28 1.9 +++ client_block_api.html 1998/04/15 08:31:23 1.10 @@ -33,13 +33,13 @@ The New API Functions - int setup_client_block (request_rec *, int read_policy); - int should_client_block (request_rec *); - long get_client_block (request_rec *, char *buffer, int buffer_size); + int ap_setup_client_block (request_rec *, int read_policy); + int ap_should_client_block (request_rec *); + long ap_get_client_block (request_rec *, char *buffer, int buffer_size); -Call setup_client_block() near the beginning of the request +Call ap_setup_client_block() near the beginning of the request handler. This will set up all the necessary properties, and will return either OK, or an error code. If the latter, the module should return that error code. The second parameter @@ -58,7 +58,7 @@ When you are ready to possibly accept input, call -should_client_block(). +ap_should_client_block(). This will tell the module whether or not to read input. If it is 0, the module should assume that the input is of a non-entity type (e.g. a GET request). A nonzero response indicates that the module @@ -68,7 +68,7 @@ is *definitely* ready to read content. (otherwise, the point of the 100 response is defeated). Never call this function more than once. -Finally, call get_client_block in a loop. Pass it a +Finally, call ap_get_client_block in a loop. Pass it a buffer and its size. It will put data into the buffer (not necessarily the full buffer, in the case of chunked inputs), and return the length of 1.13 +21 -21apache-1.3/htdocs/manual/misc/API.html Index: API.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/API.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -u -r1.12 -r1.13 --- API.html 1998/02/05 20:04:27 1.12 +++ API.html 1998/04/15 08:31:24 1.13 @@ -357,8 +357,8 @@ order to figure out what icon to use. Such handlers can construct a sub-request, using the - functions sub_req_lookup_file and - sub_req_lookup_uri; this constructs a new + functions ap_sub_req_lookup_file and + ap_sub_req_lookup_uri; this constructs a new request_rec structure and processes it as you would expect, up to but not including the point of actually sending a response. (These functions skip over the access @@ -405,9 +405,9 @@ output. Otherwise, they should produce a request body which responds to the -client as appropriate. The primitives for this are rputc -and rprintf, for internally generated output, and -send_fd, to copy the contents of some FILE * +client as appropriate. The primitives for this are ap_rputc +and ap_rprintf, for internally generated output, and +ap_send_fd, to copy the contents of some FILE * straight to the client. At this point, you should more or less understand the following piece @@ -530,7 +530,7 @@ obligatory, except for situations like logging handlers, where you really need to register cleanups to make sure that the log file gets closed when the server restarts (this is most easily done by using the -function pfopen, which also +function ap_pfopen, which also arranges for the underlying file descriptor to be closed before any child processes, such as for CGI scripts, are execed), or in case you are using the timeout machinery (which isn't yet even @@ -772,17 +772,17 @@ pool if necessary). For the MIME module, the per-dir config creation function just -pallocs the structure above, and a creates a couple of +ap_pallocs the structure above, and a creates a couple of tables to fill it. That looks like this: void *create_mime_dir_config (pool *p, char *dummy) { mime_dir_config *new = - (mime_dir_config *) palloc (p, sizeof(mime_dir_config)); + (mime_dir_config *) ap_palloc (p, sizeof(mime_dir_config)); -new->forced_types = make_table (p, 4); -new->encoding_types = make_table (p, 4); +new->forced_types = ap_make_table (p, 4); +new->encoding_types = ap_make_table (p, 4); return new; } @@ -846,7 +846,7 @@ char *add_type(cmd_
cvs commit: apache-1.3 Announcement
martin 98/04/15 01:30:19 Modified:.Announcement Log: Correct typos, change EBCDIC link to HTML version Revision ChangesPath 1.14 +5 -5 apache-1.3/Announcement Index: Announcement === RCS file: /home/cvs/apache-1.3/Announcement,v retrieving revision 1.13 retrieving revision 1.14 diff -u -u -r1.13 -r1.14 --- Announcement 1998/04/15 06:16:56 1.13 +++ Announcement 1998/04/15 08:30:19 1.14 @@ -37,7 +37,7 @@ http://www.apache.org/dist/apache-1.3b6/htdocs/manual/windows http://www.apache.org/dist/apache-1.3b6/README.NT - Ported to BS2000/OSD, a mainframe OS with EBCDIC charset - http://www.apache.org/dist/apache-1.3b6/src/README.EBCDIC + http://www.apache.org/dist/apache-1.3b6/htdocs/manual/ebcdic + Apache Autoconf-style Interface (APACI) for out-of-the-box installation http://www.apache.org/dist/apache-1.3b6/README.configure http://www.apache.org/dist/apache-1.3b6/INSTALL @@ -49,7 +49,7 @@ + Additional support tools: apachectl, ab (ApacheBench), dbmmanage http://www.apache.org/dist/apache-1.3b6/src/support/ + Enhanced configuration support: Include and Line-Continuation - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1.3 + http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1_3 - New `Magic' MIME-typing module for content type guessing http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_mime_magic - Regular Expression support for Alias and Redirect directives @@ -63,11 +63,11 @@ - Improved HTTP/1.1-style Virtual Host support http://www.apache.org/dist/apache-1.3b6/htdocs/manual/vhost/index - Less Buffering of CGI Script Output (makes nph- obsolete) - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1.3 + http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1_3 + Various Proxy Enhancements (NoProxy, ProxyDomain, ProxyPassReverse) http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_proxy - Various internal performance improvements - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1.3 + http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1_3 - Various fixes to the hostname DNS lookup handling http://www.apache.org/dist/apache-1.3b6/htdocs/mod/core#hostnamelookups - Various Directory Indexing enhancements @@ -82,5 +82,5 @@ + Big Symbol Renaming to avoid symbol clashes with third-party code http://www.apache.org/dist/apache-1.3b6/htdocs/manual/sourcereorg - API Additions - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1.3 + http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1_3
cvs commit: apache-devsite how-to-release.html
rse 98/04/15 00:05:01 Modified:.how-to-release.html Log: Don't distribute .indent.pro files: they are out-of-date and there is no need for the user to indent some of the distributed code theirself. Revision ChangesPath 1.34 +3 -2 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- how-to-release.html 1998/04/14 18:54:33 1.33 +++ how-to-release.html 1998/04/15 07:05:00 1.34 @@ -161,10 +161,11 @@ $ cp src/Configuration.tmpl src/Configuration Remove STATUS, RULES.CVS, HTTP_Features.tsv, - src/INDENT, various .cvsignore files - and the developer's test subdirectories: + src/INDENT, various .cvsignore and + .indent.pro files and the developer's test subdirectories: $ rm STATUS RULES.CVS HTTP_Features.tsv src/INDENT $ find . -name ".cvsignore" -exec rm {} \; + $ find . -name ".indent.pro" -exec rm {} \; $ rm -rf src/test $ rm -rf src/modules/test
cvs commit: apache-1.3 INSTALL
rse 98/04/14 23:51:28 Modified:.INSTALL Log: Make the example less shocking and remove reference to [EMAIL PROTECTED] to avoid flooding this address with mails from idots. Revision ChangesPath 1.11 +7 -16 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- INSTALL 1998/04/15 06:23:08 1.10 +++ INSTALL 1998/04/15 06:51:27 1.11 @@ -115,17 +115,12 @@ of other options available for your pleasure. For a short impression of what possibilities you have, here is a typical - example which compiles Apache with a particular compiler (Pentium- - optimized GCC), a statically compiled mod_auth_db module and the two - additional modules mod_rewrite and mod_proxy for later loading through - the DSO mechanism: - - $ CC="pgcc" OPTIM="-O6 -fstrength-reduce" \ - INCLUDES="-I/usr/local/db-1.85/include" \ -LDFLAGS="-L/usr/local/db-1.85/lib" LIBS="-ldb" \ - ./configure --verbose \ - --prefix=/usr/local/apache \ - --enable-module=auth_db \ + example which compiles Apache for the installation tree /sw/pkg/apache + with a particular compiler and flags plus the two additional modules + mod_rewrite and mod_proxy for later loading through the DSO mechanism: + + $ CC="pgcc" OPTIM="-O6" \ + ./configure --prefix=/sw/pkg/apache \ --enable-module=rewrite --enable-shared=rewrite \ --enable-module=proxy --enable-shared=proxy @@ -331,16 +326,12 @@ one of the companies and contractors which are listed at http://www.apache.org/info/support.cgi - o If you have any feedback, ideas or suggestions for the Apache server - please contact the Apache Group via E-mail at - [EMAIL PROTECTED] - o If you have a concrete bug report for Apache please go to the Apache Group Bug Database and submit your report: http://bugs.apache.org/ o If you want to participate in actively developing Apache please - subscribe to the new-httpd mailing list as described at + subscribe to the `new-httpd' mailing list as described at http://dev.apache.org/mailing-lists Thanks for running Apache.
cvs commit: apache-1.3 INSTALL configure
rse 98/04/14 23:23:09 Modified:.INSTALL configure Log: Make /usr/local/apache again the default installation PREFIX, even when this violates the GNU standards for "configure" scripts. But this way idiots who just use the defaults (i.e. not even use --prefix) do not get their /usr/local bristled with Apache files. We now have as the default the following directory layout: :> ./configure --layout Configuring for Apache, Version 1.3b6-dev Installation paths: prefix: /usr/local/apache exec_prefix: /usr/local/apache bindir: /usr/local/apache/bin sbindir: /usr/local/apache/sbin libexecdir: /usr/local/apache/libexec mandir: /usr/local/apache/man sysconfdir: /usr/local/apache/etc datadir: /usr/local/apache/share localstatedir: /usr/local/apache/var includedir: /usr/local/apache/include Compilation paths: HTTPD_ROOT: /usr/local/apache SUEXEC_BIN: /usr/local/apache/sbin/suexec SHARED_CORE_DIR: /usr/local/apache/libexec DEFAULT_PIDLOG: var/run/httpd.pid DEFAULT_SCOREBOARD: var/run/httpd.scoreboard DEFAULT_LOCKFILE: var/run/httpd.lock DEFAULT_XFERLOG: var/logs/access_log DEFAULT_ERRORLOG: var/logs/error_log TYPES_CONFIG_FILE: etc/mime.types SERVER_CONFIG_FILE: etc/httpd.conf ACCESS_CONFIG_FILE: etc/access.conf RESOURCE_CONFIG_FILE: etc/srm.conf Revision ChangesPath 1.10 +1 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- INSTALL 1998/04/14 19:15:43 1.9 +++ INSTALL 1998/04/15 06:23:08 1.10 @@ -162,7 +162,7 @@ Use the --prefix=PREFIX and --exec-prefix=EPREFIX options to configure Apache to use a particular installation prefix. The default is - PREFIX=/usr/local and EPREFIX=PREFIX. + PREFIX=/usr/local/apache and EPREFIX=PREFIX. Use the --bindir=DIR, --sbindir=DIR, --libexecdir=DIR, --mandir=DIR, --sysconfdir=DIR, --datadir=DIR and --localstatedir=DIR option to change 1.9 +1 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure 1998/04/14 19:08:09 1.8 +++ configure 1998/04/15 06:23:08 1.9 @@ -128,7 +128,7 @@ ## # default paths -prefix='/usr/local' +prefix='/usr/local/apache' exec_prefix='$prefix' bindir='$exec_prefix/bin' sbindir='$exec_prefix/sbin'
cvs commit: apache-1.3 Announcement
rse 98/04/14 23:16:57 Modified:.Announcement Log: Ok, we now have to edit the Announcement in the CVS or we never get finished. This is my second cut of the Announcement: - based on my first version - merged in text changes of Jim's version but keep the "+/-" style because I really think it's better and more quickly to read then appended asterisks - replaced relative filenames with real URLs to make the users even more happy, but trimmed the URLs to fit into 80 cols via taz's Multiview. (BTW: We additionally could apply a s:dist/apache-1.3b6/htdocs/manual:docs:g Comments or votes?) Revision ChangesPath 1.13 +84 -60apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Announcement 1998/04/11 20:18:24 1.12 +++ Announcement 1998/04/15 06:16:56 1.13 @@ -1,62 +1,86 @@ -Apache 1.3beta6 Released - -The Apache Group is pleased to announce the release of the 1.3b6 version -of Apache, the latest beta release of the Apache web server. + Apache 1.3 Beta 6 Released + == -Apache 1.3 offers numerous enhancements, improvements and performance -boosts over the 1.2 code base. The most visible and noteworthy addition -is the ability to run Apache under Windows 95 and NT (known as the -``Win32'' port). - -Apache 1.3b6 under both Win32 and UNIX has undergone extensive testing, and is -much improved over the previous 1.3b5 release. We feel confident that the -Win32 port is ready for a wider audience, and with that in mind, we are -providing pre-compiled executables for the Win32 platform, as well as a true -Win32 environment Installer (InstallShield). This is, however, still a beta -release and there are known issues that will be fixed before the final 1.3 -release. The UNIX side is already stable now. - -As a premiere, this version of Apache comes with the new Apache Autoconf-style -Interface (APACI) for out-of-the-box building and installing the complete -Apache package. Actually APACI provides the commonly known and expected -"configure" interface to the old Apache source configuration scripts. It is -able to batch-control any existing Apache configuration options (usually -specified manually in src/Configuration) and provides some additional features -like on-the-fly adding third-party modules to the build process or configuring -and installing the suEXEC mechanism. - -Additionally this Apache version the first time provides greatly improved -support for loading Apache modules through dynamic shared object (DSO) files -under runtime through the improved mod_so. Apache currently supports this -feature under Linux, FreeBSD, Solaris, SunOS, IRIX, OSF1 and UnixWare. -Actually all distributed Apache modules now can be build and installed as -shared objects by individually enabling DSO for them via APACI's ---enable-shared option. For building third-party modules outside the Apache -source tree a new support tool named `apxs' is provided which hides the -platform-dependend DSO-build mechanism and automates the installation and -activation of those DSO files. - -Finally, this version of Apache attempts to protect against namespace -collisions by prefacing ``external'' functions, including API functions, -with the ap_ prefix. If you have or use an external module, the module -will need to be updated and/or recompiled in order to use the new -function names. - -Please be sure to read the CHANGES file and the "New Features with Apache -1.3" document (at http://www.apache.org/docs/new_features_1_3.html). -This is particularly important if you are using non-IP based virtual hosts. - -Apache has been the most popular web server on the Internet since April -of 1996. The September 1997 WWW server site survey by Netcraft (see: -http://www.netcraft.co.uk/Survey/) found that more web servers were -using Apache than any other software. Apache and its derivatives are run -on over 50% of all web domains on the Internet. - -The Apache project has been organized in an attempt to answer some of -the concerns regarding active development of a public domain HTTP server -for UNIX. The goal of this project is to provide a secure, efficient and -extensible server which provides HTTP services in sync with the current -HTTP standards. - -For more information, please check out http://www.apache.org/ + The Apache Group is pleased to announce the release of the 1.3b6 version + of Apache, the latest beta release of the Apache HTTP server. 1.3b6 is + a release candidate for Apache 1.3.0; This version is stable under UNIX + but remains beta-leve