cvs commit: apache-devsite API-dict.html
jim 98/04/07 18:18:08 Modified:.API-dict.html Log: Add some already hidden APIs Revision ChangesPath 1.2 +84 -0 apache-devsite/API-dict.html Index: API-dict.html === RCS file: /export/home/cvs/apache-devsite/API-dict.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- API-dict.html 1998/04/08 00:35:08 1.1 +++ API-dict.html 1998/04/08 01:18:02 1.2 @@ -44,6 +44,13 @@ definition/description + acquire_mutex + + + +definition/description + + add_cgi_vars @@ -94,6 +101,83 @@ allow_overrides + + + +definition/description + + + ap_cpystrn + + + +definition/description + + + ap_escape_quotes + + + +definition/description + + + ap_md5 + + + +definition/description + + + ap_md5contextTo64 + + + +definition/description + + + ap_md5digest + + + +definition/description + + + ap_snprintf + + + +definition/description + + + ap_vformatter + + + +definition/description + + + ap_vsnprintf + + + +definition/description + + + apapi_get_server_built + + + +definition/description + + + apapi_get_server_version + + + +definition/description + + + aplog_error
cvs commit: apache-1.3 STATUS
jim 98/04/08 09:36:28 Modified:.STATUS Log: Revision ChangesPath 1.280 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- STATUS1998/04/08 16:08:09 1.279 +++ STATUS1998/04/08 16:36:27 1.280 @@ -264,7 +264,7 @@ 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. - +1: Roy, Ralf, Jim + +1: Roy, Ralf 0: Marc NOTES:
cvs commit: apache-site/contributors index.html
jim 98/04/08 19:27:29 Modified:contributors index.html Log: Just in case people take stuff on face value... I generally don't like blowing my own horn, but maybe it might be needed for a bit :) Revision ChangesPath 1.32 +4 -2 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- index.html1998/03/31 16:06:09 1.31 +++ index.html1998/04/09 02:27:28 1.32 @@ -272,8 +272,10 @@ Occupation: ISP and Engineer Location: Baltimore Maryland, USA OS Expertise: A/UX and various SysV flavors -Contributions: A/UX port, addition of SysV shared - memory support for the scoreboard and various fixes/hacks. +Contributions: A/UX port, SysV shared memory support, flock mutexes, + several mod_status updates, ap_cpystrn and ap_snprintf (mostly + porting the Xinetd version), loads of Configuration stuff + and various fixes/hacks. General porter, coder and trouble maker.
cvs commit: apache-site/contributors index.html
jim 98/04/09 01:47:32 Modified:contributors index.html Log: Add the fact that I've been handling RM with letting the list get stupidly long Revision ChangesPath 1.33 +2 -3 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- index.html1998/04/09 02:27:28 1.32 +++ index.html1998/04/09 08:47:30 1.33 @@ -273,9 +273,8 @@ Location: Baltimore Maryland, USA OS Expertise: A/UX and various SysV flavors Contributions: A/UX port, SysV shared memory support, flock mutexes, - several mod_status updates, ap_cpystrn and ap_snprintf (mostly - porting the Xinetd version), loads of Configuration stuff - and various fixes/hacks. + several mod_status updates, loads of Configuration stuff, + various fixes/hacks and lately coordinating the Releases. General porter, coder and trouble maker.
cvs commit: apache-1.3/src/helpers TestCompile
jim 98/04/11 07:30:33 Modified:src Configure src/helpers TestCompile Log: Submitted by: Jim Jagielski Have TestCompile use PrintPath to get around those platforms that still create executables with link errors. In those cases, the binary exists but isn't executable, so testing -f isn't good enough. However, -x isn't portable :/ PrintPath handles this, so we use that. Revision ChangesPath 1.235 +6 -4 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- Configure 1998/04/11 12:00:15 1.234 +++ Configure 1998/04/11 14:30:32 1.235 @@ -251,9 +251,10 @@ TARGET="httpd" SUBTARGET="target_static" SHLIB_SUFFIX_LIST="" -PRINTPATH=PrintPath +AP_PRINTPATH=PrintPath +export AP_PRINTPATH CAT="cat" -if ./helpers/$PRINTPATH -s ranlib; then +if ./helpers/$AP_PRINTPATH -s ranlib; then RANLIB="ranlib" else RANLIB="true" @@ -330,7 +331,8 @@ LIBS="$LIBS -lsocket -lufc -lbsd" DBM_LIB="-lgdbm" SHELL=sh - PRINTPATH=PrintPathOS2 + AP_PRINTPATH=PrintPathOS2 + export AP_PRINTPATH ;; *-hi-hiux) OS='HI-UX' @@ -695,7 +697,7 @@ for compilers in "gcc" "cc" "acc" "c89" do lookedfor="$lookedfor $compilers" - if ./helpers/$PRINTPATH -s $compilers; then + if ./helpers/$AP_PRINTPATH -s $compilers; then COMPILER="$compilers" break fi 1.10 +12 -3 apache-1.3/src/helpers/TestCompile Index: TestCompile === RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- TestCompile 1998/03/05 12:42:30 1.9 +++ TestCompile 1998/04/11 14:30:33 1.10 @@ -120,8 +120,17 @@ # Now run that Makefile eval "make $TARGET >/dev/null $ERRDIR" -# And see if dummy exists, if so, then we assume the -# condition we are testing for is good -if [ -f $TARGET ]; then +# And see if dummy exists and is executable, if so, then we +# assume the condition we are testing for is good +# +# Use our PrintPath helper script, knowing that we have +# 2 versions of it though... Configure should set AP_PRINTPATH +# but if not, just assume we use our "generic" version +if [ "x$AP_PRINTPATH" = "x" ] ; then +AP_PRINTPATH=PrintPath +fi + +TESTTARG=`PATH=".:$PATH" ./$AP_PRINTPATH $TARGET` +if [ "x$TESTTARG" = "x./$TARGET" ] ; then exstat=0 fi
cvs commit: apache-1.3/src/helpers PrintPath PrintPathOS2 TestCompile
jim 98/04/11 08:46:00 Modified:src/helpers PrintPath PrintPathOS2 TestCompile Log: Submitted by: Jim Jagielski Hmmm... well, it looks like some people would like the capability of having PrintPath look not only in PATH for an executable (makes sense) so I've allowed PrintPath to look somewhere else. With this, TestCompile becomes a bit simpler, and faster when TestCompile fails since it now longer needs to muck around with the whole PATH. Revision ChangesPath 1.10 +8 -3 apache-1.3/src/helpers/PrintPath Index: PrintPath === RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- PrintPath 1997/01/30 00:07:54 1.9 +++ PrintPath 1998/04/11 15:45:59 1.10 @@ -1,6 +1,7 @@ #!/bin/sh -# Look for $1 somewhere in $PATH -# will print out the full pathname unless +# Look for $1 somewhere in $PATH. As an extra bonus, +# if $AP_PPSEARCHPATH is set, this will look for $i +# in there instead. Will print out the full pathname unless # called with the '-s' option # # We do some funny stuff to check to see @@ -29,7 +30,11 @@ echo="yes" fi -for path in `echo $PATH | +if [ "x$AP_PPSEARCHPATH" = "x" ] ; then +AP_PPSEARCHPATH=$PATH +fi + +for path in `echo $AP_PPSEARCHPATH | sed 's/^:/.:/ s/::/:.:/g s/:$/:./ 1.3 +8 -3 apache-1.3/src/helpers/PrintPathOS2 Index: PrintPathOS2 === RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPathOS2,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PrintPathOS2 1997/11/06 21:59:36 1.2 +++ PrintPathOS2 1998/04/11 15:45:59 1.3 @@ -1,6 +1,7 @@ #!/bin/sh -# Look for $1 somewhere in $PATH -# will print out the full pathname unless +# Look for $1 somewhere in $PATH. As an extra bonus, +# if $AP_PPSEARCHPATH is set, this will look for $i +# in there instead. Will print out the full pathname unless # called with the '-s' option # @@ -10,7 +11,11 @@ echo="yes" fi -for path in `echo $PATH | +if [ "x$AP_PPSEARCHPATH" = "x" ] ; then +AP_PPSEARCHPATH=$PATH +fi + +for path in `echo $AP_PPSEARCHPATH | sed 's/^;/.;/ s/;;/;.;/g s/;$/;./ 1.11 +5 -3 apache-1.3/src/helpers/TestCompile Index: TestCompile === RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- TestCompile 1998/04/11 14:30:33 1.10 +++ TestCompile 1998/04/11 15:45:59 1.11 @@ -125,12 +125,14 @@ # # Use our PrintPath helper script, knowing that we have # 2 versions of it though... Configure should set AP_PRINTPATH -# but if not, just assume we use our "generic" version +# but if not, just assume we use our "generic" version. We +# also use the AP_PPSEARCHPATH "hack" to have PrintPath +# just search this directory. + if [ "x$AP_PRINTPATH" = "x" ] ; then AP_PRINTPATH=PrintPath fi -TESTTARG=`PATH=".:$PATH" ./$AP_PRINTPATH $TARGET` -if [ "x$TESTTARG" = "x./$TARGET" ] ; then +if AP_PPSEARCHPATH=`pwd` ./$AP_PRINTPATH -s $TARGET ; then exstat=0 fi
cvs commit: apache-1.3 Announcement
jim 98/04/11 13:18:25 Modified:.Announcement Log: Note the renaming in Announcement Revision ChangesPath 1.12 +6 -0 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Announcement 1998/04/01 13:42:09 1.11 +++ Announcement 1998/04/11 20:18:24 1.12 @@ -37,6 +37,12 @@ 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.
cvs commit: apache-1.3/src PORTING
jim 98/04/13 11:45:52 Modified:src PORTING Log: minor fluff Revision ChangesPath 1.25 +2 -2 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- PORTING 1998/04/03 13:38:34 1.24 +++ PORTING 1998/04/13 18:45:52 1.25 @@ -93,8 +93,8 @@ what, however, there are 2 source files that need to be updated for the port: - Configure - conf.h + ./Configure + ./include/conf.h Configure: ==
cvs commit: apache-1.3 STATUS
jim 98/04/13 19:38:17 Modified:.STATUS Log: Minor 1.3b6 stuff and remove the idea about this being 1.3.0... no one voted for it and now with the Great Renaming, a beta test is really required Revision ChangesPath 1.294 +3 -15 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.293 retrieving revision 1.294 diff -u -r1.293 -r1.294 --- STATUS1998/04/12 15:49:24 1.293 +++ STATUS1998/04/14 02:38:16 1.294 @@ -2,7 +2,8 @@ Release: -1.3b6: freeze; release proposed for Friday, April 17 +1.3b6: freeze; release proposed for Friday, April 17. Need + a RM (if no one volunteers, Jim will do it). 1.3b5: Tagged APACHE_1_3b5 and released 2.0 : In pre-alpha development, see apache-2.0 repository @@ -278,18 +279,6 @@ best interest to continue to support Unix to its utmost, and not delay a release of 1.3.0 waiting for WIN32 issues to be resolved. - Proposal: the next release should be named 1.3.0 and should be labelled - "stable on unix, beta on NT". - +1: - -0: Ralf (because we've done a lot of good but new stuff - in 1.3b6-dev now and we should give us at least - one pre-release before the so-called "release" [1.3.0]. - But we should not take again many months. 1.3.0 should - be kicked out as soon as possible after 1.3b6 is out. So - we should commit APACI, test a few days again, release - 1.3b6, look for the responses, fix a few bugs and then - roll 1.3.0 out of the door marked as stated above) - Proposal: the next release should be named 1.3b6, and labelled "release candidate on unix, beta on NT". The release after that will be called 1.3.0 "stable on unix, beta on NT". @@ -297,8 +286,7 @@ +0: Notes: -Randy: APACI should go in a beta release if it is to go in at all. - I would also argue that 1.3b6 is _not_ stable. I've been +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..
cvs commit: apache-1.3/src PORTING
jim 98/04/13 20:02:40 Modified:src PORTING Log: Some doc changes Revision ChangesPath 1.26 +11 -9 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- PORTING 1998/04/13 18:45:52 1.25 +++ PORTING 1998/04/14 03:02:39 1.26 @@ -23,11 +23,9 @@ The source for Apache is written in ANSI-C, so an ANSI-C compiler is required. However, Apache does not use or require ANSI-only functions or options (eg: the "%n" parameter in the scanf() -family); the source basically uses ANSI function prototyping but -no other specific ANSIisms. Thus, an ANSI-to-K&R filter _may_ -work, although as far as we know it has not yet been tried. If you -attempt this, let the Apache team know (send mail to [EMAIL PROTECTED] -or make a suggestion report at <http://bugs.apache.org/>). +family) as much as possible to ease portability. Generally, +an ANSI-C compiler (eg: gcc) even without a full-blown ANSI +C library is usually sufficient. At present, the Apache source is not compatible with C++. @@ -39,7 +37,7 @@ platform and OS you are running on. The output of this script is used by Configure to set some basic compilation parameters. -The output of ./helpers/GuessOS was designed to be GNUconfig.guess +The output of ./helpers/GuessOS was designed to be GNU 'config.guess' compatible (from GNU/autoconf). The format of the output string is: @@ -47,7 +45,9 @@ This string is returned to the main Configure script as the shell variable $PLAT. If Configure is not "aware" of that platform -(or cannot correctly parse it), it will complain and die. +(or cannot correctly parse it), it will complain and die. We realize +that this may not be the best solution; the intent is to get as +much feedback as possible. -- Configure cannot Grok: @@ -124,7 +124,7 @@ If left undefined it'll default to yes. Yes means the src/regex/ directory, containing Henry Spencer's regex library will be used rather than any system supplied regex. It's been our experience that system -supplied regex libraries are generally buggy, and to be avoided. +supplied regex libraries are generally buggy, and should be avoided. conf.h: === @@ -291,7 +291,9 @@ NO_LINGCLOSE: Do not use Apache's soft, "lingering" close feature to - terminate connections. + terminate connections. If you find that your server crashes + due to being choked by too many FIN_WAIT_2 network states, + some reports indicate that #define'ing this will help. NO_SLACK: Do not use the "slack" fd feature which requires a working fcntl
cvs commit: apache-devsite API-dict.html
jim 98/04/14 16:07:42 Modified:.API-dict.html Log: Start linking and describing Revision ChangesPath 1.12 +117 -65 apache-devsite/API-dict.html Index: API-dict.html === RCS file: /export/home/cvs/apache-devsite/API-dict.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- API-dict.html 1998/04/13 12:30:10 1.11 +++ API-dict.html 1998/04/14 23:07:41 1.12 @@ -134,8 +134,9 @@ ap_add_per_dir_conf - void ap_add_per_dir_conf(server_rec *s, void *dir_config) + void ap_add_per_dir_conf(server_rec *s, void *dir_config) + definition/description @@ -144,8 +145,9 @@ ap_add_per_url_conf - void ap_add_per_url_conf(server_rec *s, void *url_config) + void ap_add_per_url_conf(server_rec *s, void *url_config) + definition/description @@ -162,7 +164,7 @@ ap_allow_overrides - int ap_allow_overrides (request_rec *); + int ap_allow_overrides (request_rec *); definition/description @@ -173,7 +175,7 @@ char *ap_cpystrn(char *buf, const char *str, size_t numbytes) - definition/description + Copies at most numbytes of str to buf. Differs from strncpy() in that buf is always null terminated, but is not null filled. Returns a pointer to the terminating '\0' ap_escape_quotes @@ -210,11 +212,11 @@ ap_snprintf - prototype + (int) ap_snprintf(char *buf, size_t len, const char *format,...) - definition/description - + Apache enhanced version of standard snprint() function. +Differs from snprintf() in that buf is always null terminated and that a value of 0 for len causes it to return NULL. ap_vformatter @@ -229,23 +231,23 @@ int ap_vsnprintf(char *buf, size_t numbytes, const char *fmt, va_list ap) - definition/description - + Apache enhanced version of standard vsnprint() function. +Differs from vsnprintf() in that buf is always null terminated and that a value of 0 for len causes it to return NULL. ap_get_server_built - prototype + (const char *) ap_get_server_built(void) - definition/description + Returns a pointer to a string defining the build-date of the executable image, e.g.: Apr 13 1998 22:01:36 ap_get_server_version - prototype + (const char *) ap_get_server_version(void) - - definition/description + + Returns a pointer to a string defining the official server version, e.g.: Apache/1.3.0 PHP/3.0 ap_log_error @@ -258,8 +260,9 @@ ap_append_arrays - array_header *ap_append_arrays(pool *, const array_header *, + array_header *ap_append_arrays(pool *, const array_header *, + definition/description @@ -274,96 +277,108 @@ ap_auth_name - char *ap_auth_name (request_rec *) + char *ap_auth_name (request_rec *) + definition/description ap_auth_type - char *ap_auth_type (request_rec *) + char *ap_auth_type (request_rec *) + definition/description ap_basic_http_header - void ap_basic_http_header(request_rec *r) + void ap_basic_http_header(request_rec *r) + definition/description ap_bclose - int ap_bclose(BUFF *fb) + int ap_bclose(BUFF *fb) + definition/description ap_bcreate - BUFF *ap_bcreate(pool *p, int flags) + BUFF *ap_bcreate(pool *p, int flags) + definition/description ap_bfilbuf - int ap_bfilbuf(BUFF *fb) + int ap_bfilbuf(BUFF *fb) + definition/description ap_bfileno - int ap_bfileno(BUFF *fb, int direction) + int ap_bfileno(BUFF *fb, int direction) + definition/description ap_bflsbuf - int ap_bflsbuf(int c, BUFF *fb) + int ap_bflsbuf(int c, BUFF *fb) + definition/description ap_bflush - int ap_bflush(BUFF *fb) + int ap_bflush(BUFF *fb) + definition/description ap_bgetopt - int ap_bgetopt(BUFF *fb, int optname, void *optval) + int ap_bgetopt(BUFF *fb, int optname, void *optval) + definition/description ap_bgets - int ap_bgets(char *s, int n, BUFF *fb) + int ap_bgets(char *s, int n, BUFF *fb) + definition/description ap_bhalfduplex - void ap_bhalfduplex(BUFF *fb) + void ap_bhalfduplex(BUFF *fb) + definition/description @@ -378,
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 h
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-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/src/include httpd.h
jim 98/04/15 17:15:35 Modified:src/include httpd.h Log: ready to tag Revision ChangesPath 1.204 +1 -1 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- httpd.h 1998/04/13 18:05:09 1.203 +++ httpd.h 1998/04/16 00:15:34 1.204 @@ -362,7 +362,7 @@ * Example: "Apache/1.1.0 MrWidget/0.1-alpha" */ -#define SERVER_BASEVERSION "Apache/1.3b6-dev"/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION "Apache/1.3b6"/* SEE COMMENTS ABOVE */ #ifdef SERVER_SUBVERSION #define SERVER_VERSION SERVER_BASEVERSION " " SERVER_SUBVERSION #else
cvs commit: apache-1.3/src/include httpd.h
jim 98/04/15 17:19:39 Modified:src/include httpd.h Log: Now up to 1.3b7-dev Revision ChangesPath 1.205 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- httpd.h 1998/04/16 00:15:34 1.204 +++ httpd.h 1998/04/16 00:19:39 1.205 @@ -362,7 +362,7 @@ * Example: "Apache/1.1.0 MrWidget/0.1-alpha" */ -#define SERVER_BASEVERSION "Apache/1.3b6"/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION "Apache/1.3b7-dev"/* SEE COMMENTS ABOVE */ #ifdef SERVER_SUBVERSION #define SERVER_VERSION SERVER_BASEVERSION " " SERVER_SUBVERSION #else @@ -375,7 +375,7 @@ /* Numeric release version identifier: major minor bugfix betaseq * Always increases along the same track as the source branch. */ -#define APACHE_RELEASE 1030006 +#define APACHE_RELEASE 1030007 #define SERVER_PROTOCOL "HTTP/1.1" #ifndef SERVER_SUPPORT
cvs commit: apache-1.3 STATUS
jim 98/04/15 17:33:46
Modified:.STATUS
Log:
Note 1.3b7 in STATUS
Revision ChangesPath
1.298 +3 -123apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- STATUS1998/04/15 18:29:25 1.297
+++ STATUS1998/04/16 00:33:45 1.298
@@ -2,10 +2,10 @@
Release:
-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
+1.3b7: freeze; Hopefully to simply be renamed 1.3.0
+1.3b6: Tagged APACHE_1_3b6. Possible release 4/17
+
2.0 : In pre-alpha development, see apache-2.0 repository
Guidelines:
@@ -56,126 +56,6 @@
Showstoppers:
Committed Code Changes:
-* Dean's `const'-change to os_is_path_absolute().
-* Security patch for "UserDir /abspath" without a * in the path. PR#1701
-* Dean's cleanup of race conditions in Unix child_main
-* Dean's fixes for better handling of various errors from select() and
- accept() in child_main(). PR#1747, 1107, 588, 1787, 987, 588
-* Dean's add of -lm to LIBS for HPUX. PR#1639
-* Ralf's remove of obsolete "dist.tar" target from Makefile.tmpl
-* Dean's fixes for some inconsistencies in semantics. PR#1817
-* Dean's is not permitted within . PR#379
-* Dean's and Martin's fix of
-* Fix for mod_mime_magic error messages. PR#1827
-* Workaround for using RLIMIT_AS for the RLimitMEM directive. PR#1816
-* Doug's patch to bind a process to a single processor under AIX
-* Martin's patch for mod_info to fix HTML markup
-* Martin's changes to the check_cmd_context() function
-* Patch for the ap_cpystrn() off-by-1 error
-* Dean's fix for multiple UserDir problem introduced during 1.3b4-dev.
-* Dean's fix to problems with absoluteURIs.
-* Dean's patch to use SA_RESETHAND or SA_ONESHOT for coredump handlers.
-* Patch to recognize FreeBSD versions. PR#1450
-* Workaround in mod_status for NeXT's running not m68k chips
-* Fix for -X situation to honor the SIGINT or SIGQUIT signals
-* Patch to hide Proxy-Authorization from CGI/SSI/etc
-* Ralf's new ProxyPassReverse directive for mod_proxy
-* Ralf's add of new RewriteMap types: rnd and int. PR#1631
-* Fix regex handling for mod_setenvif BrowserMatch command. PR#1825
-* Ralf's fix for assumptions on the username characters in mod_rewrite
-* Paul's merge of os/win32/mod_dll.c into modules/standard/mod_so.c
-* Paul's patch for reading the server-root from the NT registry
-* Ralf's fix for locking of `RewriteMap' programs. PR#1029
-* Dean's fix for the `config with no Port setting' situation
-* Ralf's fix for `RewriteMap' program handling. PR#1431
-* Ralf's fix for the initialization of RewriteLogLevel. PR#1325
-* Ralf's mod_rewrite meta-construct expansion inconsistency fix
-* Martin's new URI parsing stuff (the source module main/util_uri.c)
-* New `%a' construct for LogFormat and CustomLog. PR#1885
-* Make \\ behave as expected.
-* Fix for "poly" directive in image maps. PR#1771
-* Reduce memory usage, and speed up ServerAlias support. PR#1531
-* Dean's cleanup of code in http_vhost.c and vhost-stuff in mod_rewrite.c
-* Dean's rewrite of absoluteURI handling vhost matching
-* Dean's new mod_test_util_uri.c
-* back out USE_PTHREAD_SERIALIZED_ACCEPT for solaris
-* Ken's abstraction of SERVER_{BUILT,VERSION}
-* Ralf's Config File Line Continuation
-* Ralf's Reanimation of DBM support for RewriteMap in mod_rewrite PR#1696
-* Ralf's fix for the ` w/o mod_rewrite' situation. PR#1790
-* Mark's fix for ProxyPass/ProxyRequests interaction broken by uri stuff
-* Rasmus' generation of the new src/include/ap_config.h header file
-* Dean's fix for mod_mime_magic and files with length 0
-* Dean's change to Location and LocationMatch semantics. PR#1440
-* Ralf's fix for the flock()<->fork() problematic for RewriteLock's
-* Dean's Minor cleanup in http_main
-* Ralf's Various improvements to the configuration and build support
-* Corrections to the setup of the REMOTE_HOST variable. PR#1925
-* Fix for rputs() which did not calculate r->sent_bodyct properly.
PR#1900
-* Don't tweak TZ envvar if the user has specified an explicit one.
PR
cvs commit: apache-devsite how-to-release.html
jim 98/04/15 17:36:48
Modified:.how-to-release.html
Log:
main -> include
Revision ChangesPath
1.37 +6 -6 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- how-to-release.html 1998/04/15 17:52:34 1.36
+++ how-to-release.html 1998/04/16 00:36:47 1.37
@@ -121,15 +121,15 @@
[ Only for final releases, not for internal pre-releases
]
- Change SERVER_VERSION in src/main/httpd.h
+ Change SERVER_VERSION in src/include/httpd.h
from ``Apache/1.X.Y-dev'' to
``Apache/1.X.Y''. Then also change
APACHE_RELEASE in same file from
``1XXYYZZ'' to ``1XXYY99''. The format is
something like printf("%d%02d%02d%02d", major, minor, bugfix,
betaseq).
- $ vi src/main/httpd.h
- $ cvs commit src/main/httpd.h
+ $ vi src/include/httpd.h
+ $ cvs commit src/include/httpd.h
If the release is going from beta to non-beta, or non-beta to a
beta, also update the Windows registry key release. See
@@ -228,12 +228,12 @@
cd back into the CVS tree location.
$ cd apache-1.X
- Change SERVER_VERSION in src/main/httpd.h
+ Change SERVER_VERSION in src/include/httpd.h
from ``Apache/1.X.Y'' to
``Apache/1.X.(Y+1)-dev'' and change
APACHE_RELEASE to 1XX(YY+1)01.
- $ vi src/main/httpd.h
- $ cvs commit src/main/httpd.h
+ $ vi src/include/httpd.h
+ $ cvs commit src/include/httpd.h
Cleanup:
$ cd ..
cvs commit: apache-1.3 STATUS
jim 98/04/20 13:18:03 Modified:.STATUS Log: Update STATUS Revision ChangesPath 1.309 +18 -13apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.308 retrieving revision 1.309 diff -u -r1.308 -r1.309 --- STATUS1998/04/20 08:28:48 1.308 +++ STATUS1998/04/20 20:18:02 1.309 @@ -2,10 +2,12 @@ Release: -1.3b7: freeze; Hopefully to simply be renamed 1.3.0 +1.3.0: Shoot for May 16, 1998 Release! -1.3b6: Tagged APACHE_1_3b6. Possible release 4/20 +1.3b7: In development +1.3b6: Tagged APACHE_1_3b6. Announced and Released 4/20/98 + 2.0 : In pre-alpha development, see apache-2.0 repository Guidelines: @@ -162,16 +164,16 @@ * What do we call the binary: apache or httpd? Under UNIX it's httpd, under Win32 it's apache. apache-httpd: Ken +1 - leave it apache: +1 Brian, Ralf, Martin + leave it apache: +1 Brian, Ralf, Martin, Jim * Maybe a http_paths.h file? See <[EMAIL PROTECTED]> +1: Brian, Paul, Ralf, Martin + +0: Jim (not for 1.3.0) * Release builds: Should we provide Configuration or not? Should we 'make all suexec' in src/support? - Ken +1 (possible suexec path issue, though) -Brian +1 + +1: Brian, Jim, Ken +1 (possible suexec path issue, though) * root's environment is inherited by the Apache server. Jim & Ken think we should recommend using 'env' to build the @@ -219,12 +221,6 @@ best interest to continue to support Unix to its utmost, and not delay a release of 1.3.0 waiting for WIN32 issues to be resolved. - Proposal: the next release should be named 1.3b6, and labelled "release - candidate on unix, beta on NT". The release after that will be - called 1.3.0 "stable on unix, beta on NT". - +1: Jim, Ralf, Randy, Brian, Martin - +0: - Notes: Randy: I would also argue that 1.3b6 is _not_ stable. I've been having real fits keeping it alive on a dual processor @@ -233,8 +229,17 @@ * Should we re-enable nagle now that we're non-buffering CGIs? See various messages from Marc in March 98. -* Should we list the operating system's generic name (e.g. Irix, Win32) in -SERVER_VERSION? +* Listing the operating system's generic name (e.g. Irix, Win32) in +SERVER_VERSION: + o Looks like we want to do this... +Implementation: New API function, ap_add_version_component() + that takes a 'const char *' and tacks it onto the end + of the string returned by ap_get_server_version(). + + o Debate: + Unix:Win32:OS/2 in '()' comment + +1: Jim, Martin, Alexei + Irix:AIX:FreeBSD in '()' comment Win32 specific issues:
cvs commit: apache-1.3/src/include conf.h
jim 98/04/20 16:49:08 Modified:src Configure src/include conf.h Log: Obtained from: Jeff Earickson <[EMAIL PROTECTED]> Submitted by: Jim Jagielski Add HP-UX 11 Port Revision ChangesPath 1.241 +8 -2 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.240 retrieving revision 1.241 diff -u -r1.240 -r1.241 --- Configure 1998/04/17 18:49:36 1.240 +++ Configure 1998/04/20 23:49:07 1.241 @@ -341,6 +341,12 @@ OS='HI-UX' CFLAGS="$CFLAGS -DHIUX" ;; +*-hp-hpux11.*) + OS='HP-UX 11' + CFLAGS="$CFLAGS -DHPUX11" + LIBS="$LIBS -lm -lpthread" + DEF_WANTHSREGEX=yes + ;; *-hp-hpux10.*) OS='HP-UX 10' CFLAGS="$CFLAGS -DHPUX10" @@ -876,7 +882,7 @@ LDFLAGS_SHLIB="-b" LDFLAGS_SHLIB_EXPORT="-Wl,-E -Wl,-B,deferred" ;; -*-hp-hpux10.*) +*-hp-hpux10.*|*-hp-hpux11.*) case $CC in */gcc|gcc ) CFLAGS_SHLIB="-fpic" ;; */cc|cc ) CFLAGS_SHLIB="+z" ;; @@ -992,7 +998,7 @@ ;; esac ;; -'HP-UX'|'HP-UX 10') +'HP-UX'|'HP-UX 10'|'HP-UX 11') case "$CC" in */cc|cc ) CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE" 1.202 +21 -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.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- conf.h1998/04/15 17:09:27 1.201 +++ conf.h1998/04/20 23:49:08 1.202 @@ -205,6 +205,27 @@ typedef int rlim_t; #endif +#elif defined(HPUX11) +#ifndef _HPUX_SOURCE +#define _HPUX_SOURCE +#endif +#define HAVE_SHMGET +#define USE_SHMGET_SCOREBOARD +#undef HAVE_GMTOFF +#define HAVE_RESOURCE +#define HAVE_CRYPT_H +#undef HAVE_SYS_SELECT_H +#define HAVE_SYS_RESOURCE_H +#define USE_FCNTL_SERIALIZED_ACCEPT +/* feeling brave? want to try using POSIX mutexes? */ +/* #define HAVE_MMAP */ +/* #define USE_MMAP_SCOREBOARD */ +/* #define USE_MMAP_FILES */ +/* #define USE_PTHREAD_SERIALIZED_ACCEPT */ +#define NO_KILLPG +#undef NO_SETSID +#define HAVE_SYSLOG + #elif defined(AIX) #undef HAVE_GMTOFF #undef NO_KILLPG
cvs commit: apache-1.3/src CHANGES
jim 98/04/20 16:51:15 Modified:.STATUS src CHANGES Log: HP-UX 11 doc changes Revision ChangesPath 1.310 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- STATUS1998/04/20 20:18:02 1.309 +++ STATUS1998/04/20 23:51:13 1.310 @@ -44,6 +44,7 @@ Committed Code Changes: +* HP-UX 11 port by Jeff Earickson * Lars' Configure fix to avoid confusing message under APACI control * Ralf's Configure fix for AWK's failing with "string to long" error * Ralf's fix for stderr logging to make sure default loglevel is honored 1.778 +2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.777 retrieving revision 1.778 diff -u -r1.777 -r1.778 --- CHANGES 1998/04/19 20:10:43 1.777 +++ CHANGES 1998/04/20 23:51:14 1.778 @@ -1,5 +1,7 @@ Changes with Apache 1.3b7 + *) PORT: Added HP-UX 11 patches [Jeff Earickson <[EMAIL PROTECTED]>] + *) If you start apache with the -S command line option it will dump out the parsed vhost settings. This is useful for folks trying to figure out what is wrong with their vhost configuration.
cvs commit: apache-1.3 STATUS
jim 98/04/20 17:03:08 Modified:.STATUS Log: Some STATUS updates Revision ChangesPath 1.311 +3 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.310 retrieving revision 1.311 diff -u -r1.310 -r1.311 --- STATUS1998/04/20 23:51:13 1.310 +++ STATUS1998/04/21 00:03:06 1.311 @@ -3,6 +3,7 @@ Release: 1.3.0: Shoot for May 16, 1998 Release! + Brian to be RM, Jim will do announcements 1.3b7: In development @@ -92,6 +93,8 @@ 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. + o Jim's looked over the ap_snprintf() stuff (the changes that Dean + did to make thread-safe) and they look fine. * The fatal errors that the children detect and fill up the log with (such as bogus group id) need to be stopped. The proposed fix is to
cvs commit: apache-1.3 STATUS
jim 98/04/20 17:08:27 Modified:.STATUS Log: The NeXT stuff has already been included, except for the logresolv(e).c stuff, which is unclear Revision ChangesPath 1.312 +0 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- STATUS1998/04/21 00:03:06 1.311 +++ STATUS1998/04/21 00:08:26 1.312 @@ -133,9 +133,6 @@ * Lynx OS re-port <[EMAIL PROTECTED]> -* NeXT tweaks for 1.3b5 - <[EMAIL PROTECTED]> (in the feb98 archives) - * PR#1799: we need to add a "default" or "none" handler to deal with filenames such as foo.map.gif which aren't image maps, and shouldn't be considered such. See discussion in
cvs commit: apache-1.3 STATUS
jim 98/04/20 17:10:46 Modified:.STATUS Log: Suggested patch no longer valid and may not be needed due to Configure changes... Marius contacted to verify Revision ChangesPath 1.313 +0 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.312 retrieving revision 1.313 diff -u -r1.312 -r1.313 --- STATUS1998/04/21 00:08:26 1.312 +++ STATUS1998/04/21 00:10:45 1.313 @@ -130,9 +130,6 @@ In particular this affects the correctness of the proxy and the vhost mechanism. -* Lynx OS re-port - <[EMAIL PROTECTED]> - * PR#1799: we need to add a "default" or "none" handler to deal with filenames such as foo.map.gif which aren't image maps, and shouldn't be considered such. See discussion in
cvs commit: apache-1.3/src/support logresolve.c
jim 98/04/20 18:39:30
Modified:src/support logresolve.c
Log:
PR: 2082
Submitted by: Jim Jagielski
NeXT requires strdup()... Since we already provide for MPE we use
this internal version. Another fix would be to:
#ifdef NEXT
#define strdup NXCopyStringBuffer
#endif
Revision ChangesPath
1.10 +1 -1 apache-1.3/src/support/logresolve.c
Index: logresolve.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/logresolve.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- logresolve.c 1998/01/20 01:44:42 1.9
+++ logresolve.c 1998/04/21 01:39:30 1.10
@@ -71,7 +71,7 @@
/* number of buckets in cache hash table */
#define BUCKETS 256
-#ifdef MPE
+#if defined(MPE) || defined(NEXT)
char *strdup (const char *str)
{
char *dup;
cvs commit: apache-1.3/src/support ab.c
jim 98/04/20 18:41:57 Modified:src/support ab.c Log: PR: 2081 Obtained from: Jens Schleusener <[EMAIL PROTECTED]> Submitted by: Jim Jagielski AIX requires sys/select.h Revision ChangesPath 1.5 +3 -1 apache-1.3/src/support/ab.c Index: ab.c === RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ab.c 1998/03/31 12:53:45 1.4 +++ ab.c 1998/04/21 01:41:57 1.5 @@ -99,8 +99,10 @@ #include #include #include -#include #include +#ifdef AIX +#include +#endif /* --- DEFINITIONS -- */
cvs commit: apache-1.3/src CHANGES
jim 98/04/21 05:10:28 Modified:.STATUS src CHANGES Log: report closed PRs Revision ChangesPath 1.315 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.314 retrieving revision 1.315 diff -u -r1.314 -r1.315 --- STATUS1998/04/21 08:04:58 1.314 +++ STATUS1998/04/21 12:10:09 1.315 @@ -55,6 +55,7 @@ * Dean's httpd -S command line option to dump parsed vhost setup * HP-UX 11 port by Jeff Earickson * Ralf's fix for the install-config target to get correct MimeMagicFile +* PRs 2081 and 2082 closed Available Patches: 1.780 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.779 retrieving revision 1.780 diff -u -r1.779 -r1.780 --- CHANGES 1998/04/21 08:04:59 1.779 +++ CHANGES 1998/04/21 12:10:20 1.780 @@ -1,5 +1,9 @@ Changes with Apache 1.3b7 + *) PR2082: Closed... NeXT required strdup() in support/logresolve.c + + *) PR2081: Closed... AIX required sys/select.h in support/ab.c + *) Fix the path to the MimeMagicFile in the install-config target, too. [Ralf S. Engelschall, PR#2089]
cvs commit: apache-1.3/src CHANGES
jim 98/04/21 12:10:25 Modified:src CHANGES Log: Nasty nasty bad wrong PR format... I see that Ralf fixed his as well... Good boy :) Revision ChangesPath 1.787 +4 -3 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.786 retrieving revision 1.787 diff -u -r1.786 -r1.787 --- CHANGES 1998/04/21 17:34:00 1.786 +++ CHANGES 1998/04/21 19:10:22 1.787 @@ -22,10 +22,11 @@ second by making sure the "avoid-bristling-suffix" /apache is not appended to sysconfdir, datadir, localstatedir and includedir when --compat is used. [Ralf S. Engelschall, Lars Eilebrecht] + *) NeXT required strdup() in support/logresolve.c + [Francisco Tomei <[EMAIL PROTECTED]>] PR#2082 - *) NeXT requires strdup() in support/logresolve.c. PR#2082 - - *) AIX requires in support/ab.c PR#2081 + *) AIX required sys/select.h in support/ab.c + [Jens Schleusener <[EMAIL PROTECTED]>] PR#2081 *) Fix the path to the MimeMagicFile in the install-config target, too. [Ralf S. Engelschall] PR#2089
cvs commit: apache-1.3/src/support ab.c
jim 98/04/21 12:56:28 Modified:src/support ab.c Log: Have ab.c use our ./include/conf.h file to pull out (hopefully) the right header files Revision ChangesPath 1.6 +1 -9 apache-1.3/src/support/ab.c Index: ab.c === RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ab.c 1998/04/21 01:41:57 1.5 +++ ab.c 1998/04/21 19:56:27 1.6 @@ -89,20 +89,12 @@ /* affects include files on Solaris */ #define BSD_COMP -#include -#include +#include "conf.h" #include #include #include #include -#include #include -#include -#include -#include -#ifdef AIX -#include -#endif /* --- DEFINITIONS -- */
cvs commit: apache-1.3/src/support logresolve.c
jim 98/04/21 13:03:29
Modified:src/support logresolve.c
Log:
Again, use conf.h since we have it. Too bad
no one else noticed that support's Makefile includes ./src/include
or else this would have been fixed a long time ago, I'm sure
Revision ChangesPath
1.11 +2 -8 apache-1.3/src/support/logresolve.c
Index: logresolve.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/logresolve.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- logresolve.c 1998/04/21 01:39:30 1.10
+++ logresolve.c 1998/04/21 20:03:23 1.11
@@ -39,18 +39,12 @@
* that one of these matches the original address.
*/
-
+#include "conf.h"
#include
#include
-#include
#include
-#include
-#include
-
-#include
-#include
#ifndef MPE
#include
#endif
@@ -71,7 +65,7 @@
/* number of buckets in cache hash table */
#define BUCKETS 256
-#if defined(MPE) || defined(NEXT)
+#if defined(NEED_STRDUP)
char *strdup (const char *str)
{
char *dup;
cvs commit: apache-1.3/src/support ab.c htdigest.c htpasswd.c logresolve.c rotatelogs.c suexec.c
jim 98/04/21 13:14:08
Modified:src/support ab.c htdigest.c htpasswd.c logresolve.c
rotatelogs.c suexec.c
Log:
Adjust ALL *.c files in support to use conf.h
so we get the right header files, etc...
Revision ChangesPath
1.7 +0 -3 apache-1.3/src/support/ab.c
Index: ab.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ab.c 1998/04/21 19:56:27 1.6
+++ ab.c 1998/04/21 20:14:05 1.7
@@ -90,10 +90,7 @@
#define BSD_COMP
#include "conf.h"
-#include
-#include
#include
-#include
#include
/* --- DEFINITIONS -- */
1.17 +1 -5 apache-1.3/src/support/htdigest.c
Index: htdigest.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/htdigest.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- htdigest.c1998/04/11 12:01:08 1.16
+++ htdigest.c1998/04/21 20:14:05 1.17
@@ -10,17 +10,13 @@
* by Alexei Kosut, based on htpasswd.c, by Rob McCool
*/
+#include "conf.h"
#include
-#include
-#include
#ifdef MPE
#include
#else
#include
#endif
-#include
-#include
-#include
/* This is probably the easiest way to do it */
#include "../main/md5c.c"
1.15 +1 -5 apache-1.3/src/support/htpasswd.c
Index: htpasswd.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- htpasswd.c1998/03/19 09:56:42 1.14
+++ htpasswd.c1998/04/21 20:14:06 1.15
@@ -10,13 +10,9 @@
* Rob McCool
*/
+#include "conf.h"
#include
-#include
-#include
#include
-#include
-#include
-#include
#ifndef CHARSET_EBCDIC
#define LF 10
1.12 +0 -1 apache-1.3/src/support/logresolve.c
Index: logresolve.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/logresolve.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- logresolve.c 1998/04/21 20:03:23 1.11
+++ logresolve.c 1998/04/21 20:14:06 1.12
@@ -43,7 +43,6 @@
#include
#include
-#include
#ifndef MPE
#include
1.9 +1 -3 apache-1.3/src/support/rotatelogs.c
Index: rotatelogs.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/rotatelogs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rotatelogs.c 1997/10/12 06:00:48 1.8
+++ rotatelogs.c 1998/04/21 20:14:06 1.9
@@ -10,12 +10,10 @@
#define BUFSIZE 65536
#define MAX_PATH 1024
-#include
-#include
+#include "conf.h"
#include
#include
#include
-#include
int main (int argc, char **argv)
{
1.38 +2 -10 apache-1.3/src/support/suexec.c
Index: suexec.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/suexec.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- suexec.c 1998/03/31 12:54:06 1.37
+++ suexec.c 1998/04/21 20:14:06 1.38
@@ -71,20 +71,12 @@
*
*/
-
+#include "conf.h"
#include
#include
#include
-#include
-#include
-#include
#include
-#include
-#include
-#include
-#include
-#include
#include "suexec.h"
@@ -98,7 +90,7 @@
***
*/
-#if defined(QNX) || defined(_OSD_POSIX) || defined(MPE) || defined(SCO) ||
defined(BEOS)
+#if defined(NEED_INITGROUPS)
int initgroups(const char *name, gid_t basegid)
{
/* QNX and MPE do not appear to support supplementary groups. */
cvs commit: apache-1.3/src/support Makefile.tmpl
jim 98/04/21 13:33:50 Modified:src/support Makefile.tmpl Log: It is totally bogus to have -lap at the END of the link, since it's quite likely that some extries in there will be found in LIBS1 Revision ChangesPath 1.16 +1 -1 apache-1.3/src/support/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/support/Makefile.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.tmpl 1998/04/09 10:22:55 1.15 +++ Makefile.tmpl 1998/04/21 20:33:49 1.16 @@ -1,6 +1,6 @@ CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) -LIBS=$(EXTRA_LIBS) $(LIBS1) -lap +LIBS=-lap $(EXTRA_LIBS) $(LIBS1) INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L$(SRCDIR)/ap
cvs commit: apache-1.3/src CHANGES
jim 98/04/21 13:39:08 Modified:src CHANGES Log: Someone forgot a line space Revision ChangesPath 1.788 +1 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.787 retrieving revision 1.788 diff -u -r1.787 -r1.788 --- CHANGES 1998/04/21 19:10:22 1.787 +++ CHANGES 1998/04/21 20:39:05 1.788 @@ -22,6 +22,7 @@ second by making sure the "avoid-bristling-suffix" /apache is not appended to sysconfdir, datadir, localstatedir and includedir when --compat is used. [Ralf S. Engelschall, Lars Eilebrecht] + *) NeXT required strdup() in support/logresolve.c [Francisco Tomei <[EMAIL PROTECTED]>] PR#2082
cvs commit: apache-1.3 Announcement
jim 98/04/21 13:40:51 Modified:.Announcement Log: Add 2 spaces after each '.' Revision ChangesPath 1.18 +7 -6 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Announcement 1998/04/20 08:53:09 1.17 +++ Announcement 1998/04/21 20:40:50 1.18 @@ -3,10 +3,10 @@ == 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 + 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 + 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. @@ -96,12 +96,13 @@ http://www.apache.org/dist/apache_1.3b6/htdocs/manual/new_features_1_3 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. + 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 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 + current HTTP standards. For more information about the Apache project check out http://www.apache.org/.
cvs commit: apache-1.3/src Configure PORTING
jim 98/04/21 14:00:44 Modified:src Configure PORTING Log: It's bogus to fail just because we don't have an entry in conf.h for the OS... what the hell, give it a try and continue with the build process. We may get lucky. And even if we don't, we're in no worse shape than before. Besides, we covered-our-asses because we told them all bets were off Revision ChangesPath 1.242 +6 -2 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- Configure 1998/04/20 23:49:07 1.241 +++ Configure 1998/04/21 21:00:43 1.242 @@ -653,6 +653,7 @@ DEF_WANTHSREGEX=yes ;; *) # default: Catch systems we don't know about +OS='Unknown and unsupported OS' echo Sorry, but we cannot grok \"$PLAT\" echo uname -m uname -m @@ -671,8 +672,11 @@ echo [EMAIL PROTECTED] If you don\'t wish to do the port echo yourself, please submit this output rather than the patches. echo Thank you - exitcode=1 - exit 1 + echo + echo Pressing on with the build process, but all bets are off. + echo Do not be surprised if it fails. If it works, and even + echo if it does not, please contact the above address. + echo ;; esac 1.27 +7 -4 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- PORTING 1998/04/14 03:02:39 1.26 +++ PORTING 1998/04/21 21:00:43 1.27 @@ -52,10 +52,13 @@ -- Configure cannot Grok: -- -If this happens to you, then it means that Configure doesn't -know how to configure and compile Apache for your OS. The first -course of action is the easiest: Look in Configure and see if -there are any OSs which are similar to yours. +If this happens to you, then it means that Configure doesn't know +how to configure and compile Apache for your OS. It will still try +nonetheless, but at this point, all bets are off. + +The best solution if this happens to you is to make Apache aware +of your OS. The first course of action is the easiest: Look in +Configure and see if there are any OSs which are similar to yours. For example, let's say that your OS is similar to HP-UX, but that GuessOS returns "foobar-intel-hubble". You would then edit
cvs commit: apache-1.3 STATUS
jim 98/04/21 14:26:06
Modified:.STATUS
Log:
Some thoughts on some Need Patch items
Revision ChangesPath
1.322 +12 -1 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- STATUS1998/04/21 20:47:13 1.321
+++ STATUS1998/04/21 21:26:05 1.322
@@ -126,6 +126,9 @@
* Amdalh UTS 2.1.2
Message-Id: <[EMAIL PROTECTED]>
Message-Id: <[EMAIL PROTECTED]>
+ Jim: Sounded like the version of the OS that required
+ the patches were WAY old and would bugger the newer
+ versions... Not sure if we want to do that.
* Problems dealing with .-rooted domain names such as "twinlark." versus
"twinlark.arctic.org.". See the thread containing
@@ -141,6 +144,8 @@
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
(feb98 archives)
+ Jim: I thought that we decided "default", although Ken
+ thought it ugly
* proxy_*_canon routines use r->proxyreq incorrectly. See
<[EMAIL PROTECTED]>
@@ -148,7 +153,13 @@
* TZ should not be dealt with specially any longer now that we have
"PassEnv". See
<[EMAIL PROTECTED]>
-
+ Jim: IMO it's too late in the game for this... I'm
+sure this would cause some strange bug reports as
+ people's cgi-scripts no longer work correctly
+ ("It worked just fine before I upgraded to 1.3.0")
+ unless we warn people in big nasty letters to add
+ PassEnv TZ to their config files "just in case"
+ and hope they do it :)
Closed issues:
cvs commit: apache-1.3/htdocs/manual/vhosts details.html
jim 98/04/21 15:24:52 Modified:htdocs/manual upgrading_to_1_3.html htdocs/manual/vhosts details.html Log: Some clarification that only one NameVirtualHost is used per IP:port pair Revision ChangesPath 1.20 +4 -3 apache-1.3/htdocs/manual/upgrading_to_1_3.html Index: upgrading_to_1_3.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/upgrading_to_1_3.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- upgrading_to_1_3.html 1998/04/14 17:27:07 1.19 +++ upgrading_to_1_3.html 1998/04/21 22:24:50 1.20 @@ -91,9 +91,10 @@ Folks using HTTP/1.1-style virtual hosting will need to list the ip:port pairs that are supposed to have HTTP/1.1-style virtual hosting via the -NameVirtualHost directive. Previously this support was -given implicitly on the "main server address". Now it has to be -explicitly listed so as to avoid many problems that users had. +NameVirtualHost directive (one directive per pair). +Previously this support was given implicitly on the "main server +address". Now it has to be explicitly listed so as to avoid many +problems that users had. Please see the Apache Virtual Host documentation for further details on configuration. 1.6 +3 -1 apache-1.3/htdocs/manual/vhosts/details.html Index: details.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/vhosts/details.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- details.html 1998/02/20 06:47:53 1.5 +++ details.html 1998/04/21 22:24:51 1.6 @@ -77,7 +77,9 @@ NameVirtualHost directive in your configuration file. Multiple NameVirtualHost directives can be used each -with a set of VirtualHost directives. +with a set of VirtualHost directives but only one +NameVirtualHost directive should be used for each +specific IP:port pair. The ordering of NameVirtualHost and VirtualHost directives is not important which makes the
cvs commit: apache-1.3 STATUS
jim 98/04/25 06:00:33 Modified:.STATUS Log: Add renaming of conf.h Revision ChangesPath 1.329 +10 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- STATUS1998/04/23 10:42:05 1.328 +++ STATUS1998/04/25 13:00:32 1.329 @@ -168,7 +168,16 @@ PassEnv TZ to their config files "just in case" and hope they do it :) - + * LynxOS has system-level conf.h file + Seems that Lynx has a system level conf.h file that ours overrules, + so it doesn't compile correctly. To accomodate, we would need to + rename our conf.h to something "safe". Possible choices: + + apconf.h : + applatforms.h : + apdefaults.h : + apdefines.h: + Closed issues: Open issues:
cvs commit: apache-1.3 STATUS
jim 98/05/01 06:16:18 Modified:.STATUS Log: Some ideas on STATUS Revision ChangesPath 1.344 +9 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.343 retrieving revision 1.344 diff -u -r1.343 -r1.344 --- STATUS1998/05/01 10:00:39 1.343 +++ STATUS1998/05/01 13:16:17 1.344 @@ -108,8 +108,11 @@ FINAL RELEASE SHOWSTOPPERS: * MIME type case sensitivity disparity between 1.2.6 and 1.3b6 (PR #2112) + Jim: Is the suggested change in find_title() not +sufficient? Or is the fix to remap all mimes to lowercase? * proxy security fixes from 1.2.5 need to be brought forward + Jim: What are these? * Someone other than Dean has to do a security/correctness review on psprintf(), bprintf(), and ap_snprintf(). In particular these routines @@ -123,10 +126,16 @@ make the child exit with a special code when a fatal error occurs; the parent would then abort. See <[EMAIL PROTECTED]> + Jim: Is this something to hold 1.3.0 up for? I'm thinking maybe + some sort of error-code be placed in scoreboard that + the parent could act on? Of course, we already use + waitpid() so we have the status already... * The DoS issue about symlinks to /dev/zero is still present. A device checker patch had been sent to the list a while ago. Msg-Id: ? + Jim: Couldn't we just use stat() and check the file-type? +stats are expensive though... * get_path_info bug; ap_get_remote_host should be ap_vformatter instead. See: <[EMAIL PROTECTED]>
cvs commit: apache-1.3 STATUS
jim 98/05/01 06:25:37 Modified:.STATUS Log: Looking for feedback Revision ChangesPath 1.345 +4 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.344 retrieving revision 1.345 diff -u -r1.344 -r1.345 --- STATUS1998/05/01 13:16:17 1.344 +++ STATUS1998/05/01 13:25:36 1.345 @@ -130,6 +130,10 @@ some sort of error-code be placed in scoreboard that the parent could act on? Of course, we already use waitpid() so we have the status already... + Some of these "we should stop errors" are kinda obvious, + like a bad lockfile... some I would have no idea. + I'll generate a list of what I think are these Abort + errors and ask for feedback. * The DoS issue about symlinks to /dev/zero is still present. A device checker patch had been sent to the list a while ago.
cvs commit: apache-1.3 STATUS
jim 98/05/02 17:44:07 Modified:.STATUS Log: Update STATUS with a date and some issues Revision ChangesPath 1.348 +7 -18 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.347 retrieving revision 1.348 diff -u -r1.347 -r1.348 --- STATUS1998/05/02 11:15:06 1.347 +++ STATUS1998/05/03 00:44:06 1.348 @@ -5,7 +5,7 @@ 1.3.0: Shoot for May 16, 1998 Release! Brian to be RM, Jim will do announcements -1.3b7: In development +1.3b7: In development... Possible release May 8. 1.3b6: Tagged APACHE_1_3b6. Announced and Released 4/20/98 @@ -82,6 +82,10 @@ Available Patches: +* Michael Anderson's <[EMAIL PROTECTED]> C++ friendly patch + <[EMAIL PROTECTED]> + Status: Ben, Jim +1 + * 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 @@ -109,10 +113,7 @@ FINAL RELEASE SHOWSTOPPERS: * MIME type case sensitivity disparity between 1.2.6 and 1.3b6 (PR #2112) - Jim: Is the suggested change in find_title() not -sufficient? Or is the fix to remap all mimes to lowercase? - Dean: all mime types are already lowercase everywhere else in the -server + mod_autoindex should lowercase the mime-type when comparing * proxy security fixes from 1.2.5 need to be brought forward Jim: What are these? @@ -129,19 +130,7 @@ make the child exit with a special code when a fatal error occurs; the parent would then abort. See <[EMAIL PROTECTED]> -Jim: Is this something to hold 1.3.0 up for? I'm thinking maybe - some sort of error-code be placed in scoreboard that - the parent could act on? Of course, we already use - waitpid() so we have the status already... - Some of these "we should stop errors" are kinda obvious, - like a bad lockfile... some I would have no idea. - I'll generate a list of what I think are these Abort - errors and ask for feedback. - Dean: Yep. It's a serious reliability difference between 1.2 and - 1.3 -- for some errors, such as the bogus group id, 1.2 would - have exited immediately. 1.3 will consume all system resources, - it will spawn 32 children per second, and every one of them will - write a log entry. Besides it's an easy fix. +Jim: Possible patch: <[EMAIL PROTECTED]> * The DoS issue about symlinks to /dev/zero is still present. A device checker patch had been sent to the list a while ago.
cvs commit: apache-1.3 STATUS
jim 98/05/03 07:01:53
Modified:.STATUS
Log:
Update with some patches and votes
Revision ChangesPath
1.352 +8 -2 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- STATUS1998/05/03 10:26:34 1.351
+++ STATUS1998/05/03 14:01:52 1.352
@@ -85,6 +85,10 @@
Available Patches:
+* Dean's mod_alias.c, translate_alias_redir patch
+ <[EMAIL PROTECTED]>
+ Status: Dean, Ben, Jim +1
+
* Michael Anderson's <[EMAIL PROTECTED]> C++ friendly patch
<[EMAIL PROTECTED]>
Status: Ben, Jim +1, Dean +1
@@ -117,6 +121,8 @@
* MIME type case sensitivity disparity between 1.2.6 and 1.3b6 (PR #2112)
mod_autoindex should lowercase the mime-type when comparing
+ [PATCH] <[EMAIL PROTECTED]>
+ Status: Jim, Dean +1
* proxy security fixes from 1.2.5 need to be brought forward
Jim: What are these?
@@ -133,8 +139,8 @@
make the child exit with a special code when a fatal error occurs; the
parent would then abort. See
<[EMAIL PROTECTED]>
-Jim: Possible patch: <[EMAIL PROTECTED]>
- Dean +1
+ [PATCH] <[EMAIL PROTECTED]>
+ Status: Jim, Dean +1
* The DoS issue about symlinks to /dev/zero is still present.
A device checker patch had been sent to the list a while ago.
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
jim 98/05/03 09:46:50
Modified:.STATUS
src CHANGES
src/modules/standard mod_autoindex.c
Log:
PR: 2112
Submitted by: Jim Jagielski
Reviewed by: Dean Gaudet, Ralf Engelschall
Revision ChangesPath
1.354 +1 -5 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- STATUS1998/05/03 16:29:38 1.353
+++ STATUS1998/05/03 16:46:47 1.354
@@ -82,6 +82,7 @@
* Ben's WIN32: Make roots of filesystems (e.g. c:/) work, PR#1558
* Ben's WIN32: Extensive overhaul of the way UNCs are handled.
* Ralf's fix for referer/agent log entries in installed httpd.conf,
PR#2175
+* Jim's fix for MIME type case sensitivity disparity, PR#2112
Available Patches:
@@ -136,11 +137,6 @@
CustomLog-like tailoring of directory listing formats
FINAL RELEASE SHOWSTOPPERS:
-
-* MIME type case sensitivity disparity between 1.2.6 and 1.3b6 (PR #2112)
- mod_autoindex should lowercase the mime-type when comparing
- [PATCH] <[EMAIL PROTECTED]>
- Status: Jim, Dean +1
* proxy security fixes from 1.2.5 need to be brought forward
Jim: What are these?
1.810 +4 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -r1.809 -r1.810
--- CHANGES 1998/05/03 10:22:29 1.809
+++ CHANGES 1998/05/03 16:46:48 1.810
@@ -1,5 +1,8 @@
Changes with Apache 1.3b7
-
+
+ *) mod_autoindex's find_itme() was sensitive to MIME type case.
+ [Jim Jagielski] PR#2112
+
*) Make sure the referer_log and agent_log entries in the default
httpd.conf
file are also adjusted for the actual relative installation paths.
[Ralf S. Engelschall] PR#2175
1.76 +2 -2 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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mod_autoindex.c 1998/04/15 17:09:29 1.75
+++ mod_autoindex.c 1998/05/03 16:46:50 1.76
@@ -437,13 +437,13 @@
else if (!path_only) {
if (!content_encoding) {
if (p->type == BY_TYPE) {
- if (content_type && !ap_strcmp_match(content_type,
p->apply_to))
+ if (content_type && !ap_strcasecmp_match(content_type,
p->apply_to))
return p->data;
}
}
else {
if (p->type == BY_ENCODING) {
- if (!ap_strcmp_match(content_encoding, p->apply_to))
+ if (!ap_strcasecmp_match(content_encoding, p->apply_to))
return p->data;
}
}
cvs commit: apache-1.3/src/main http_log.c http_main.c
jim 98/05/03 10:17:01 Modified:.STATUS src CHANGES src/include httpd.h src/main http_log.c http_main.c Log: Submitted by: Jim Jagielski Reviewed by: Dean Gaudet, Ralf Engelschall If a child exits with a status of APEXIT_CHILDFATAL, the main httpd process will see this as a "things are totally hosed" and do a server abort, shutting down completely. This is to prevent situations where child errors prevent the server from running correctly and filling the logs up with messages. Revision ChangesPath 1.355 +2 -8 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.354 retrieving revision 1.355 diff -u -r1.354 -r1.355 --- STATUS1998/05/03 16:46:47 1.354 +++ STATUS1998/05/03 17:16:56 1.355 @@ -83,6 +83,8 @@ * Ben's WIN32: Extensive overhaul of the way UNCs are handled. * Ralf's fix for referer/agent log entries in installed httpd.conf, PR#2175 * Jim's fix for MIME type case sensitivity disparity, PR#2112 +* Child processes can now "signal" to the parent process that + it (the parent process) should abort, shutting down the server. Available Patches: @@ -147,14 +149,6 @@ errors. The respective flush_funcs also need to be exercised. o Jim's looked over the ap_snprintf() stuff (the changes that Dean did to make thread-safe) and they look fine. - -* The fatal errors that the children detect and fill up the log with - (such as bogus group id) need to be stopped. The proposed fix is to - make the child exit with a special code when a fatal error occurs; the - parent would then abort. See - <[EMAIL PROTECTED]> - [PATCH] <[EMAIL PROTECTED]> - Status: Jim, Dean +1, Ralf +1 * The DoS issue about symlinks to /dev/zero is still present. A device checker patch had been sent to the list a while ago. 1.811 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.810 retrieving revision 1.811 diff -u -r1.810 -r1.811 --- CHANGES 1998/05/03 16:46:48 1.810 +++ CHANGES 1998/05/03 17:16:57 1.811 @@ -1,5 +1,10 @@ Changes with Apache 1.3b7 + *) Child processes can now "signal" (by exiting with a status + of APEXIT_CHILDFATAL) the parent process to abort and + shutdown the server if the error in the child process was + fatal enough. [Jim Jagielski] + *) mod_autoindex's find_itme() was sensitive to MIME type case. [Jim Jagielski] PR#2112 1.207 +21 -0 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- httpd.h 1998/04/19 20:10:45 1.206 +++ httpd.h 1998/05/03 17:16:58 1.207 @@ -301,6 +301,27 @@ #endif /* + * Special Apache error codes. These are basically used + * in http_main.c so we can keep track of various errors. + * + * APEXIT_OK: + * A normal exit + * APEXIT_INIT: + * A fatal error arising during the server's init sequence + * APEXIT_CHILDINIT: + * The child died during it's init sequence + * APEXIT_CHILDFATAL: + * A fatal error, resulting in the whole server aborting. + * If a child exits with this error, the parent process + * considers this a server-wide fatal error and aborts. + * + */ +#define APEXIT_OK0x0 +#define APEXIT_INIT 0x2 +#define APEXIT_CHILDINIT 0x3 +#define APEXIT_CHILDFATAL0xf + +/* * (Unix, OS/2 only) * Interval, in microseconds, between scoreboard maintenance. During * each scoreboard maintenance cycle the parent decides if it needs to 1.55 +1 -0 apache-1.3/src/main/http_log.c Index: http_log.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_log.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- http_log.c1998/04/27 22:38:05 1.54 +++ http_log.c1998/05/03 17:16:59 1.55 @@ -177,6 +177,7 @@ execl (SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL); #endif exit (1); +/* NOT REACHED */ return(child_pid); } 1.329 +51 -40apache-1.3/src/main/http_main.c Index: http_main.c =
cvs commit: apache-1.3/src/include alloc.h ap.h buff.h compat.h conf.h explain.h fnmatch.h http_conf_globals.h http_config.h http_core.h http_log.h http_main.h http_protocol.h http_request.h http_vhost.h httpd.h md5.h multithread.h rfc1413.h scoreboard.h util_date.h util_md5.h util_script.h util_uri.h
jim 98/05/03 10:31:16
Modified:.STATUS
src CHANGES
src/include alloc.h ap.h buff.h compat.h conf.h explain.h
fnmatch.h http_conf_globals.h http_config.h
http_core.h http_log.h http_main.h http_protocol.h
http_request.h http_vhost.h httpd.h md5.h
multithread.h rfc1413.h scoreboard.h util_date.h
util_md5.h util_script.h util_uri.h
Log:
Submitted by: Michael Anderson's <[EMAIL PROTECTED]>
Reviewed by: Jim Jagielski, Dean Gaudet, Ben Laurie
Apache header files, and some variable name/types, are more C++ friendly
Revision ChangesPath
1.356 +1 -4 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- STATUS1998/05/03 17:16:56 1.355
+++ STATUS1998/05/03 17:31:02 1.356
@@ -85,16 +85,13 @@
* Jim's fix for MIME type case sensitivity disparity, PR#2112
* Child processes can now "signal" to the parent process that
it (the parent process) should abort, shutting down the server.
+* Michael Anderson's <[EMAIL PROTECTED]> C++ friendly patch
Available Patches:
* Dean's mod_alias.c, translate_alias_redir patch
<[EMAIL PROTECTED]>
Status: Dean, Ben, Jim +1
-
-* Michael Anderson's <[EMAIL PROTECTED]> C++ friendly patch
- <[EMAIL PROTECTED]>
- Status: Ben, Jim +1, Dean +1, Ralf +1
* Arnt Gulbrandsen <[EMAIL PROTECTED]> 03 Apr 1998 21:28:17 +0200
<[EMAIL PROTECTED]> mod_usertrack.c patch:
1.812 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -r1.811 -r1.812
--- CHANGES 1998/05/03 17:16:57 1.811
+++ CHANGES 1998/05/03 17:31:02 1.812
@@ -1,5 +1,8 @@
Changes with Apache 1.3b7
+ *) Make Apache header files, and some variables, C++ friendly.
+ [Michael Anderson's <[EMAIL PROTECTED]>]
+
*) Child processes can now "signal" (by exiting with a status
of APEXIT_CHILDFATAL) the parent process to abort and
shutdown the server if the error in the child process was
1.56 +10 -1 apache-1.3/src/include/alloc.h
Index: alloc.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/alloc.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- alloc.h 1998/04/11 12:00:18 1.55
+++ alloc.h 1998/05/03 17:31:06 1.56
@@ -58,6 +58,10 @@
#ifndef APACHE_ALLOC_H
#define APACHE_ALLOC_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Resource allocation routines...
*
@@ -85,6 +89,7 @@
#endif
typedef struct pool pool;
+typedef struct pool ap_pool;
pool * ap_init_alloc(void); /* Set up everything */
API_EXPORT(pool *) ap_make_sub_pool(pool *); /* All pools are subpools of
permanent_pool */
@@ -131,7 +136,7 @@
*/
typedef struct {
-pool *pool;
+ap_pool *pool;
int elt_size;
int nelts;
int nalloc;
@@ -310,5 +315,9 @@
API_EXPORT(long) ap_bytes_in_pool(pool *p);
API_EXPORT(long) ap_bytes_in_free_blocks(void);
+
+#ifdef __cplusplus
+}
+#endif
#endif /* !APACHE_ALLOC_H */
1.13 +8 -0 apache-1.3/src/include/ap.h
Index: ap.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/ap.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ap.h 1998/04/19 19:19:37 1.12
+++ ap.h 1998/05/03 17:31:06 1.13
@@ -61,6 +61,10 @@
#ifndef APACHE_AP_H
#define APACHE_AP_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
API_EXPORT(char *) ap_cpystrn(char *, const char *, size_t);
int ap_slack(int, int);
API_EXPORT(char *) ap_escape_quotes(pool *, const char *);
@@ -146,5 +150,9 @@
__attribute__((format(printf,3,4)));
API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
va_list ap);
+
+#ifdef __cplusplus
+}
+#endif
#endif /* !APACHE_AP_H */
1.39 +9 -1 apache-1.3/src/include/buff.h
Index: buff.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/buff
cvs commit: apache-1.3 STATUS
jim 98/05/04 19:38:36
Modified:.STATUS
Log:
Update 2 ShowStoppers, both of which have possible
fixes if I understand correctly
Revision ChangesPath
1.369 +10 -5 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- STATUS1998/05/04 16:07:29 1.368
+++ STATUS1998/05/05 02:38:35 1.369
@@ -11,8 +11,13 @@
FINAL RELEASE SHOWSTOPPERS:
-* proxy security fixes from 1.2.5 need to be brought forward
- Jim: What are these?
+* proxy security fixes from 1.2.5 need to be brought forward,
+ specifically:
+- if (strlen(x) < 30) {
++ if (strlen(x)+1 < 30) {
+x = ap_palloc(p, 30);
+}
+ in proxy_util.c.
* Someone other than Dean has to do a security/correctness review on
psprintf(), bprintf(), and ap_snprintf(). In particular these routines
@@ -23,9 +28,9 @@
* The DoS issue about symlinks to /dev/zero is still present.
A device checker patch had been sent to the list a while ago.
- Msg-Id: ?
- Jim: Couldn't we just use stat() and check the file-type?
-stats are expensive though...
+ PATCH: Make the code wrapped by unvoted_DISALLOW_DEVICE_ACCESS
+ the default in ap_pcfg_openfile()
+ Status: Martin +1, Jim +1, Brian +1
* get_path_info bug; ap_get_remote_host should be ap_vformatter instead.
See: <[EMAIL PROTECTED]>
cvs commit: apache-1.3 STATUS
jim 98/05/04 19:41:04 Modified:.STATUS Log: Update dates on 1.3b7 and 1.3.0. For 1.3.0, allow for another day after the weekend for feedback, since Mondays could be busy (as people look over the weekend performance) Revision ChangesPath 1.370 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.369 retrieving revision 1.370 diff -u -r1.369 -r1.370 --- STATUS1998/05/05 02:38:35 1.369 +++ STATUS1998/05/05 02:41:03 1.370 @@ -2,10 +2,10 @@ Release: -1.3.0: Shoot for May 16, 1998 Release! +1.3.0: Shoot for May 19, 1998 Release! Brian to be RM, Jim will do announcements -1.3b7: 1.3.0 release candidate for May 8th +1.3b7: 1.3.0 release candidate for May 11th 2.0 : In pre-alpha development, see apache-2.0 repository
cvs commit: apache-1.3/src/modules/proxy proxy_util.c
jim 98/05/04 19:57:34
Modified:.STATUS
src CHANGES
src/modules/proxy proxy_util.c
Log:
Submitted by: Jim Jagielski
Reviewed by: Brian Behlendorf
Fix off-by-one error in ap_proxy_date_canon() when we check to see
if 'x' is at least 30-chars wide.
Revision ChangesPath
1.371 +3 -7 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- STATUS1998/05/05 02:41:03 1.370
+++ STATUS1998/05/05 02:57:30 1.371
@@ -11,13 +11,9 @@
FINAL RELEASE SHOWSTOPPERS:
-* proxy security fixes from 1.2.5 need to be brought forward,
- specifically:
-- if (strlen(x) < 30) {
-+ if (strlen(x)+1 < 30) {
-x = ap_palloc(p, 30);
-}
- in proxy_util.c.
+* proxy security fixes from 1.2.5 need to be brought forward.
+ Note: off-by-one error in ap_proxy_date_canon() in
+proxy_util.c was fixed.
* Someone other than Dean has to do a security/correctness review on
psprintf(), bprintf(), and ap_snprintf(). In particular these routines
1.817 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.816
retrieving revision 1.817
diff -u -r1.816 -r1.817
--- CHANGES 1998/05/04 16:28:45 1.816
+++ CHANGES 1998/05/05 02:57:32 1.817
@@ -1,5 +1,8 @@
Changes with Apache 1.3b7
+ *) Fix off-by-one error in ap_proxy_date_canon() in proxy_util.c
+ when ensuring 'x' is at least 30-chars big.
+
*) Fix debug log messages for BS2000/OSD: instead of logging the whole
absolute path, only log base name of logging source as is done
in unix. [Martin Kraemer]
1.60 +1 -1 apache-1.3/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- proxy_util.c 1998/04/11 12:00:40 1.59
+++ proxy_util.c 1998/05/05 02:57:34 1.60
@@ -353,7 +353,7 @@
if (mon == 12)
return x;
-if (strlen(x) < 30)
+if (strlen(x)+1 < 30)
x = ap_palloc(p, 30);
ap_snprintf(x, 30, "%s, %.2d %s %d %.2d:%.2d:%.2d GMT",
ap_day_snames[wk], mday,
ap_month_snames[mon], year, hour, min, sec);
cvs commit: apache-1.3 STATUS
jim 98/05/05 03:44:01 Modified:.STATUS Log: Detail the files opened with ap_pcfg_openfile() Revision ChangesPath 1.373 +9 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.372 retrieving revision 1.373 diff -u -r1.372 -r1.373 --- STATUS1998/05/05 06:55:05 1.372 +++ STATUS1998/05/05 10:44:00 1.373 @@ -27,8 +27,15 @@ PATCH: Make the code wrapped by unvoted_DISALLOW_DEVICE_ACCESS the default in ap_pcfg_openfile() Status: Martin +1, Jim +1 - -- This still doesn't fix it for htpasswd files... how about other files - like the mime types file? +Brian: This still doesn't fix it for htpasswd files... + how about other files like the mime types file? + Jim: It looks like it does fix it for htpasswd (assuming + htpasswd files are accessed via get_pw()), and group + files (assuming accessed by groups_for_user()), the + mod_mime MIME-file, IMAP handler imap-file and digest + password file. What others are we concerned about? +Dean: ap_pcfg_openfile() should use pfopen() instead of + fopen(). Jim agrees. * get_path_info bug; ap_get_remote_host should be ap_vformatter instead. See: <[EMAIL PROTECTED]>
cvs commit: apache-1.3/src CHANGES
jim 98/05/05 18:19:13 Modified:src CHANGES Log: Oops... forgot names Revision ChangesPath 1.820 +2 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.819 retrieving revision 1.820 diff -u -r1.819 -r1.820 --- CHANGES 1998/05/05 04:49:56 1.819 +++ CHANGES 1998/05/06 01:19:11 1.820 @@ -11,7 +11,8 @@ 1.5% performance boost. [Dean Gaudet] *) Fix off-by-one error in ap_proxy_date_canon() in proxy_util.c - when ensuring 'x' is at least 30-chars big. + when ensuring 'x' is at least 30-chars big. [Jim Jagielski, + Brian Behlendorf] *) Fix debug log messages for BS2000/OSD: instead of logging the whole absolute path, only log base name of logging source as is done
cvs commit: apache-1.3 STATUS
jim 98/05/06 05:27:34 Modified:.STATUS Log: Yep to Ralf's Patch Revision ChangesPath 1.378 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- STATUS1998/05/06 04:46:27 1.377 +++ STATUS1998/05/06 12:27:33 1.378 @@ -16,7 +16,7 @@ order is correct even when the DSO mechanism is used. This is mainly achieved by fixing the AddModule command. See: http://www.engelschall.com/sw/apache/ [dsoexecorder] - Status: Ralf +1, Brian +1. + Status: Ralf +1, Brian +1, Jim +1 * Someone other than Dean has to do a security/correctness review on psprintf(), bprintf(), and ap_snprintf(). In particular these routines
cvs commit: apache-1.3 STATUS
jim 98/05/06 19:48:24 Modified:.STATUS Log: Add Ken's patch Revision ChangesPath 1.380 +6 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- STATUS1998/05/06 15:17:56 1.379 +++ STATUS1998/05/07 02:48:22 1.380 @@ -56,6 +56,12 @@ Available Patches: +* Ken's Adding the OS Type Patch + <[EMAIL PROTECTED]> + Status: Ken +1, Jim +1 (with Brian's suggested changes), + Martin +1, Brian +1 (change 'add_component' and + 'add_platform' to something a bit more clear) + * Ed Korthof's patch to fix protocol issues surrounding 400, 408, and 414 responses. <[EMAIL PROTECTED]>
cvs commit: apache-1.3/src/ap ap_snprintf.c
jim 98/05/07 06:13:54
Modified:src/ap ap_snprintf.c
Log:
Seems silly to remove the decimal point if we
know we'll be adding it later
Revision ChangesPath
1.23 +31 -30apache-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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ap_snprintf.c 1998/05/07 09:39:42 1.22
+++ ap_snprintf.c 1998/05/07 13:13:53 1.23
@@ -68,6 +68,33 @@
#include
#include
+typedef enum {
+NO = 0, YES = 1
+} boolean_e;
+
+#define FALSE0
+#define TRUE 1
+#define NUL '\0'
+#define INT_NULL ((int *)0)
+#define WIDE_INT long
+
+typedef WIDE_INT wide_int;
+typedef unsigned WIDE_INT u_wide_int;
+typedef int bool_int;
+
+#define S_NULL "(null)"
+#define S_NULL_LEN 6
+
+#define FLOAT_DIGITS 6
+#define EXPONENT_LENGTH 10
+
+/*
+ * NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
+ *
+ * XXX: this is a magic number; do not decrease it
+ */
+#define NUM_BUF_SIZE 512
+
/*
* cvt.c - IEEE floating point formatting routines for FreeBSD
* from GNU libc-4.6.27. Modified to be thread safe.
@@ -171,7 +198,7 @@
* minimal length string
*/
-static char *ap_gcvt(double number, int ndigit, char *buf)
+static char *ap_gcvt(double number, int ndigit, char *buf, boolean_e altform)
{
int sign, decpt;
register char *p1, *p2;
@@ -224,39 +251,12 @@
*p2++ = '.';
}
}
-if (p2[-1] == '.')
+if (p2[-1] == '.' && !altform)
p2--;
*p2 = '\0';
return (buf);
}
-typedef enum {
-NO = 0, YES = 1
-} boolean_e;
-
-#define FALSE0
-#define TRUE 1
-#define NUL '\0'
-#define INT_NULL ((int *)0)
-#define WIDE_INT long
-
-typedef WIDE_INT wide_int;
-typedef unsigned WIDE_INT u_wide_int;
-typedef int bool_int;
-
-#define S_NULL "(null)"
-#define S_NULL_LEN 6
-
-#define FLOAT_DIGITS 6
-#define EXPONENT_LENGTH 10
-
-/*
- * NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
- *
- * XXX: this is a magic number; do not decrease it
- */
-#define NUM_BUF_SIZE 512
-
/*
* The INS_CHAR macro inserts a character in the buffer and writes
* the buffer back to disk if necessary
@@ -799,7 +799,8 @@
/*
* * We use &num_buf[ 1 ], so that we have room for the sign
*/
- s = ap_gcvt(va_arg(ap, double), precision, &num_buf[1]);
+ s = ap_gcvt(va_arg(ap, double), precision, &num_buf[1],
+ alternate_form);
if (*s == '-')
prefix_char = *s++;
else if (print_sign)
cvs commit: apache-1.3/src CHANGES
jim 98/05/07 08:04:16 Modified:src CHANGES Log: The code still allows for SERVER_SUBVERSION Revision ChangesPath 1.832 +1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.831 retrieving revision 1.832 diff -u -r1.831 -r1.832 --- CHANGES 1998/05/07 12:24:22 1.831 +++ CHANGES 1998/05/07 15:04:14 1.832 @@ -2,7 +2,7 @@ *) Added the AddVersionComponent and AddVersionPlatform core directives. The first allows the addition of arbitrary text to the Server-Version - response header field value, replacing the SERVER_SUBVERSION define in + response header field value, augmenting the SERVER_SUBVERSION define in the Configuration file with run-time settings (more useful in a loadable-module environment). AddVersionPlatform inserts a comment such as "(UNIX)" or "(Win32)" into the server version string.
cvs commit: apache-1.3 STATUS
jim 98/05/08 04:55:11 Modified:.STATUS Log: Changes Revision ChangesPath 1.384 +6 -20 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- STATUS1998/05/08 03:17:00 1.383 +++ STATUS1998/05/08 11:55:11 1.384 @@ -142,7 +142,12 @@ apdefines.h: Open issues: - + +* What do to about SERVER_SUBVERSION now? + STATUS: + o Scrap it now that modules can use ap_add_version_component + Jim +1 (make sure this is clear :) ), Brian +1 + * Paul would like to see a 'gdbm' option because he uses it a lot. @@ -189,25 +194,6 @@ * Should we re-enable nagle now that we're non-buffering CGIs? See various messages from Marc in March 98. -* Listing the operating system's generic name (e.g. Irix, Win32) in - SERVER_VERSION: - o Looks like we want to do this... -Implementation: New API function, ap_add_version_component() -that takes a 'const char *' and tacks it onto the end -of the string returned by ap_get_server_version(). Would allow -modules to add their info at run-time, more closely tracking -reality for dynamically-loaded modules. - - o Do we want to scrap -DSERVER_SUBVERSION if modules can add -their contribution strings at run-time? - +1: Brian - -1: Ken - - o Debate: - Unix:Win32:OS/2 in '()' comment - +1: Jim, Martin, Alexei, Ken, Brian - Irix:AIX:FreeBSD in '()' comment - Win32 specific issues: In progress:
cvs commit: apache-1.3 STATUS
jim 98/05/08 06:36:10 Modified:.STATUS Log: Revision ChangesPath 1.386 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.385 retrieving revision 1.386 diff -u -r1.385 -r1.386 --- STATUS1998/05/08 12:09:44 1.385 +++ STATUS1998/05/08 13:36:09 1.386 @@ -31,7 +31,7 @@ mod_mime MIME-file, IMAP handler imap-file and digest password file. What others are we concerned about? Dean: ap_pcfg_openfile() should use pfopen() instead of - fopen(). Jim agrees. + fopen(). WIN32 1.3 FINAL RELEASE SHOWSTOPPERS:
cvs commit: apache-1.3 STATUS
jim 98/05/08 09:31:10 Modified:.STATUS Log: Have a patch which handles all the comments about the ap_pcfg_openfile 'family' Revision ChangesPath 1.387 +2 -12 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.386 retrieving revision 1.387 diff -u -r1.386 -r1.387 --- STATUS1998/05/08 13:36:09 1.386 +++ STATUS1998/05/08 16:31:09 1.387 @@ -20,18 +20,8 @@ * The DoS issue about symlinks to /dev/zero is still present. A device checker patch had been sent to the list a while ago. - PATCH: Make the code wrapped by unvoted_DISALLOW_DEVICE_ACCESS - the default in ap_pcfg_openfile() - Status: Martin +1, Jim +1 -Brian: This still doesn't fix it for htpasswd files... - how about other files like the mime types file? -Jim: It looks like it does fix it for htpasswd (assuming - htpasswd files are accessed via get_pw()), and group - files (assuming accessed by groups_for_user()), the - mod_mime MIME-file, IMAP handler imap-file and digest - password file. What others are we concerned about? -Dean: ap_pcfg_openfile() should use pfopen() instead of - fopen(). + PATCH: <[EMAIL PROTECTED]> + Status: Jim +1 WIN32 1.3 FINAL RELEASE SHOWSTOPPERS:
cvs commit: apache-1.3 STATUS
jim 98/05/08 14:53:25
Modified:.STATUS
Log:
Latest version of the patch
Revision ChangesPath
1.389 +1 -1 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- STATUS1998/05/08 19:06:08 1.388
+++ STATUS1998/05/08 21:53:25 1.389
@@ -20,7 +20,7 @@
* The DoS issue about symlinks to /dev/zero is still present.
A device checker patch had been sent to the list a while ago.
- PATCH: <[EMAIL PROTECTED]>
+ PATCH: <[EMAIL PROTECTED]>
Status: Jim +1
Dean: -0 I really don't like the API change.
cvs commit: apache-1.3/src/main http_main.c
jim 98/05/08 15:06:10
Modified:src/main http_main.c
Log:
Keep SERVER_SUBVERSION available
Revision ChangesPath
1.337 +3 -7 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- http_main.c 1998/05/08 15:57:28 1.336
+++ http_main.c 1998/05/08 22:06:08 1.337
@@ -391,10 +391,10 @@
static void ap_set_version()
{
if (ap_note_platform) {
-ap_add_version_component(SERVER_BASEVERSION " (" PLATFORM ")");
+ap_add_version_component(SERVER_VERSION " (" PLATFORM ")");
}
else {
-ap_add_version_component(SERVER_BASEVERSION);
+ap_add_version_component(SERVER_VERSION);
}
version_locked++;
}
@@ -3012,14 +3012,10 @@
static void show_compile_settings(void)
{
-#ifdef SERVER_SUBVERSION
printf("Server base version: %s\n", SERVER_BASEVERSION);
printf("Server sub-version: %s\n", SERVER_SUBVERSION);
+printf("Server Full version: %s\n", ap_get_server_version());
printf("Server built:%s\n", ap_get_server_built());
-#else
-printf("Server version: %s\n", ap_get_server_version());
-printf("Server built: %s\n", ap_get_server_built());
-#endif
printf("Server's Module Magic Number: %u\n", MODULE_MAGIC_NUMBER);
printf("Server compiled with\n");
#ifdef BIG_SECURITY_HOLE
cvs commit: apache-1.3/src/main http_main.c
jim 98/05/08 18:21:48
Modified:src/main http_main.c
Log:
Fix the order of how the server_version string is built... All extra
components are tacked to the _end_ of the string. The front of the
server_version string is always SERVER_BASEVERSION. So if we have
"Apache/1.3b7-dev (FreeBSD)"
and the code gets ap_add_version_component("PHP/3.0") we'd get:
"Apache/1.3b7-dev (FreeBSD) PHP/3.0"
Revision ChangesPath
1.340 +4 -4 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- http_main.c 1998/05/08 23:58:36 1.339
+++ http_main.c 1998/05/09 01:21:47 1.340
@@ -378,7 +378,7 @@
/*
* Prepend the given component identifier to the existing string
*/
- server_version = ap_pstrcat(pconf, component, " ", server_version,
+ server_version = ap_pstrcat(pconf, server_version, " ", component,
NULL);
}
}
@@ -390,15 +390,15 @@
*/
static void ap_set_version()
{
-#ifdef SERVER_SUBVERSION
-ap_add_version_component(SERVER_SUBVERSION);
-#endif
if (ap_note_platform) {
ap_add_version_component(SERVER_BASEVERSION " (" PLATFORM ")");
}
else {
ap_add_version_component(SERVER_BASEVERSION);
}
+#ifdef SERVER_SUBVERSION
+ap_add_version_component(SERVER_SUBVERSION);
+#endif
version_locked++;
}
cvs commit: apache-1.3 STATUS
jim 98/05/08 18:23:12 Modified:.STATUS Log: Some votes Revision ChangesPath 1.391 +1 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.390 retrieving revision 1.391 diff -u -r1.390 -r1.391 --- STATUS1998/05/09 00:17:38 1.390 +++ STATUS1998/05/09 01:23:12 1.391 @@ -21,8 +21,7 @@ * The DoS issue about symlinks to /dev/zero is still present. A device checker patch had been sent to the list a while ago. PATCH: <[EMAIL PROTECTED]> - Status: Jim +1 -Dean: -0 I really don't like the API change. + Status: Jim +1, Brian +1, Dean +1 (ASSUMED: the API is intact) WIN32 1.3 FINAL RELEASE SHOWSTOPPERS:
cvs commit: apache-1.3/src/main util.c
jim 98/05/09 07:27:27
Modified:.STATUS
src CHANGES
src/include httpd.h
src/main util.c
Log:
Submitted by: Jim Jagielski
Reviewed by: Dean Gaudet, Martin Kraemer, Brian Behlendorf
Disallow non-/dev/null device files to be used for ``configuration''
files (this includes htaccess, htpasswd and the mod_mime file). Also,
open these using ap_pfopen to better handle timeouts.
Revision ChangesPath
1.393 +0 -5 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- STATUS1998/05/09 02:28:31 1.392
+++ STATUS1998/05/09 14:27:22 1.393
@@ -18,11 +18,6 @@
o Jim's looked over the ap_snprintf() stuff (the changes that Dean
did to make thread-safe) and they look fine.
-* The DoS issue about symlinks to /dev/zero is still present.
- A device checker patch had been sent to the list a while ago.
- PATCH: <[EMAIL PROTECTED]>
- Status: Jim +1, Brian +1, Dean +1 (ASSUMED: the API is intact)
-
WIN32 1.3 FINAL RELEASE SHOWSTOPPERS:
* SECURITY: check if the magic con/aux/nul/etc names do anything
1.838 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- CHANGES 1998/05/09 03:25:40 1.837
+++ CHANGES 1998/05/09 14:27:24 1.838
@@ -1,5 +1,11 @@
Changes with Apache 1.3b7
+ *) When opening "configuration" files (like httpd.conf, htaccess
+ and htpasswd), Apache will not allow them to be non-/dev/null
+ device files. This closes a DoS hole. At the same time,
+ we use ap_pfopen to open these files to handle timeouts.
+ [Jim Jagielski, Martin Kraemer]
+
*) Apache will now log the reason its httpd children exit if they exit
due to an unexpected signal. (It requires a new porting define,
SYS_SIGLIST, which if defined should point to a list of text
1.211 +10 -4 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- httpd.h 1998/05/07 12:24:24 1.210
+++ httpd.h 1998/05/09 14:27:26 1.211
@@ -905,12 +905,18 @@
typedef struct {
int (*getch) (void *param); /* a getc()-like function */
void *(*getstr) (void *buf, size_t bufsiz, void *param); /* a
fgets()-like function */
-int (*close) (void *param); /* a fclose()-like function */
-void *param; /* the argument passed to getc()/close()/gets()
*/
+int (*close) (void *param); /* a close hander function */
+void *param; /* the argument passed to getch/getstr/close */
const char *name;/* the filename / description */
unsigned line_number;/* current line number, starting at 1 */
} configfile_t;
+/* Common structure that holds the file and pool for ap_pcfg_openfile */
+typedef struct {
+struct pool *pool;
+FILE *file;
+} poolfile_t;
+
/* Open a configfile_t as FILE, return open configfile_t struct pointer */
API_EXPORT(configfile_t *) ap_pcfg_openfile(pool *p, const char *name);
@@ -919,7 +925,7 @@
void *param,
int(*getc_func)(void*),
void *(*gets_func) (void *buf, size_t bufsiz, void *param),
-int(*close_func)(void*));
+int(*close_func)(void *param));
/* Read one line from open configfile_t, strip LF, increase line number */
API_EXPORT(int) ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp);
@@ -928,7 +934,7 @@
API_EXPORT(int) ap_cfg_getc(configfile_t *cfp);
/* Detach from open configfile_t, calling the close handler */
-API_EXPORT(int) ap_cfg_closefile(configfile_t *fp);
+API_EXPORT(int) ap_cfg_closefile(configfile_t *cfp);
#ifdef NEED_STRERROR
char *strerror(int err);
1.115 +41 -25apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- util.c1998/05/06 19:47:08 1.114
+++ util.c1998/05/09 14:27:27 1.115
@@ -698,15 +698,39 @@
return res;
}
+API_EXPORT(int) ap_cfg_closefile(configfile_t *cfp)
+{
+#ifdef DEBUG
+ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO
cvs commit: apache-1.3 STATUS
jim 98/05/10 10:19:03 Modified:.STATUS Log: I think this whole Server/SUBVERSION debate needs to be hashed out before we release (?) Revision ChangesPath 1.394 +10 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.393 retrieving revision 1.394 diff -u -r1.393 -r1.394 --- STATUS1998/05/09 14:27:22 1.393 +++ STATUS1998/05/10 17:19:01 1.394 @@ -18,6 +18,16 @@ o Jim's looked over the ap_snprintf() stuff (the changes that Dean did to make thread-safe) and they look fine. +* The whole SERVER_SUBVERSION, Server: token debate. + Problem: currently the additional tokens show up in the + reverse order that they were added. Also, no real control + over whether to display them or not. Keeping SERVER_SUBVERSION + available "conflicts" with the new ap_add_version_component() + function. + Available patch: + <[EMAIL PROTECTED]> + Status: + WIN32 1.3 FINAL RELEASE SHOWSTOPPERS: * SECURITY: check if the magic con/aux/nul/etc names do anything
cvs commit: apache-1.3/src/main http_core.c http_main.c
jim 98/05/11 13:08:10
Modified:.STATUS
htdocs/manual new_features_1_3.html
htdocs/manual/mod core.html
src CHANGES
src/include http_conf_globals.h httpd.h
src/main http_core.c http_main.c
Log:
Submitted by: Jim Jagielski
Replace the AddVersionPlatform directive with ServerTokens directive
which allow for either Minimal ("Apache/1.3.0"), OS ("Apache/1.3.0 (UNIX)")
or Full ("Apache/1.3.0 (UNIX) PHP/3.0") type Server headers.
SERVER_SUBVERSION is no longer supported.
Revision ChangesPath
1.395 +0 -10 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- STATUS1998/05/10 17:19:01 1.394
+++ STATUS1998/05/11 20:08:02 1.395
@@ -18,16 +18,6 @@
o Jim's looked over the ap_snprintf() stuff (the changes that Dean
did to make thread-safe) and they look fine.
-* The whole SERVER_SUBVERSION, Server: token debate.
- Problem: currently the additional tokens show up in the
- reverse order that they were added. Also, no real control
- over whether to display them or not. Keeping SERVER_SUBVERSION
- available "conflicts" with the new ap_add_version_component()
- function.
- Available patch:
- <[EMAIL PROTECTED]>
- Status:
-
WIN32 1.3 FINAL RELEASE SHOWSTOPPERS:
* SECURITY: check if the magic con/aux/nul/etc names do anything
1.58 +8 -9 apache-1.3/htdocs/manual/new_features_1_3.html
Index: new_features_1_3.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- new_features_1_3.html 1998/05/09 04:42:25 1.57
+++ new_features_1_3.html 1998/05/11 20:08:03 1.58
@@ -639,18 +639,17 @@
configuration.
Including the operating system in the server
identity
- A new directive, AddVersionPlatform, allows the Webmaster
- to change the value of
- the Server response header field which is sent back
- to clients. The AddVersionPlatform directive controls
- whether the server will
- include a non-specific note in the server identity about the type of
- operating system on which the server is running. As of Apache 1.3, this
- additional information is included by default.
+ A new directive, ServerTokens, allows the Webmaster
+ to change the value of the Server response header
+ field which is sent back to clients. The ServerTokens
+ directive controls whether the server will include a non-specific
+ note in the server identity about the type of operating system on
+ which the server is running as well as included module information.
+ As of Apache 1.3, this additional information is included by default.
1.116 +51 -47apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- core.html 1998/05/09 04:42:27 1.115
+++ core.html 1998/05/11 20:08:04 1.116
@@ -24,7 +24,6 @@
AccessConfig
AccessFileName
AddModule
-AddVersionPlatform
AllowOverride
AuthName
AuthType
@@ -78,6 +77,7 @@
ServerPath
ServerRoot
ServerSignature
+ServerTokens
ServerType
StartServers
ThreadsPerChild
@@ -179,52 +179,6 @@
be cleared with the ClearModuleList
directive.
-AddVersionPlatform directive
-
-Syntax: AddVersionPlatform On|Off
-Context: server config
-Status: core
-Compatibility: AddVersionPlatform is only available
- in Apache 1.3 and later
-
-
-This directive controls whether the server's operating system platform
-will be identified in the Server response header
-field which is sent back to clients. If enabled, a non-specific platform
-designation will be added to the identity string, as shown below:
-
-
- AddVersionPlatform Off
-
- Server sends: Server: Apache/1.3.0
-
- AddVersionPlatform On (or not specified)
-
- Server sends: Server: Apache/1.3.0 (UNIX)
-
-
-
-This setting applies to the entire server, and cannot be enabled or
-disabled on a virtualhost-by-virtualhost basis.
-
-
-By default, this information is included in the server
-identity string.
-
-
-
AllowOverride directive
EMail setting additionally creates a "mailto:";
reference to the ServerAdmin of
cvs commit: apache-1.3/src/os/unix os.h
jim 98/05/13 18:22:52 Modified:src/os/unix os.h Log: Avoid nasty trademarks Revision ChangesPath 1.24 +1 -1 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- os.h 1998/05/07 12:24:30 1.23 +++ os.h 1998/05/14 01:22:52 1.24 @@ -58,7 +58,7 @@ #ifndef APACHE_OS_H #define APACHE_OS_H -#define PLATFORM "UNIX" +#define PLATFORM "Unix" /* * This file in included in all Apache source code. It contains definitions
cvs commit: apache-1.3/src/main http_core.c
jim 98/05/28 08:28:14 Modified:src/main http_core.c Log: Oops... it's called ServerTokens now Revision ChangesPath 1.203 +1 -1 apache-1.3/src/main/http_core.c Index: http_core.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- http_core.c 1998/05/27 14:01:33 1.202 +++ http_core.c 1998/05/28 15:28:13 1.203 @@ -1873,7 +1873,7 @@ /* * Handle a request to include the server's OS platform in the Server - * response header field (the AddVersionPlatform directive). Unfortunately + * response header field (the ServerTokens directive). Unfortunately * this requires a new global in order to communicate the setting back to * http_main so it can insert the information in the right place in the * string.
cvs commit: apache-1.3/htdocs/manual/mod directives.html
jim 98/05/28 19:55:17 Modified:htdocs/manual/mod directives.html Log: Add the ServerTokens to the main directive list Revision ChangesPath 1.45 +1 -0 apache-1.3/htdocs/manual/mod/directives.html Index: directives.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- directives.html 1998/05/04 16:46:38 1.44 +++ directives.html 1998/05/29 02:55:17 1.45 @@ -187,6 +187,7 @@ ServerPath ServerRoot ServerSignature +ServerTokens ServerType SetEnv SetEnvIf
cvs commit: apache-1.3/htdocs/manual new_features_1_3.html
jim 98/05/29 05:07:06 Modified:htdocs/manual new_features_1_3.html Log: Some new-stuff notes Revision ChangesPath 1.66 +13 -6 apache-1.3/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- new_features_1_3.html 1998/05/28 22:09:41 1.65 +++ new_features_1_3.html 1998/05/29 12:07:05 1.66 @@ -463,6 +463,14 @@ ap_spawn_child and spawn_child_err_buff with simply ap_bspawn_child. +ap_add_version_component() +This API function allows for modules to add their own additional +server tokens which are printed on the on the Server: +header line. Previous 1.3beta versions had used a +SERVER_SUBVERSION compile-time #define +to perform this function. Whether the tokens are actually displayed +is controlled by the new ServerTokens directive. + @@ -573,12 +581,11 @@ system in the server identity A new directive, ServerTokens, allows the Webmaster to change the value of the Server response header -field which is sent back to clients. The -ServerTokens directive controls whether the server -will include a non-specific note in the server identity about the -type of operating system on which the server is running as well as -included module information. As of Apache 1.3, this additional -information is included by default. +field which is sent back to clients. The ServerTokens +directive controls whether the server will include a non-specific +note in the server identity about the type of operating system on +which the server is running as well as included module information. +As of Apache 1.3, this additional information is included by default.
cvs commit: apache-1.3/htdocs/manual/misc perf-bsd44.html
jim 98/05/29 08:33:20 Modified:htdocs/manual/misc perf-bsd44.html Log: Have people use sysctl to adjust somaxconn instead of the bogus and incorrect method we suggested before Revision ChangesPath 1.12 +21 -5 apache-1.3/htdocs/manual/misc/perf-bsd44.html Index: perf-bsd44.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/perf-bsd44.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perf-bsd44.html 1998/05/20 20:21:30 1.11 +++ perf-bsd44.html 1998/05/29 15:33:19 1.12 @@ -112,7 +112,6 @@ # Network options. NMBCLUSTERS defines the number of mbuf clusters and # defaults to 256. This machine is a server that handles lots of traffic, # so we crank that value. -options SOMAXCONN=256 # max pending connects options NMBCLUSTERS=4096# mbuf clusters at 4096 # @@ -122,10 +121,6 @@ options OPEN_MAX=512# maximum fds (breaks RPC svcs) -SOMAXCONN is not derived from maxusers, so you'll always need to increase -that yourself. We used a value guaranteed to be larger than Apache's -default for the listen() of 128, currently. - In many cases, NMBCLUSTERS must be set much larger than would appear @@ -160,6 +155,27 @@ files). If you've got a lot of other activity besides httpd on the same machine, you'll have to set NPROC higher still. In this example, the NPROC value derived from maxusers proved sufficient for our load. + + + +To increase the size of the listen() queue, you need to +adjust the value of SOMAXCONN. SOMAXCONN is not derived from maxusers, +so you'll always need to increase that yourself. We use a value guaranteed +to be larger than Apache's default for the listen() of 128, currently. +The actual value for SOMAXCONN is set in sys/socket.h. +The best way to adjust this parameter is run-time, rather than changing +it in this header file and thus hardcoding a value in the kernel and +elsewhere. To do this, edit /etc/rc.local and add the +following line: + +/usr/sbin/sysctl -w kern.somaxconn=256 + + + + +We used 256 but you can tune it for your own setup. In +many cases, however, even the default value of 128 (for +later versions of FreeBSD) is OK.
cvs commit: apache-1.3 STATUS
jim 98/05/29 17:13:05 Modified:.STATUS Log: Update Revision ChangesPath 1.410 +5 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.409 retrieving revision 1.410 diff -u -r1.409 -r1.410 --- STATUS1998/05/29 09:27:21 1.409 +++ STATUS1998/05/30 00:13:04 1.410 @@ -2,8 +2,11 @@ Release: -1.3.0: Shoot for June 1st, 1998 Release - Brian to be RM, Jim will do announcements +1.3.0: Current plan is to roll the tarball June 1 (~5pm eastern) + and then release it on the 5th. Jim will roll and tag +on the 1st. Everyone should test the tarball so we're +sure the tarball is ready for the 5th. Jim will announce +as well. 1.3b7: Released 26/5/98. If no major errors, will become 1.3.0
cvs commit: apache-1.3 STATUS
jim 98/05/30 07:00:31 Modified:.STATUS Log: Clarify that we'll be using 1.3b8-dev Revision ChangesPath 1.412 +6 -5 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.411 retrieving revision 1.412 diff -u -r1.411 -r1.412 --- STATUS1998/05/30 11:29:17 1.411 +++ STATUS1998/05/30 14:00:30 1.412 @@ -3,12 +3,13 @@ Release: 1.3.0: Current plan is to roll the tarball June 1 (~5pm eastern) - and then release it on the 5th. Jim will roll and tag -on the 1st. Everyone should test the tarball so we're -sure the tarball is ready for the 5th. Jim will announce -as well. + and then release it on the 5th. The tarball will be the + current CVS tree (1.3b8-dev) as of that date/time. + Jim will roll and tag on the 1st. Everyone should test + the tarball so we're sure the tarball is ready for the 5th. + Jim will announce as well. -1.3b7: Released 26/5/98. If no major errors, will become 1.3.0 +1.3b7: Tagged and Released 26/5/98. 2.0 : In pre-alpha development, see apache-2.0 repository
cvs commit: apache-1.3/src/main util.c
jim 98/06/01 11:20:31
Modified:src/main util.c
Log:
WIN32/NT uses 'nul' as it's universal
'/dev/null' file, so we should special-case that for valid config-file
device files
Revision ChangesPath
1.118 +7 -3 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- util.c1998/05/28 19:57:11 1.117
+++ util.c1998/06/01 18:20:30 1.118
@@ -753,9 +753,13 @@
if (file == NULL)
return NULL;
-if (strcmp(name, "/dev/null") != 0 &&
-fstat(fileno(file), &stbuf) == 0 &&
-!S_ISREG(stbuf.st_mode)) {
+if (fstat(fileno(file), &stbuf) == 0 &&
+!S_ISREG(stbuf.st_mode) &&
+#ifdef WIN32
+strcasecmp(name, "nul") != 0) {
+#else
+strcmp(name, "/dev/null") != 0) {
+#endif
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, NULL,
"Access to file %s denied by server: not a regular file",
name);
cvs commit: apache-1.3/src/os/win32 registry.c
jim 98/06/01 15:18:44
Modified:.Announcement
src/include httpd.h
src/os/win32 registry.c
Log:
Ready to tag and roll 1.3.0
Revision ChangesPath
1.23 +9 -56 apache-1.3/Announcement
Index: Announcement
===
RCS file: /export/home/cvs/apache-1.3/Announcement,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Announcement 1998/05/21 20:45:23 1.22
+++ Announcement 1998/06/01 22:18:42 1.23
@@ -1,15 +1,9 @@
- Apache 1.3 Beta 7 Released
- ==
+ Apache 1.3.0 Released
+ =
- The Apache Group is pleased to announce the release of the 1.3b7 version
- of Apache, the latest beta release of the Apache HTTP server. 1.3b7 is
- a second 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.3b7 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.
+ The Apache Group is pleased to announce the release of the long
+ awaited 1.3.0 version of the Apache HTTP server.
To grab the latest Apache distribution, check out
http://www.apache.org/dist/
@@ -18,52 +12,11 @@
For a full list of specific code changes see src/CHANGES.
- For an overview of new features in 1.2 please read the CHANGES file
+ For an overview of new features in 1.3 please read the CHANGES file
in the distribution and the "New Features with Apache 1.3" document at
http://www.apache.org/docs/new_features_1_3.html
- Major changes with this beta:
- HTTP: fixes for 400 and 408 error codes.
- WIN32: Child process spawning now uses native Win32 API.
-This should address many problems people have had
- on Win32 - it also forced us to modify the
- related child_spawn calls in the Apache API.
- Other various stability fixes.
- Extensive overhaul of the way UNCs are handled.
- Various mod_rewrite fixes.
- Various makefile cleanups.
- Various APACI changes.
- Various DSO cleanups, better support for AIX, OpenBSD, NetBSD
- Server's OS family now reported in Server: strings.
- PORT: added support for NCR MP/RAS 3.0
- Security: we now make sure all config files opened by Apache are not
-special devices.
- Added "-s" command line option to dump out vhost settings.
-
- Contributing code to this beta:
- Ralf S. Engelschall <[EMAIL PROTECTED]>
- Ed Korthof <[EMAIL PROTECTED]>
- Rick Ohnemus <[EMAIL PROTECTED]>
- Brian Behlendorf <[EMAIL PROTECTED]>
- Bob Beck <[EMAIL PROTECTED]>
- Ben Laurie <[EMAIL PROTECTED]>
- Bill Stoddard <[EMAIL PROTECTED]>
- Ernst Kloppenburg <[EMAIL PROTECTED]>
- John Withers <[EMAIL PROTECTED]>
- Jim Patterson <[EMAIL PROTECTED]>
- Jim Jagielski <[EMAIL PROTECTED]>
- Martin Kraemer <[EMAIL PROTECTED]>
- Dean Gaudet <[EMAIL PROTECTED]>
- Paul Eggert <[EMAIL PROTECTED]>
- Lars Eilebrecht <[EMAIL PROTECTED]>
- [EMAIL PROTECTED]
- Kari Likovuori <[EMAIL PROTECTED]>
- Michael Anderson's <[EMAIL PROTECTED]
- Jaromir Dolecek <[EMAIL PROTECTED]>
- Roy Fielding <[EMAIL PROTECTED]>
- David MacKenzie <[EMAIL PROTECTED]>
- Francisco Tomei <[EMAIL PROTECTED]>
- Jens Schleusener <[EMAIL PROTECTED]>
- Jeff Earickson <[EMAIL PROTECTED]>
- Marc Slemko <[EMAIL PROTECTED]>
-
+ In general, Apache 1.3.0 offers several substantial improvements
+ over previous versions, including better performance, reliability
+ and a wider-range of supported platforms, including Windows95 and
+ NT.
1.219 +2 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- httpd.h 1998/05/29 00:15:56 1.218
+++ httpd.h 1998/06/01 22:18:43 1.219
@@ -382,7 +382,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3b8-dev"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.0"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -397,7 +397,7 @@
/* Numeric release version identifier: major minor bugfix betaseq
* Always increases
cvs commit: apache-1.3/src/os/win32 registry.c
jim 98/06/01 15:23:42
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
And bump up
Revision ChangesPath
1.220 +2 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- httpd.h 1998/06/01 22:18:43 1.219
+++ httpd.h 1998/06/01 22:23:40 1.220
@@ -382,7 +382,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.0"/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.1-b1" /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -397,7 +397,7 @@
/* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
-#define APACHE_RELEASE 103
+#define APACHE_RELEASE 1030101
#define SERVER_PROTOCOL "HTTP/1.1"
#ifndef SERVER_SUPPORT
1.5 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- registry.c1998/06/01 22:18:44 1.4
+++ registry.c1998/06/01 22:23:42 1.5
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.0"
+#define VERSION "1.3.1 beta"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
jim 98/06/02 04:24:39
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
Oops... wrong naming scheme
Revision ChangesPath
1.221 +1 -1 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- httpd.h 1998/06/01 22:23:40 1.220
+++ httpd.h 1998/06/02 11:24:38 1.221
@@ -382,7 +382,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3.1-b1" /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3.1-dev"/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
1.6 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- registry.c1998/06/01 22:23:42 1.5
+++ registry.c1998/06/02 11:24:39 1.6
@@ -28,7 +28,7 @@
#define VENDOR "Apache Group"
#define SOFTWARE "Apache"
-#define VERSION "1.3.1 beta"
+#define VERSION "1.3.1 dev"
#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
cvs commit: apache-1.3 Announcement
jim 98/06/05 13:54:50 Modified:.Announcement Log: The quote Revision ChangesPath 1.24 +3 -1 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Announcement 1998/06/01 22:18:42 1.23 +++ Announcement 1998/06/05 20:54:49 1.24 @@ -3,7 +3,9 @@ = The Apache Group is pleased to announce the release of the long - awaited 1.3.0 version of the Apache HTTP server. + awaited 1.3.0 version of the Apache HTTP server. 18 months, 1500 + bug reports, 500 patches, and 150 total code contributors helped + make the release of 1.3.0 a reality. To grab the latest Apache distribution, check out http://www.apache.org/dist/
cvs commit: apache-1.3 Announcement
jim 98/06/05 14:03:39 Modified:.Announcement Log: More copy Revision ChangesPath 1.25 +14 -3 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Announcement 1998/06/05 20:54:49 1.24 +++ Announcement 1998/06/05 21:03:38 1.25 @@ -7,18 +7,29 @@ bug reports, 500 patches, and 150 total code contributors helped make the release of 1.3.0 a reality. + Apache 1.3.0 is the most stable version of Apache currently available; + everyone running 1.2.X servers or earlier should upgrade to 1.3, as we + will stop providing support for the 1.2.X tree, though we may make a + release of 1.2.7. At present, the Win95/NT port of Apache is not + as stable as the UNIX version. Further releases of the 1.3.x tree + will bring the Win95/NT port closer to parity. + To grab the latest Apache distribution, check out http://www.apache.org/dist/ and the huge list of available "International Mirror Sites" at http://www.apache.org/mirrors/ - For a full list of specific code changes see src/CHANGES. - For an overview of new features in 1.3 please read the CHANGES file - in the distribution and the "New Features with Apache 1.3" document at + in the distribution and the "New Features with Apache 1.3" document at: + + http://www.apache.org/dist/CHANGES http://www.apache.org/docs/new_features_1_3.html In general, Apache 1.3.0 offers several substantial improvements over previous versions, including better performance, reliability and a wider-range of supported platforms, including Windows95 and NT. + + Apache is the most popular web-server in the known universe; over + half of the servers on the Internet are running Apache or one of it's + variants.
cvs commit: apache-1.3 Announcement
jim 98/06/05 18:02:26 Modified:.Announcement Log: be fuzzy Revision ChangesPath 1.26 +3 -3 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Announcement 1998/06/05 21:03:38 1.25 +++ Announcement 1998/06/06 01:02:25 1.26 @@ -3,9 +3,9 @@ = The Apache Group is pleased to announce the release of the long - awaited 1.3.0 version of the Apache HTTP server. 18 months, 1500 - bug reports, 500 patches, and 150 total code contributors helped - make the release of 1.3.0 a reality. + awaited 1.3.0 version of the Apache HTTP server. 12 months, hundreds + of patches and several dozen of total code contributors helped make the + release of 1.3.0 a reality. Apache 1.3.0 is the most stable version of Apache currently available; everyone running 1.2.X servers or earlier should upgrade to 1.3, as we
cvs commit: apache-1.3 Announcement
jim 98/06/05 19:00:11 Modified:.Announcement Log: Avoid numbers :) Revision ChangesPath 1.28 +2 -2 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Announcement 1998/06/06 01:47:33 1.27 +++ Announcement 1998/06/06 02:00:10 1.28 @@ -3,8 +3,8 @@ = The Apache Group is pleased to announce the release of the long - awaited 1.3.0 version of the Apache HTTP server. 12 months, hundreds - of patches and over 100 total code contributors helped make the + awaited 1.3.0 version of the Apache HTTP server. A dozen months, + hundreds of patches and over 5 score code contributors helped make the release of 1.3.0 a reality. Apache 1.3.0 is the most stable version of Apache currently available;
cvs commit: apache-1.3/src/include httpd.h
jim 98/06/06 18:22:37 Modified:src/include httpd.h Log: Formalise in the comments the use of betaseq Revision ChangesPath 1.222 +2 -0 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- httpd.h 1998/06/02 11:24:38 1.221 +++ httpd.h 1998/06/07 01:22:36 1.222 @@ -396,6 +396,8 @@ /* Numeric release version identifier: major minor bugfix betaseq * Always increases along the same track as the source branch. + * For a final release, 'betaseq' should be set to '99'. + * For example, Apache 1.4.2 should be '1040299' */ #define APACHE_RELEASE 1030101
cvs commit: apache-1.3/htdocs/manual/misc FAQ.html
jim 98/06/06 18:33:57 Modified:htdocs/manual/misc FAQ.html Log: Most will ask this when going to 1.3.0 Revision ChangesPath 1.120 +3 -3 apache-1.3/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/FAQ.html,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- FAQ.html 1998/06/06 15:39:26 1.119 +++ FAQ.html 1998/06/07 01:33:52 1.120 @@ -14,7 +14,7 @@ Apache Server Frequently Asked Questions - $Revision: 1.119 $ ($Date: 1998/06/06 15:39:26 $) + $Revision: 1.120 $ ($Date: 1998/06/07 01:33:52 $) The latest version of this FAQ is always available from the main @@ -260,7 +260,7 @@ Is Apache Year 2000 compliant? - I upgraded to Apache 1.3b and now my + I upgraded to Apache 1.3.0 and now my virtual hosts don't work! I'm using RedHat Linux and I have problems with httpd @@ -2040,7 +2040,7 @@ - I upgraded to Apache 1.3b and now my virtual hosts don't + I upgraded to Apache 1.3.0 and now my virtual hosts don't work!
cvs commit: apache-devsite binbuild.sh
jim 98/06/06 18:37:31 Modified:.binbuild.sh Log: Update for 1.3.0 and recall that stuff in support needs libs from the actual httpd build, so move it down to after httpd is built Revision ChangesPath 1.4 +8 -9 apache-devsite/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-devsite/binbuild.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- binbuild.sh 1998/01/06 00:39:38 1.3 +++ binbuild.sh 1998/06/07 01:37:30 1.4 @@ -14,7 +14,7 @@ #releases. # # -# $Id: binbuild.sh,v 1.3 1998/01/06 00:39:38 marc Exp $ +# $Id: binbuild.sh,v 1.4 1998/06/07 01:37:30 jim Exp $ # Marc Slemko ([EMAIL PROTECTED]) # # Script to make Apache binary releases. The below variables must be @@ -29,7 +29,7 @@ # release is the release of the Apache version that is being built. # It must also be the base name of the tarball and the name of the # directory that it is untarred into -release=apache_1.2.5 +release=apache_1.3.0 dir=$release # conf is the Configuration file that you wish to use to build httpd conf=Configuration @@ -55,22 +55,21 @@ # particularily nice names but because it is easy system=`./$release/src/helpers/GuessOS | sed 's/\//_/g'` || exit 1 -cp $conf $dir/src/Configuration || exit 1 cd $dir/src || exit 1 echo running Configure ./Configure || exit 1 -echo making binaries in support -cd ../support || exit 1 -# no, we don't make suexec or worry too much about errors here -# Marc is lazy. -make -cd ../src || exit 1 echo attempting to make httpd make 2>&1 | tee ../../make.out-$system if [ ! -f httpd ] ; then echo error: httpd binary not made exit 1 fi +echo making binaries in support +cd ./support || exit 1 +# no, we don't make suexec or worry too much about errors here +# Marc is lazy. +make +cd .. || exit 1 echo make succeeded, saving the binary and doing a make clean mv httpd httpd-$system make clean || exit 1
cvs commit: apache-devsite how-to-release.html
jim 98/06/06 18:49:59
Modified:.how-to-release.html
Log:
Some changes
Revision ChangesPath
1.41 +11 -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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- how-to-release.html 1998/06/06 14:03:50 1.40
+++ how-to-release.html 1998/06/07 01:49:58 1.41
@@ -71,7 +71,10 @@
[ Posting the Announcement ]
- Once built, Announcement should be
+ Once the tarball is built, give the mirrors a good 24 hours
+ to get up to sync. This is really important if this this
+ a final (i.e.: non-beta) release.
+ Now, Announcement should be
posted to the following places:
Unmoderated UseNet newsgroups (should be crossposted)
@@ -91,6 +94,10 @@
+ Make sure that Announcement.txt and
+ Announcement.html in apache-site
+ in the dist directory are updated to include
+ these changes.
Bask in the glow
@@ -125,8 +132,9 @@
from ``Apache/1.X.Y-dev'' to
``Apache/1.X.Y''. Then also change
APACHE_RELEASE in same file from
- ``1XXYYZZ'' to ``1XXYY99''. The format is
- something like printf("%d%02d%02d%02d", major, minor, bugfix,
+ ``1XXYYZZ'' to ``1XXYY99''.
+ The format is something like
+ printf("%d%02d%02d%02d", major, minor, bugfix,
betaseq).
$ vi src/include/httpd.h
$ cvs commit src/include/httpd.h
cvs commit: apache-1.3 STATUS
jim 98/06/07 08:13:20 Modified:.STATUS Log: Some updates to STATUS Revision ChangesPath 1.418 +13 -24apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.417 retrieving revision 1.418 diff -u -r1.417 -r1.418 --- STATUS1998/06/05 21:13:28 1.417 +++ STATUS1998/06/07 15:13:19 1.418 @@ -2,31 +2,10 @@ Release: -1.3.0: Tagged and rolled on June 1. - - Plan now is to release it on the 5th. Everyone should test the - tarball so we're sure the tarball is ready for the 5th. Jim will - announce as well. Already known successful platform tests for the - 1.3.0 tarball follow: - - o Linux / Red Hat 5.0, 5.1 Manoj Kasichainula - o Linux / Debian 2.0 (hamm) Alvaro Martinez Echevarria - o Linux / Debian 1.3.1 Ralf S. Engelschall - o FreeBSD 2.2.5 Dirk-Willem van Gulik - o FreeBSD 2.2.6 Ralf S. Engelschall, Dirk-Willem v.Gulik - o FreeBSD 3.0-CURRENT Ralf S. Engelschall, Dirk-Willem v.Gulik - o Sparc-Linux Lars Eilebrecht - o Linux (glibc6)Lars Eilebrecht - o AIX 4.1 Lars Eilebrecht, Dirk-Willem van Gulik - o Solaris 2.4, 2.5 Dirk-Willem van Gulik - o Solaris 2.6 Lars Eilebrecht - o Digital Unix 4.0 Lars Eilebrecht, Dirk-Willem van Gulik - o IRIX 5.3 Dirk-Willem van Gulik - o IRIX 6.2 Mark Cox - o SINIX 5.41/5.42/5.43 Martin Kraemer - o ReliantUNIX 5.44 64bitMartin Kraemer (requires -DNET_SIZE_T=int) - o BS2000/OSD V2.0/V3.0 Martin Kraemer +1.3.1: In development +1.3.0: Tagged and rolled on June 1. Announced and Released on the 6th. + 1.3b7: Tagged and Released 26/5/98. 2.0 : In pre-alpha development, see apache-2.0 repository @@ -162,6 +141,16 @@ apdefines.h: Open issues: + +* Redefine APACHE_RELEASE. Add another 'bit' to signify whether + it's a beta or final release. Maybe 'MMNNFFRBB' which means: +MM: Major release # + NN: Minor release # + FF: "fix" level + R: 0 if beta, 1 if final release + BB: beta number + + See: <[EMAIL PROTECTED]> * Someone other than Dean has to do a security/correctness review on psprintf(), bprintf(), and ap_snprintf(). In particular these routines
cvs commit: apache-1.3 STATUS
jim 98/06/09 07:23:51 Modified:.STATUS Log: Let's try to get 1.2.1 out in a week-and-a-half Revision ChangesPath 1.419 +3 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.418 retrieving revision 1.419 diff -u -r1.418 -r1.419 --- STATUS1998/06/07 15:13:19 1.418 +++ STATUS1998/06/09 14:23:50 1.419 @@ -2,7 +2,9 @@ Release: -1.3.1: In development +1.3.1: In development. Plan to release on June 19, 1998 to + incorporate the latest additions plus WIN32 compile problems. + Jim offers to be RM. 1.3.0: Tagged and rolled on June 1. Announced and Released on the 6th.
cvs commit: apache-1.3 STATUS
jim 98/06/11 05:46:56
Modified:.STATUS
Log:
Keep up to date
Revision ChangesPath
1.424 +8 -3 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- STATUS1998/06/11 09:55:20 1.423
+++ STATUS1998/06/11 12:46:55 1.424
@@ -42,12 +42,14 @@
* Wilfredo Sanchez's port to Rhapsody 5.1 for 1.2.6 - forward port to
1.3?
<[EMAIL PROTECTED]>
+ Jim: Hmmm... Rhapsody is not really any longer in Apple's
+ game-plan. The focus is OS X now.
* Ralf's "configure generates config.status":
A tiny addition for the APACI configure script to provide an easy way
(like GNU Autoconf) to re-create the configuration
See: http://www.engelschall.com/sw/apache/ [configstatus]
- Status (for 1.3.1-dev): Ralf +1, Martin +1
+ Status (for 1.3.1-dev): Ralf +1, Martin +1, Jim +1
* Ralf's "...":
This patch adds a useful ... section to the core
@@ -64,7 +66,7 @@
tests to remove some of the classical hurdles for new users when
setting
up Apache.
See: http://www.engelschall.com/sw/apache/ [substconfparam]
- Status (for 1.3.1-dev): Ralf +1
+ Status (for 1.3.1-dev): Ralf +1, Jim +1
* Ralf's "linking DSO modules against possible libraries from $(LIBS)":
This patch is a first step for a more powerful and less restrictive DSO
@@ -78,7 +80,7 @@
to add an extra Makefile dependency for the httpd target, for instance
to external third-party libraries, etc.
See: http://www.engelschall.com/sw/apache/ [extradeps]
- Status (for 1.3.1-dev): Ralf +1, Marc +1
+ Status (for 1.3.1-dev): Ralf +1, Marc +1, Jim +1
* Paul's patch to add integrated restart/shutdown signalling (Win32)
This patch make Apache listen on predictable event names to allow
@@ -144,6 +146,7 @@
Open issues:
* How should an Apache binary release tarball look?
+ NOTE: This should be resolved before 1.3.1 !!
1. The "old" way where it is just a source release tarball
plus a pre-compiled src/httpd-. It is created
@@ -190,6 +193,7 @@
BB: beta number
See: <[EMAIL PROTECTED]>
+ Status: Jim +1, Ben +1, Martin +1
* Someone other than Dean has to do a security/correctness review on
psprintf(), bprintf(), and ap_snprintf(). In particular these routines
@@ -200,6 +204,7 @@
o Laura La Gassa's looked over ap_vformatter & other related code
o Martin did a "source review" as well.
o Could still use 1 or 2 more sets of eyeballs.
+ Status: Is this still valid??
* Paul would like to see a 'gdbm' option because he uses
it a lot.
cvs commit: apache-1.3 STATUS
jim 98/06/19 06:14:57 Modified:.STATUS Log: Give us some time Revision ChangesPath 1.432 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.431 retrieving revision 1.432 diff -u -r1.431 -r1.432 --- STATUS1998/06/17 12:03:39 1.431 +++ STATUS1998/06/19 13:14:56 1.432 @@ -2,7 +2,7 @@ Release: -1.3.1: In development. Plan to release on June 19, 1998 to +1.3.1: In development. Plan to release on June 24, 1998 to incorporate the latest additions plus WIN32 compile problems. Jim offers to be RM.
cvs commit: apache-1.3/src/main http_main.c
jim 98/06/25 14:06:05 Modified:src CHANGES src/main http_main.c Log: Add SIGILL to our dumpable signals Revision ChangesPath 1.933 +2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.932 retrieving revision 1.933 diff -u -r1.932 -r1.933 --- CHANGES 1998/06/25 19:51:53 1.932 +++ CHANGES 1998/06/25 21:06:01 1.933 @@ -1,5 +1,7 @@ Changes with Apache 1.3.1 + *) We now attempt to dump core when we get SIGILL. [Jim Jagielski] + *) PORT: remove broken test for MAP_FILE in http_main.c. [Wilfredo Sanchez <[EMAIL PROTECTED]>] 1.367 +7 -0 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.366 retrieving revision 1.367 diff -u -r1.366 -r1.367 --- http_main.c 1998/06/25 19:51:55 1.366 +++ http_main.c 1998/06/25 21:06:03 1.367 @@ -2546,6 +2546,10 @@ if (sigaction(SIGABRT, &sa, NULL) < 0) ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, "sigaction(SIGABRT)"); #endif +#ifdef SIGILL + if (sigaction(SIGILL, &sa, NULL) < 0) + ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, "sigaction(SIGILL)"); +#endif sa.sa_flags = 0; } sa.sa_handler = sig_term; @@ -2586,6 +2590,9 @@ #ifdef SIGABRT signal(SIGABRT, sig_coredump); #endif /* SIGABRT */ +#ifdef SIGILL + signal(SIGILL, sig_coredump); +#endif /* SIGILL */ #ifdef SIGXCPU signal(SIGXCPU, SIG_DFL); #endif /* SIGXCPU */
cvs commit: apache-1.3/src/include http_config.h
jim 98/06/29 12:02:04 Modified:src CHANGES src/include http_config.h Log: Hmmm... This name change involves an API change. For example, PHP3.0.1-dev now barfs (Rasmus, hint hint :) ) Revision ChangesPath 1.940 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.939 retrieving revision 1.940 diff -u -r1.939 -r1.940 --- CHANGES 1998/06/29 12:21:01 1.939 +++ CHANGES 1998/06/29 19:01:59 1.940 @@ -1,5 +1,8 @@ Changes with Apache 1.3.1 + *) API: Name changes of table_elts to ap_table_elts and is_table_empty + to ap_is_table_empty. [Ben Laurie] + *) PORT: Add UnixWare 7 support [Vadim Kostoglodoff <[EMAIL PROTECTED]>] PR#2463 1.88 +1 -1 apache-1.3/src/include/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- http_config.h 1998/05/27 14:01:31 1.87 +++ http_config.h 1998/06/29 19:02:03 1.88 @@ -275,7 +275,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19980527 +#define MODULE_MAGIC_NUMBER 19980627 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apache-devsite mmn.txt
jim 98/06/29 12:04:25 Modified:.mmn.txt Log: Document MMN bump for tables Revision ChangesPath 1.25 +3 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mmn.txt 1998/05/27 23:07:41 1.24 +++ mmn.txt 1998/06/29 19:04:25 1.25 @@ -66,3 +66,6 @@ This string will be printed in place of the canned error responses, and will be propagated to ErrorDocuments or cgi scripts in the (REDIRECT_)ERROR_NOTES variable. +19980627 (1.3.1-dev) - More renaming that we forgot/bypassed. In particular: +table_elts --> ap_table_elts +is_table_empty --> ap_is_table_empty
cvs commit: apache-1.3/src/include compat.h
jim 98/06/29 12:06:19 Modified:src/include compat.h Log: Be backwards compatible Revision ChangesPath 1.11 +2 -0 apache-1.3/src/include/compat.h Index: compat.h === RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- compat.h 1998/05/28 22:09:46 1.10 +++ compat.h 1998/06/29 19:06:18 1.11 @@ -176,6 +176,7 @@ #define is_fnmatch ap_is_fnmatch #define is_initial_req ap_is_initial_req #define is_matchexpap_is_matchexp +#define is_table_empty ap_is_table_empty #define is_url ap_is_url #define keepalive_timeout ap_keepalive_timeout #define kill_cleanup ap_kill_cleanup @@ -379,6 +380,7 @@ #define table_add ap_table_add #define table_addn ap_table_addn #define table_do ap_table_do +#define table_elts ap_table_elts #define table_get ap_table_get #define table_mergeap_table_merge #define table_mergen ap_table_mergen
cvs commit: apache-1.3/src/include conf.h
jim 98/07/07 17:23:43 Modified:src CHANGES src/include conf.h Log: PR:2398 Submitted by: Kristian Kraemmer Nielsen <[EMAIL PROTECTED]> Reviewed by: Jim Jagielski Change 'nobody' to 'nogroup for DEFAULT_GROUP under AIX Revision ChangesPath 1.951 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.950 retrieving revision 1.951 diff -u -r1.950 -r1.951 --- CHANGES 1998/07/07 23:19:22 1.950 +++ CHANGES 1998/07/08 00:23:39 1.951 @@ -1,5 +1,8 @@ Changes with Apache 1.3.1 + *) AIX was sing 'nobody' instead of 'nogroup' for DEFAULT_GROUP. + [Kristian Kraemmer Nielsen <[EMAIL PROTECTED]>] PR#2398 + *) suexec's error messages have been clarified a little bit. [Ken Coar] *) PORT: Apache is not 8-bit clean in many settings, a problem we're 1.218 +1 -1 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.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- conf.h1998/06/20 11:20:38 1.217 +++ conf.h1998/07/08 00:23:41 1.218 @@ -242,7 +242,7 @@ #define USE_MMAP_FILES #define HAVE_SYSLOG 1 #ifndef DEFAULT_GROUP -#define DEFAULT_GROUP "nobody" +#define DEFAULT_GROUP "nogroup" #endif #endif #ifndef DEFAULT_USER
cvs commit: apache-1.3/src/include conf.h
jim 98/07/07 17:46:06 Modified:src CHANGES src/include conf.h Log: Why the flying fuck even bother... Revision ChangesPath 1.952 +0 -3 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.951 retrieving revision 1.952 diff -u -r1.951 -r1.952 --- CHANGES 1998/07/08 00:23:39 1.951 +++ CHANGES 1998/07/08 00:46:03 1.952 @@ -1,8 +1,5 @@ Changes with Apache 1.3.1 - *) AIX was sing 'nobody' instead of 'nogroup' for DEFAULT_GROUP. - [Kristian Kraemmer Nielsen <[EMAIL PROTECTED]>] PR#2398 - *) suexec's error messages have been clarified a little bit. [Ken Coar] *) PORT: Apache is not 8-bit clean in many settings, a problem we're 1.219 +1 -1 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.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- conf.h1998/07/08 00:23:41 1.218 +++ conf.h1998/07/08 00:46:05 1.219 @@ -242,7 +242,7 @@ #define USE_MMAP_FILES #define HAVE_SYSLOG 1 #ifndef DEFAULT_GROUP -#define DEFAULT_GROUP "nogroup" +#define DEFAULT_GROUP "nobody" #endif #endif #ifndef DEFAULT_USER
cvs commit: apache-1.3/src/include apctype.h
jim 98/07/08 10:57:39 Modified:src/include apctype.h Log: Don't think it applies here Revision ChangesPath 1.2 +0 -3 apache-1.3/src/include/apctype.h Index: apctype.h === RCS file: /export/home/cvs/apache-1.3/src/include/apctype.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apctype.h 1998/07/08 17:46:59 1.1 +++ apctype.h 1998/07/08 17:57:38 1.2 @@ -53,9 +53,6 @@ * For more information on the Apache Group and the Apache HTTP server * project, please see <http://www.apache.org/>. * - * This code is based on, and used with the permission of, the - * SIO stdio-replacement strx_* functions by Panos Tsirigotis - * <[EMAIL PROTECTED]> for xinetd. */ #ifndef APACHE_APCTYPE_H
cvs commit: apache-1.3/src/include ap.h
jim 98/07/08 11:02:17 Modified:src/include ap.h Log: Some clarity about SIO :) Revision ChangesPath 1.18 +3 -3 apache-1.3/src/include/ap.h Index: ap.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ap.h 1998/06/19 21:02:36 1.17 +++ ap.h 1998/07/08 18:02:16 1.18 @@ -53,9 +53,9 @@ * For more information on the Apache Group and the Apache HTTP server * project, please see <http://www.apache.org/>. * - * This code is based on, and used with the permission of, the - * SIO stdio-replacement strx_* functions by Panos Tsirigotis - * <[EMAIL PROTECTED]> for xinetd. + * The ap_vsnprintf/ap_snprintf functions are based on, and used with the + * permission of, the SIO stdio-replacement strx_* functions by Panos + * Tsirigotis <[EMAIL PROTECTED]> for xinetd. */ #ifndef APACHE_AP_H
cvs commit: apache-1.3/src Configure
jim 98/07/12 06:32:51
Modified:src Configure
Log:
Oops... gotta recall that older (and esp. SysV-based) tr's require the
'[]' method. This works fine with BSD tr's since it maps the [ to [
and the ] to ]. Cover all bases.
Revision ChangesPath
1.275 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- Configure 1998/07/11 10:24:05 1.274
+++ Configure 1998/07/12 13:32:50 1.275
@@ -1217,7 +1217,7 @@
echo "" >>$CONF_AUTO_H
for header in $CHECK_FOR_HEADERS; do
echo "/* <$header> */" >>$CONF_AUTO_H
-name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr 'a-z' 'A-Z'`"
+name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]'
'[A-Z]'`"
if ./helpers/TestCompile header $header; then
eval "HAVE_${name}=1"
echo "#ifndef HAVE_${name}" >>$CONF_AUTO_H
cvs commit: apache-1.3/src/include conf.h
jim 98/07/12 07:38:04 Modified:src/include conf.h Log: Hmmm... A/UX has sys/resource.h but no rlimit() functions to read/write the values. The rub is that it's sys/resource.h file DOES define RLIMIT_CPU, which causes http_core.c to barf. S we just don't include the header Revision ChangesPath 1.223 +1 -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.222 retrieving revision 1.223 diff -u -r1.222 -r1.223 --- conf.h1998/07/12 09:07:31 1.222 +++ conf.h1998/07/12 14:38:03 1.223 @@ -467,6 +467,7 @@ #define NO_LINGCLOSE #define NO_SLACK #define HAVE_SYSLOG 1 +#undef HAVE_SYS_RESOURCE_H /* exists but does not provide *rlimit funcs */ #elif defined(SVR4) #define NO_KILLPG
cvs commit: apache-1.3/src PORTING
jim 98/07/13 05:31:05 Modified:src PORTING Log: Some doc changes about the header rename Revision ChangesPath 1.31 +17 -11apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- PORTING 1998/06/04 20:18:27 1.30 +++ PORTING 1998/07/13 12:31:04 1.31 @@ -97,7 +97,7 @@ for the port: ./Configure - ./include/conf.h + ./include/ap_config.h Configure: == @@ -117,7 +117,7 @@ The 'OS' variable is used to define the system Apache is being built for. You will also note that 'CFLAGS' defines "-DAUX". In this case, -'AUX' is a magic cookie used by the Apache code (mainly conf.h [see +'AUX' is a magic cookie used by the Apache code (mainly ap_config.h [see below]) to handle OS-specific code. Each code that has and requires such OS-specific code will require a unique "system cookie" defined in 'CFLAGS'. You will also note that Configure also goes ahead and @@ -129,9 +129,9 @@ than any system supplied regex. It's been our experience that system supplied regex libraries are generally buggy, and should be avoided. -conf.h: +ap_config.h: === -The Apache code, specifically in conf.h, uses a variety of #defines to +The Apache code, specifically in ap_config.h, uses a variety of #defines to control how the code is compiled and what options are available for each supported OS. One of the hardest parts about the porting process is determining which of the following are applicable for your system and @@ -152,7 +152,7 @@ are not strictly required, but are a Good Idea anyway). The following several lines provide a list and short description -of these #defines. By correctly #defining the ones you need in conf.h +of these #defines. By correctly #defining the ones you need in ap_config.h (wrapped by the above mentioned "system cookie"), you can fine tune the build for your OS. @@ -187,15 +187,21 @@ Define if the OS supports the getrlimit()/setrlimit() functions HAVE_CRYPT_H: - Define if the OS has the header file. + Defined if the OS has the header file. This is set + automatically during the Configure process and stored in the + src/include/ap_config_auto.h header file. HAVE_SYS_SELECT_H: - Define if the OS has the header file. + Defined if the OS has the header file. This is + set automatically during the Configure process and stored in the + src/include/ap_config_auto.h header file. HAVE_SYS_RESOURCE_H: - Define if the OS has and supports the getrlimit/setrlimit + Defined if the OS has and supports the getrlimit/setrlimit family. Apache uses this to determine if RLIMIT_CPU|VMEM|DATA|RLIMIT - is found and used. + is found and used. This is set automatically during the Configure + process and stored in the src/include/ap_config_auto.h header + file. -- USE_*: @@ -338,8 +344,8 @@ NET_SIZE_T: Some functions such as accept(), getsockname(), getpeername() take an int *len on some architectures and a size_t *len on others. - If left undefined apache will default it to int. See include/conf.h - for a description of NET_SIZE_T. + If left undefined apache will default it to int. See + include/ap_config.h for a description of NET_SIZE_T. NEED_HASHBANG_EMUL: The execve()/etc. functions on this platform do not deal with #!,
cvs commit: apache-1.3/src/include ap_config.h
jim 98/07/13 05:35:54 Modified:src PORTING src/include ap_config.h Log: Remove some dead code and add notes that if the sys/resource.h file exists, we assume that the rlimit() funcs do as well Revision ChangesPath 1.32 +3 -5 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- PORTING 1998/07/13 12:31:04 1.31 +++ PORTING 1998/07/13 12:35:51 1.32 @@ -183,9 +183,6 @@ HAVE_GMTOFF: Define if the OS's tm struct has the tm_gmtoff element -HAVE_RESOURCE: - Define if the OS supports the getrlimit()/setrlimit() functions - HAVE_CRYPT_H: Defined if the OS has the header file. This is set automatically during the Configure process and stored in the @@ -199,8 +196,9 @@ HAVE_SYS_RESOURCE_H: Defined if the OS has and supports the getrlimit/setrlimit family. Apache uses this to determine if RLIMIT_CPU|VMEM|DATA|RLIMIT - is found and used. This is set automatically during the Configure - process and stored in the src/include/ap_config_auto.h header + is found and used. This also assumes that the getrlimit()/setrlimit() + functions are available as well. This is set automatically during the + Configure process and stored in the src/include/ap_config_auto.h header file. -- 1.226 +0 -4 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- ap_config.h 1998/07/13 11:32:33 1.225 +++ ap_config.h 1998/07/13 12:35:53 1.226 @@ -216,7 +216,6 @@ #define HAVE_SHMGET #define USE_SHMGET_SCOREBOARD #undef HAVE_GMTOFF -#define HAVE_RESOURCE #define USE_FCNTL_SERIALIZED_ACCEPT /* feeling brave? want to try using POSIX mutexes? */ /* #define HAVE_MMAP */ @@ -510,7 +509,6 @@ #define NEED_STRCASECMP #define NEED_STRNCASECMP #define bzero(a,b) memset(a,0,b) -#define HAVE_RESOURCE 1 #define HAVE_MMAP 1 #define USE_MMAP_SCOREBOARD #define USE_MMAP_FILES @@ -630,7 +628,6 @@ #elif defined(LYNXOS) #undef HAVE_GMTOFF -#define HAVE_RESOURCE 1 #undef USE_MMAP_SCOREBOARD #undef USE_SHMGET_SCOREBOARD #undef USE_FCNTL_SERIALIZED_ACCEPT @@ -651,7 +648,6 @@ #undef HAVE_GMTOFF #define NO_KILLPG #undef NO_SETSID -#define HAVE_RESOURCE 1 #define bzero(a,b) memset(a,0,b) #define USE_FCNTL_SERIALIZED_ACCEPT #define HAVE_MMAP 1
cvs commit: apache-1.3 Announcement
jim 98/07/15 17:18:11 Modified:.Announcement Log: Gently 'push' people to upgrade to 1.3.1 :) Revision ChangesPath 1.32 +2 -1 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Announcement 1998/07/15 06:51:58 1.31 +++ Announcement 1998/07/16 00:18:07 1.32 @@ -12,7 +12,8 @@ Users on other platforms should review the CHANGES file and decide on their upgrade plans; the security issues apply only to Apache -on Win32. +on Win32. We consider Apache 1.3.1 to be the most stable version +of Apache available. Apache 1.3.1 is available for download from
