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 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/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 sys/time.h #include sys/ioctl.h #include sys/socket.h -#include sys/ioctl.h #include netinet/in.h +#ifdef AIX +#include sys/select.h +#endif /* --- DEFINITIONS -- */
cvs commit: apache-1.3/src CHANGES
rse 98/04/21 06:34:46 Modified:.STATUS configure src CHANGES Log: Fix `configure --compat' to be more compatible. Submitted by: Ralf S. Engelschall Reviewed by: Lars Eilebrecht, Ralf S. Engelschall Revision ChangesPath 1.316 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.315 retrieving revision 1.316 diff -u -r1.315 -r1.316 --- STATUS1998/04/21 12:10:09 1.315 +++ STATUS1998/04/21 13:34:40 1.316 @@ -56,6 +56,7 @@ * HP-UX 11 port by Jeff Earickson * Ralf's fix for the install-config target to get correct MimeMagicFile * PRs 2081 and 2082 closed +* Ralf's adjustments to `configure --compat' to be even more compatible Available Patches: 1.13 +5 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure 1998/04/20 06:30:59 1.12 +++ configure 1998/04/21 13:34:41 1.13 @@ -349,7 +349,7 @@ exec_prefix='$prefix' bindir='$exec_prefix/bin' sbindir='$exec_prefix/bin' -libexecdir='$exec_prefix/bin' +libexecdir='$exec_prefix/libexec' mandir='$prefix/man' sysconfdir='$prefix/conf' datadir='$prefix' @@ -357,6 +357,10 @@ localstatesubdir_run='logs' localstatesubdir_logs='logs' includedir='$prefix/include' +customized_sysconfdir=1 +customized_datadir=1 +customized_localstatedir=1 +customized_includedir=1 ;; --add-module=*) file=$apc_optarg 1.781 +6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.780 retrieving revision 1.781 diff -u -r1.780 -r1.781 --- CHANGES 1998/04/21 12:10:20 1.780 +++ CHANGES 1998/04/21 13:34:43 1.781 @@ -1,4 +1,10 @@ Changes with Apache 1.3b7 + + *) Make `configure --compat' more compatible by first + let the libexecdir default to EPREFIX/libexec instead of EPREFIX/bin and + 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] *) PR2082: Closed... NeXT required strdup() in support/logresolve.c
cvs commit: apache-1.3 INSTALL
rse 98/04/21 06:52:03 Modified:.INSTALL Log: Say it even more explicitly that src/Configuration.tmpl has not to be changed and that the _complete_ configuration via APACI takes place through command line args _AND_ shell variables. PR: 2091 Revision ChangesPath 1.15 +4 -4 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- INSTALL 1998/04/20 07:20:09 1.14 +++ INSTALL 1998/04/21 13:52:03 1.15 @@ -103,10 +103,10 @@ NOTE: Although we'll often advice you to read the src/Configuration.tmpl file parts to better understand the various options in this - section, there is at no time any need to _EDIT_ this file. The - _COMPLETE_ configuration takes place via command line arguments to - the ./configure script. The src/Configuration.tmpl file is a - read-only resource, here. + section, there is _AT NO TIME_ any need to _EDIT_ this file. The + _COMPLETE_ configuration takes place via command line arguments and + loal shell variables for the ./configure script. The + src/Configuration.tmpl file is just a _READ-ONLY_ resource, here. Introduction:
cvs commit: apache-1.3/src CHANGES
rse 98/04/21 07:04:36 Modified:.STATUS Makefile.tmpl src CHANGES Log: Make sure we don't overwrite an existing DocRoot and CGI scripts on make install. Submitted by: Ralf S. Engelschall (based on Jim's initial patch) Reviewed by: Jim Jagielski, Ralf S. Engelschall Revision ChangesPath 1.317 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- STATUS1998/04/21 13:34:40 1.316 +++ STATUS1998/04/21 14:04:29 1.317 @@ -57,6 +57,7 @@ * Ralf's fix for the install-config target to get correct MimeMagicFile * PRs 2081 and 2082 closed * Ralf's adjustments to `configure --compat' to be even more compatible +* Ralf/Jim's enhanced make install carefulness for DocRoot, PR#2084 Available Patches: 1.22 +27 -16apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Makefile.tmpl 1998/04/21 08:04:58 1.21 +++ Makefile.tmpl 1998/04/21 14:04:29 1.22 @@ -171,7 +171,7 @@ fi @$(MAKE) -f $(MKF) $(MFLAGS) \ install-mktree install-programs $(install-support) \ - install-include install-docroot install-config + install-include install-data install-config [EMAIL PROTECTED] -f .install.tmp [EMAIL PROTECTED] -f .install.conf [EMAIL PROTECTED] [ .$(QUIET) != .1 ]; then \ @@ -308,21 +308,32 @@ # create an initial document root containing the Apache manual, # icons and distributed CGI scripts. -install-docroot: - @echo === [docroot: Installing initial DocumentRoot files] - -(cd $(ROOT)/htdocs/ $(TAR) cf - *) |\ - (cd $(datadir)/htdocs/ $(TAR) xf -) - -find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \; - -find $(datadir)/htdocs/ -type f -exec chmod a+r {} \; - -(cd $(ROOT)/icons/ $(TAR) cf - *) |\ - (cd $(datadir)/icons/ $(TAR) xf -) - -find $(datadir)/icons/ -type d -exec chmod a+rx {} \; - -find $(datadir)/icons/ -type f -exec chmod a+r {} \; - -(cd $(ROOT)/cgi-bin/ $(TAR) cf - *) |\ - (cd $(datadir)/cgi-bin/ $(TAR) xf -) - -find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; - -find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; - @echo === [docroot] +install-data: + @echo === [data: Installing initial data files] + [EMAIL PROTECTED] [ -f $(datadir)/htdocs/index.html ]; then \ + echo [PRESERVING EXISTING DATA SUBDIR: $(datadir)/htdocs/]; \ + else \ + echo Copying tree $(ROOT)/htdocs/ - $(datadir)/htdocs/; \ + (cd $(ROOT)/htdocs/ $(TAR) cf - *) |\ + (cd $(datadir)/htdocs/ $(TAR) xf -); \ + find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \ + find $(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \ + fi + [EMAIL PROTECTED] [ -f $(datadir)/cgi-bin/printenv ]; then \ + echo [PRESERVING EXISTING DATA SUBDIR: $(datadir)/cgi-bin/]; \ + else \ + echo Copying tree $(ROOT)/cgi-bin/ - $(datadir)/cgi-bin/; \ + (cd $(ROOT)/cgi-bin/ $(TAR) cf - *) |\ + (cd $(datadir)/cgi-bin/ $(TAR) xf -); \ + find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; ; \ + find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ; \ + fi + @echo Copying tree $(ROOT)/icons/ - $(datadir)/icons/; \ + (cd $(ROOT)/icons/ $(TAR) cf - *) |\ + (cd $(datadir)/icons/ $(TAR) xf -); \ + find $(datadir)/icons/ -type d -exec chmod a+rx {} \; ;\ + find $(datadir)/icons/ -type f -exec chmod a+r {} \; + @echo === [data] # create the initial configuration by providing default files # and initial config files while preserving existing ones. 1.782 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.781 retrieving revision 1.782 diff -u -r1.781 -r1.782 --- CHANGES 1998/04/21 13:34:43 1.781 +++ CHANGES 1998/04/21 14:04:32 1.782 @@ -1,5 +1,9 @@ Changes with Apache 1.3b7 + *) Make sure that make install doesn't overwrite the DocumentRoot and + CGI scripts from an existing Apache installation. + [Ralf S. Engelschall, Jim Jagielski, PR#2084] + *) Make `configure --compat' more compatible by first let the libexecdir default to
cvs commit: apache-1.3/src CHANGES
rse 98/04/21 08:23:39 Modified:.STATUS INSTALL configure src CHANGES Log: Provide backward-compatibility for some src/Configuration.tmpl parameter names to the canonical Autoconf-style shell variable names. For instance EXTRA_CFLAGS vs. CFLAGS. Revision ChangesPath 1.318 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.317 retrieving revision 1.318 diff -u -r1.317 -r1.318 --- STATUS1998/04/21 14:04:29 1.317 +++ STATUS1998/04/21 15:23:20 1.318 @@ -58,6 +58,7 @@ * PRs 2081 and 2082 closed * Ralf's adjustments to `configure --compat' to be even more compatible * Ralf/Jim's enhanced make install carefulness for DocRoot, PR#2084 +* Ralf's back-compat in configure for EXTRA_xxx parameter names Available Patches: 1.16 +7 -0 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- INSTALL 1998/04/21 13:52:03 1.15 +++ INSTALL 1998/04/21 15:23:20 1.16 @@ -165,6 +165,13 @@ system or use ``setenv KEY VALUE; ./configure ...'' if you use one of the C-shell variants (csh, tcsh). + Note: The above parameter names are the canonical ones used in + Autoconf-style interfaces. But because src/Configuration.tmpl + uses the prefix EXTRA_ for some variables (e.g. EXTRA_CFLAGS) + these variants are accepted for backward-compatibility reasons, + too. But please use the canonical Autoconf-style names and + don't rely on this. + Use the --prefix=PREFIX and --exec-prefix=EPREFIX options to configure Apache to use a particular installation prefix. The default is PREFIX=/usr/local/apache and EPREFIX=PREFIX. 1.14 +13 -0 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- configure 1998/04/21 13:34:41 1.13 +++ configure 1998/04/21 15:23:20 1.14 @@ -203,6 +203,19 @@ fi done +# backward compatibility from old src/Configuration.tmpl +# parameter names to the canonical Autoconf-style shell +# variable names. +IFS=' +' +for var in CFLAGS LDFLAGS LIBS INCLUDES; do +eval val=\$EXTRA_$var +if [ .$val != . ]; then +eval $var=\$val +echo + Hint: please use $var instead of EXTRA_$var next time +fi +done + ## ## parse argument line options ## 1.783 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.782 retrieving revision 1.783 diff -u -r1.782 -r1.783 --- CHANGES 1998/04/21 14:04:32 1.782 +++ CHANGES 1998/04/21 15:23:33 1.783 @@ -1,4 +1,9 @@ Changes with Apache 1.3b7 + + *) Provide backward compatibility from some old src/Configuration.tmpl + parameter names to the canonical Autoconf-style shell variable names. For + instance CFLAGS vs. EXTRA_CFLAGS. The EXTRA_xxx variants are accepted now + but a hint message is displayed. [Ralf S. Engelschall] *) Make sure that make install doesn't overwrite the DocumentRoot and CGI scripts from an existing Apache installation.
cvs commit: apache-1.3/src CHANGES
rse 98/04/21 09:00:38 Modified:.STATUS INSTALL configure src CHANGES Log: Avoid side-effects in src/Configure when the user exports the shell variables via $ CFLAGS=... $ export CFLAGS $ ./configure (which is not needed) instead of $ CFLAGS=.. ./configure PR: 2101 Revision ChangesPath 1.319 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.318 retrieving revision 1.319 diff -u -r1.318 -r1.319 --- STATUS1998/04/21 15:23:20 1.318 +++ STATUS1998/04/21 16:00:32 1.319 @@ -59,6 +59,7 @@ * Ralf's adjustments to `configure --compat' to be even more compatible * Ralf/Jim's enhanced make install carefulness for DocRoot, PR#2084 * Ralf's back-compat in configure for EXTRA_xxx parameter names +* Ralf's configure fix to avoid side-effects in Configure on exported vars Available Patches: 1.17 +7 -7 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- INSTALL 1998/04/21 15:23:20 1.16 +++ INSTALL 1998/04/21 16:00:32 1.17 @@ -157,13 +157,13 @@ override the corresponding default entries in the src/Configuration.tmpl file (see there for more information about their usage). - Note: The syntax ``KEY=VALUE ./configure ...'' is the GNU Autoconf - compatible way of specifying defines and can be used with - Bourne shell compatible shells only (sh, bash, ksh). If you use - a different type of shell either use ``env KEY=VALUE - ./configure ...'' when the `env' command is available on your - system or use ``setenv KEY VALUE; ./configure ...'' if you use - one of the C-shell variants (csh, tcsh). + Note: The syntax ``KEY=VALUE ./configure ...'' (one single line!) is + the GNU Autoconf compatible way of specifying defines and can + be used with Bourne shell compatible shells only (sh, bash, + ksh). If you use a different type of shell either use ``env + KEY=VALUE ./configure ...'' when the `env' command is available + on your system or use ``setenv KEY VALUE; ./configure ...'' if + you use one of the C-shell variants (csh, tcsh). Note: The above parameter names are the canonical ones used in Autoconf-style interfaces. But because src/Configuration.tmpl 1.15 +10 -4 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- configure 1998/04/21 15:23:20 1.14 +++ configure 1998/04/21 16:00:33 1.15 @@ -212,6 +212,7 @@ eval val=\$EXTRA_$var if [ .$val != . ]; then eval $var=\$val +eval EXTRA_$var=\\; export EXTRA_$var echo + Hint: please use $var instead of EXTRA_$var next time fi done @@ -765,16 +766,21 @@ touch sedsubst # generate settings from imported environment variables -IFS=' ' +IFS=' +' for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LDFLAGS_SHLIB \ LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do eval val=\$$var; if [ .$val != . ]; then case $var in -CFLAGS|LDFLAGS|LIBS|INCLUDES) var=EXTRA_$var ;; +CFLAGS|LDFLAGS|LIBS|INCLUDES) +echo s%^#*\\(EXTRA_$var=\\).*%\\1$val%g sedsubst +;; +*) +echo s%^#*\\($var=\\).*%\\1$val%g sedsubst +;; esac -echo s%^#*\\($var=\\).*%\\1$val%g sedsubst -eval $var= +eval $var=\\; export $var fi done 1.784 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.783 retrieving revision 1.784 diff -u -r1.783 -r1.784 --- CHANGES 1998/04/21 15:23:33 1.783 +++ CHANGES 1998/04/21 16:00:34 1.784 @@ -1,5 +1,10 @@ Changes with Apache 1.3b7 + *) Let configure clear out the users parameters (provided as shell + variables) to avoid side-effects in src/Configure when the user + exported them (which is not needed, but some users do it). + [Ralf S. Engelschall, PR#2101] + *) Provide backward compatibility from some old
cvs commit: apache-1.3/src CHANGES
marc98/04/21 09:55:38 Modified:src CHANGES Log: Fix non-standard formatting that slipped in. Revision ChangesPath 1.785 +32 -32apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.784 retrieving revision 1.785 diff -u -r1.784 -r1.785 --- CHANGES 1998/04/21 16:00:34 1.784 +++ CHANGES 1998/04/21 16:55:36 1.785 @@ -3,7 +3,7 @@ *) Let configure clear out the users parameters (provided as shell variables) to avoid side-effects in src/Configure when the user exported them (which is not needed, but some users do it). - [Ralf S. Engelschall, PR#2101] + [Ralf S. Engelschall] PR#2101 *) Provide backward compatibility from some old src/Configuration.tmpl parameter names to the canonical Autoconf-style shell variable names. For @@ -12,7 +12,7 @@ *) Make sure that make install doesn't overwrite the DocumentRoot and CGI scripts from an existing Apache installation. - [Ralf S. Engelschall, Jim Jagielski, PR#2084] + [Ralf S. Engelschall, Jim Jagielski] PR#2084 *) Make `configure --compat' more compatible by first let the libexecdir default to EPREFIX/libexec instead of EPREFIX/bin and @@ -20,12 +20,12 @@ appended to sysconfdir, datadir, localstatedir and includedir when --compat is used. [Ralf S. Engelschall, Lars Eilebrecht] - *) PR2082: Closed... NeXT required strdup() in support/logresolve.c + *) NeXT requires strdup() in support/logresolve.c. PR#2082 - *) PR2081: Closed... AIX required sys/select.h in support/ab.c + *) AIX requires sys/select.h in support/ab.c PR#2081 *) Fix the path to the MimeMagicFile in the install-config target, too. - [Ralf S. Engelschall, PR#2089] + [Ralf S. Engelschall] PR#2089 *) PORT: Added HP-UX 11 patches [Jeff Earickson [EMAIL PROTECTED]] @@ -125,7 +125,7 @@ user expects. [Ralf S. Engelschall] *) Fixed ordering of argument checks for RewriteBase directive. - [Todd Eigenschink [EMAIL PROTECTED], PR#2045] + [Todd Eigenschink [EMAIL PROTECTED]] PR#2045 *) Change Win32 IS_MODULE to SHARED_MODULE to match Unix' method of indicating that a module is being compiled for dynamic loading. Also @@ -179,8 +179,8 @@ first step to provide both a quick success event and to demonstrate the APXS mechanism to module authors. [Ralf S. Engelschall] - *) Fix core dumps in use of CONNECT in proxy. PR#1326, #1573, #1942 - [EMAIL PROTECTED] + *) Fix core dumps in use of CONNECT in proxy. + [EMAIL PROTECTED] PR#1326, #1573, #1942 *) Modify the log directives in httpd.conf-dist files to use CustomLog so that users have examples of how CustomLog can be used. @@ -232,7 +232,7 @@ *) Fix the check for symbolic links in ``RewriteCond ... -l'': stat() was used instead of lstat() and thus this flag didn't work as expected. - [Rein Tollevik [EMAIL PROTECTED], PR#2010] + [Rein Tollevik [EMAIL PROTECTED]] PR#2010 *) Fix the proxy pass-through feature of mod_rewrite for the case of existing QUERY_STRING now that mod_proxy was recently changed because of @@ -275,13 +275,13 @@ *) Now mod_proxy uses the response string (in addition to the response status code) from the already used FTP SIZE command to setup the Content-Length - header if available. [Ralf S. Engelschall, PR#1183] + header if available. [Ralf S. Engelschall] PR#1183 *) Reanimated the (still undocumented) proxy receive buffer size directive: Renamed from ReceiveBufferSize to ProxyReceiveBufferSize because the old name was really too generic, added documentation for this directive to the mod_proxy.html and corrected the hyperlink to it in the - new_features_1.3.html document. [Ralf S. Engelschall, PR#1348] + new_features_1.3.html document. [Ralf S. Engelschall] PR#1348 *) Fix a bug in the src/helpers/fp2rp script and make it a little bit faster [Martin Kraemer] @@ -455,13 +455,13 @@ remembering the server together with the config structure while configuring and later assuming there is no config when we see a difference between the remembered server and the one calling us. - [Ralf S. Engelschall, PR#1790] + [Ralf S. Engelschall] PR#1790 *) Fixed the DBM RewriteMap support for mod_rewrite: First the support now is automatically disabled under configure time when the dbm_xxx functions are not available. Second, two heavy source code errors in the DBM support code were fixed. This makes DBM RewriteMap's usable again after - a long time of brokenness. [Ralf S.
cvs commit: apache-1.3/src CHANGES
rse 98/04/21 10:34:01 Modified:.STATUS Makefile.tmpl src CHANGES Log: Ops, apache_status really is named apache_runtime_status in httpd.conf-dist. PR: 2105 Revision ChangesPath 1.320 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.319 retrieving revision 1.320 diff -u -r1.319 -r1.320 --- STATUS1998/04/21 16:00:32 1.319 +++ STATUS1998/04/21 17:33:58 1.320 @@ -60,6 +60,7 @@ * Ralf/Jim's enhanced make install carefulness for DocRoot, PR#2084 * Ralf's back-compat in configure for EXTRA_xxx parameter names * Ralf's configure fix to avoid side-effects in Configure on exported vars +* Ralf's fix for the install-config target to get correct ScoreBoardFile Available Patches: 1.23 +1 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Makefile.tmpl 1998/04/21 14:04:29 1.22 +++ Makefile.tmpl 1998/04/21 17:33:58 1.23 @@ -353,7 +353,7 @@ -e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \ -e 's;@@ServerRoot@@;$(prefix);' \ -e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \ - -e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \ + -e 's;logs/apache_runtime_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \ -e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \ -e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \ 1.786 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.785 retrieving revision 1.786 diff -u -r1.785 -r1.786 --- CHANGES 1998/04/21 16:55:36 1.785 +++ CHANGES 1998/04/21 17:34:00 1.786 @@ -1,5 +1,8 @@ Changes with Apache 1.3b7 + *) Fix the path to the ScoreBoardFile in the install-config target, too. + [Ralf S. Engelschall] PR#2105 + *) Let configure clear out the users parameters (provided as shell variables) to avoid side-effects in src/Configure when the user exported them (which is not needed, but some users do it).
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 sys/select.h 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 stdio.h -#include stdlib.h +#include conf.h #include string.h #include errno.h #include fcntl.h #include unistd.h -#include netdb.h #include sys/time.h -#include sys/ioctl.h -#include sys/socket.h -#include netinet/in.h -#ifdef AIX -#include sys/select.h -#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 sys/types.h #include ctype.h -#include netdb.h #include string.h -#include stdio.h -#include stdlib.h - -#include sys/socket.h -#include netinet/in.h #ifndef MPE #include arpa/inet.h #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 string.h -#include errno.h #include fcntl.h -#include unistd.h #include sys/time.h /* --- 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 sys/types.h -#include stdio.h -#include string.h #ifdef MPE #include signal.h #else #include sys/signal.h #endif -#include stdlib.h -#include time.h -#include unistd.h /* 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 sys/types.h -#include stdio.h -#include string.h #include signal.h -#include stdlib.h -#include time.h -#include unistd.h #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 sys/types.h #include ctype.h -#include string.h #ifndef MPE #include arpa/inet.h 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 stdio.h -#include stdlib.h +#include conf.h #include time.h #include errno.h #include fcntl.h -#include unistd.h 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 sys/param.h #include sys/stat.h #include sys/types.h -#include errno.h -#include grp.h -#include pwd.h #include stdarg.h -#include stdio.h -#include stdlib.h -#include string.h -#include time.h -#include unistd.h #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 STATUS
dgaudet 98/04/21 13:47:14 Modified:.STATUS Log: retract that patch Revision ChangesPath 1.321 +0 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.320 retrieving revision 1.321 diff -u -r1.320 -r1.321 --- STATUS1998/04/21 17:33:58 1.320 +++ STATUS1998/04/21 20:47:13 1.321 @@ -79,10 +79,6 @@ [EMAIL PROTECTED] Status: Dean +1 -* Dean's patch for OPTIMIZE_TIMEOUTS to remove rare race - [EMAIL PROTECTED] - Status: Dean +0 - * Wilfredo Sanchez's port to Rhapsody 5.1 for 1.2.6 - forward port to 1.3? [EMAIL PROTECTED]