cvs commit: apache-1.3/src/modules/test mod_rndchunk.c
rse 98/04/26 23:59:38 Modified:.STATUS src CHANGES src/include compat.h buff.h http_log.h src/main buff.c http_protocol.c src/modules/standard mod_log_config.c src/modules/test mod_rndchunk.c Log: Some symbol renamings which were not caught by the BIG RENAMING because they are #defines: bputc - ap_bputc bgetc - ap_bgetc piped_log_write_fd - ap_piped_log_write_fd piped_log_read_fd - ap_piped_log_read_fd Thanks to Dean for discovering them. Revision ChangesPath 1.332 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.331 retrieving revision 1.332 diff -u -r1.331 -r1.332 --- STATUS1998/04/26 18:29:26 1.331 +++ STATUS1998/04/27 06:59:29 1.332 @@ -67,6 +67,7 @@ * Fix for the DEBUG_CGI (#ifdef'ed) situation in mod_cgi.c, PR#2114 * Ralf's various bugfixes and cleanups for the configure script * Ralf's workaround for braindead awk when generating ap_config.h, PR#2139 +* Ralf's manual renaming of forgotten non-ap_-symbols because of #define Available Patches: 1.795 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.794 retrieving revision 1.795 diff -u -r1.794 -r1.795 --- CHANGES 1998/04/26 18:29:28 1.794 +++ CHANGES 1998/04/27 06:59:30 1.795 @@ -1,5 +1,10 @@ Changes with Apache 1.3b7 + *) Manually fix some symbols which were not renamed to prefix ap_ in the BIG + RENAMING process because they are defined as pre-processor macros instead + of real functions: bputc, bgetc, piped_log_write_fd, piped_log_read_fd + [Ralf S. Engelschall] + *) Workaround braindead AWK's when generating ap_config.h: The split() and substr() functions cannot be nested under vendor AWK from Solaris 2.6. [Ralf S. Engelschall] PR#2139 1.4 +8 -4 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- compat.h 1998/04/13 18:05:09 1.3 +++ compat.h 1998/04/27 06:59:33 1.4 @@ -39,6 +39,7 @@ #define bfilenoap_bfileno #define bflsbufap_bflsbuf #define bflush ap_bflush +#define bgetc ap_bgetc #define bgetoptap_bgetopt #define bgets ap_bgets #define bhalfduplexap_bhalfduplex @@ -49,6 +50,7 @@ #define bonerror ap_bonerror #define bprintfap_bprintf #define bpushfdap_bpushfd +#define bputc ap_bputc #define bputs ap_bputs #define bread ap_bread #define bsetflag ap_bsetflag @@ -209,6 +211,10 @@ #define open_mutex ap_open_mutex #define open_piped_log ap_open_piped_log #define os_canonical_filename ap_os_canonical_filename +#define os_dl_load ap_os_dso_load +#define os_dl_unload ap_os_dso_unload +#define os_dl_sym ap_os_dso_sym +#define os_dl_errorap_os_dso_error #define os_escape_path ap_os_escape_path #define os_is_path_absoluteap_os_is_path_absolute #define overlay_tables ap_overlay_tables @@ -231,6 +237,8 @@ #define pfopen ap_pfopen #define pgethostbyname ap_pgethostbyname #define pid_fname ap_pid_fname +#define piped_log_read_fd ap_piped_log_read_fd +#define piped_log_write_fd ap_piped_log_write_fd #define pool_is_ancestor ap_pool_is_ancestor #define pool_join ap_pool_join #define popendir ap_popendir @@ -389,9 +397,5 @@ #define util_uri_init ap_util_uri_init #define uudecode ap_uudecode #define vbprintf ap_vbprintf -#define os_dl_load ap_os_dso_load -#define os_dl_unload ap_os_dso_unload -#define os_dl_sym ap_os_dso_sym -#define os_dl_errorap_os_dso_error #endif /* APACHE_COMPAT_H */ 1.38 +4
cvs commit: apache-1.3/src/main http_main.c
rse 98/04/27 01:17:30 Modified:.STATUS src CHANGES Configuration.tmpl Configure src/main http_main.c Log: Fix SOCKS4 support (missing SOCKSinit, non-portable grep in Configure and wrong if-statement for Solaris) and add additional SOCKS5 support. PR: 2140 Revision ChangesPath 1.333 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- STATUS1998/04/27 06:59:29 1.332 +++ STATUS1998/04/27 08:17:22 1.333 @@ -68,6 +68,7 @@ * Ralf's various bugfixes and cleanups for the configure script * Ralf's workaround for braindead awk when generating ap_config.h, PR#2139 * Ralf's manual renaming of forgotten non-ap_-symbols because of #define +* Ralf's fix for SOCKS4 and adding of additional SOCKS5 support, PR#2140 Available Patches: 1.796 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.795 retrieving revision 1.796 diff -u -r1.795 -r1.796 --- CHANGES 1998/04/27 06:59:30 1.795 +++ CHANGES 1998/04/27 08:17:24 1.796 @@ -1,5 +1,8 @@ Changes with Apache 1.3b7 + *) Adding SOCKS5 support and fixing existing SOCKS4 support. + [Ralf S. Engelschall] PR#2140 + *) Manually fix some symbols which were not renamed to prefix ap_ in the BIG RENAMING process because they are defined as pre-processor macros instead of real functions: bputc, bgetc, piped_log_write_fd, piped_log_read_fd 1.101 +8 -2 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- Configuration.tmpl1998/04/14 08:27:33 1.100 +++ Configuration.tmpl1998/04/27 08:17:25 1.101 @@ -92,7 +92,7 @@ # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, -# STATUS, IRIXNIS, IRIXN32 and PARANOID. +# SOCKS5, STATUS, IRIXNIS, IRIXN32 and PARANOID. # # For all Rules, if set to yes, then Configure knows we want that # capability and does what is required to add it in. If set to default @@ -100,10 +100,15 @@ # present, then nothing is done. # # SOCKS4: -# If SOCKS4 is set to 'yes', be sure that you add the sock library +# If SOCKS4 is set to 'yes', be sure that you add the socks library # location to EXTRA_LIBS, otherwise Configure will assume # -L/usr/local/lib -lsocks # +# SOCKS5: +# If SOCKS5 is set to 'yes', be sure that you add the socks5 library +# location to EXTRA_LIBS, otherwise Configure will assume +# -L/usr/local/lib -lsocks5 +# # STATUS: # If Configure determines that you are using the status_module, # it will automatically enable full status information if set @@ -132,6 +137,7 @@ Rule STATUS=yes Rule SOCKS4=no +Rule SOCKS5=no Rule IRIXNIS=no Rule IRIXN32=yes Rule PARANOID=no 1.247 +31 -9 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- Configure 1998/04/26 18:29:29 1.246 +++ Configure 1998/04/27 08:17:26 1.247 @@ -232,6 +232,7 @@ RULE_WANTHSREGEX=`./helpers/CutRule WANTHSREGEX $file` RULE_STATUS=`./helpers/CutRule STATUS $file` RULE_SOCKS4=`./helpers/CutRule SOCKS4 $file` +RULE_SOCKS5=`./helpers/CutRule SOCKS5 $file` RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file` RULE_IRIXN32=`./helpers/CutRule IRIXN32 $file` RULE_PARANOID=`./helpers/CutRule PARANOID $file` @@ -1065,21 +1066,42 @@ ;; esac -# Now SOCKS4. -# NOTE: We assume that if they are using SOCKS4, then they've -# adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required, -# otherwise we assume -L/usr/local/lib -lsocks +# SOCKS4 support: +# We assume that if they are using SOCKS4, then they've +# adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required, +# otherwise we assume -L/usr/local/lib -lsocks if [ $RULE_SOCKS4 = yes ]; then -# Set flag and check Makefile for -lsocks line +echo + enabling SOCKS4 support +CFLAGS=$CFLAGS -DSOCKS -DSOCKS4 CFLAGS=$CFLAGS -Dconnect=Rconnect -Dselect=Rselect CFLAGS=$CFLAGS -Dgethostbyname=Rgethostbyname -if grep EXTRA_ Makefile | grep \-lsocks
cvs commit: apache-1.3/src CHANGES
rse 98/04/27 02:55:07 Modified:.STATUS configure src CHANGES Log: Workaround sed limitations in APACI's configure script by now substituting in chunks of 50 commands. PR: 2136 Revision ChangesPath 1.334 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.333 retrieving revision 1.334 diff -u -r1.333 -r1.334 --- STATUS1998/04/27 08:17:22 1.333 +++ STATUS1998/04/27 09:55:04 1.334 @@ -69,6 +69,7 @@ * Ralf's workaround for braindead awk when generating ap_config.h, PR#2139 * Ralf's manual renaming of forgotten non-ap_-symbols because of #define * Ralf's fix for SOCKS4 and adding of additional SOCKS5 support, PR#2140 +* Ralf's workaround for sed limitation in configure script, PR#2136 Available Patches: 1.20 +52 -30apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- configure 1998/04/26 17:57:23 1.19 +++ configure 1998/04/27 09:55:04 1.20 @@ -74,6 +74,9 @@ src=src aux=src/helpers +sedsubst=src/.apaci.sedsubst +addconf=src/.apaci.addconf + ## ## pre-determine runtime modes ## @@ -185,7 +188,8 @@ rules=`echo $rules | sed -e 's/^://'` # determine modules -rm -f $src/Configuration.apaci 2/dev/null +rm -f $addconf 2/dev/null +touch $addconf modules= modulelist= OIFS=$IFS IFS=' @@ -406,10 +410,10 @@ if [ .$file != .$src/modules/extra/$modfilec ]; then cp $file $src/modules/extra/$modfilec fi -echo $src/Configuration.apaci -echo ## On-the-fly added module $src/Configuration.apaci -echo ## (configure --add-module=$file) $src/Configuration.apaci -echo AddModule modules/extra/$modfileo $src/Configuration.apaci +echo $addconf +echo ## On-the-fly added module $addconf +echo ## (configure --add-module=$file) $addconf +echo AddModule modules/extra/$modfileo $addconf module=`echo $modfileo |\ sed -e 's%^.*/\(.*\)$%\1%' \ -e 's/\.[^.]*$//' \ @@ -432,10 +436,10 @@ ;; esac modfile=`echo $file | sed -e 's;^src/;;'` -echo $src/Configuration.apaci -echo ## On-the-fly activated module $src/Configuration.apaci -echo ## (configure --activate-module=$file) $src/Configuration.apaci -echo AddModule $modfile $src/Configuration.apaci +echo $addconf +echo ## On-the-fly activated module $addconf +echo ## (configure --activate-module=$file) $addconf +echo AddModule $modfile $addconf module=`echo $modfile |\ sed -e 's%^.*/\(.*\)$%\1%' \ -e 's/\.[^.]*$//' \ @@ -783,8 +787,8 @@ if [ .$quiet = .no ]; then echo Creating Configuration.apaci in $src fi -rm -f sedsubst 2/dev/null -touch sedsubst +rm -f $sedsubst 2/dev/null +touch $sedsubst # generate settings from imported environment variables OIFS=$IFS IFS=$DIFS @@ -794,10 +798,10 @@ if [ .$val != . ]; then case $var in CFLAGS|LDFLAGS|LIBS|INCLUDES) -echo s%^#*\\(EXTRA_$var=\\).*%\\1$val%g sedsubst +echo s%^#*\\(EXTRA_$var=\\).*%\\1$val%g $sedsubst ;; *) -echo s%^#*\\($var=\\).*%\\1$val%g sedsubst +echo s%^#*\\($var=\\).*%\\1$val%g $sedsubst ;; esac eval $var=\\; export $var @@ -810,7 +814,7 @@ for rule in $rules; do name=`echo $rule | tr a-z A-Z` eval val=\$rule_$rule -echo s%^\\(Rule $name=\\).*%\\1$val%g sedsubst +echo s%^\\(Rule $name=\\).*%\\1$val%g $sedsubst if [ $verbose = yes ]; then echo + Rule $name=$val fi @@ -846,17 +850,17 @@ for module in $modules; do eval add=\$module_$module if [ $add = yes ]; then -echo s%^.*\\(AddModule.*$module\\..*\\)%\\1%g sedsubst -echo s%^.*\\(SharedModule.*$module\\..*\\)%\\1%g sedsubst +echo s%^.*\\(AddModule.*$module\\..*\\)%\\1%g $sedsubst +echo s%^.*\\(SharedModule.*$module\\..*\\)%\\1%g $sedsubst m=yes [static] else -echo s%^.*\\(AddModule.*$module\\..*\\)%# \\1%g sedsubst -echo s%^.*\\(SharedModule.*$module\\..*\\)%# \\1%g sedsubst +echo
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/27 03:22:30 Modified:.Makefile.tmpl Log: Remove unnecessary semicolon Revision ChangesPath 1.27 +1 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Makefile.tmpl 1998/04/25 19:27:03 1.26 +++ Makefile.tmpl 1998/04/27 10:22:30 1.27 @@ -307,7 +307,7 @@ # install the Apache C header files install-include: @echo === [include: Installing Apache C header files] - $(UMASK) 022; $(CP) $(SRC)/include/*.h $(includedir)/; + $(UMASK) 022; $(CP) $(SRC)/include/*.h $(includedir)/ @osdir=`grep '^OSDIR' $(SRC)/Makefile.config | sed -e 's:^OSDIR=::'`; \ echo $(UMASK) 022; $(CP) $(SRC)/$$osdir/os.h $(includedir)/; \ $(UMASK) 022; $(CP) $(SRC)/$$osdir/os.h $(includedir)/
cvs commit: apache-1.3/src CHANGES
rse 98/04/27 03:46:11 Modified:.STATUS configure Makefile.tmpl src CHANGES Log: Make the install root for make install in APACI's Makefile overrideable by package authors. This way an Apache package tarball can be rolled via $ ./configure --prefix=/usr/local ... $ make $ make install root=/tmp/apache-root by just assembling the files from /tmp/apache-root instead of fishing them out from /usr/local. This is the way Debian and RedHat already do their packages most of the time. Revision ChangesPath 1.335 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.334 retrieving revision 1.335 diff -u -r1.334 -r1.335 --- STATUS1998/04/27 09:55:04 1.334 +++ STATUS1998/04/27 10:46:07 1.335 @@ -70,6 +70,7 @@ * Ralf's manual renaming of forgotten non-ap_-symbols because of #define * Ralf's fix for SOCKS4 and adding of additional SOCKS5 support, PR#2140 * Ralf's workaround for sed limitation in configure script, PR#2136 +* Ralf's support for making APACI install root overrideable by pkg authors Available Patches: 1.21 +2 -2 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- configure 1998/04/27 09:55:04 1.20 +++ configure 1998/04/27 10:46:08 1.21 @@ -69,7 +69,7 @@ ## the paths to the Apache source tree ## -root=. +top=. mkf=Makefile src=src aux=src/helpers @@ -733,7 +733,7 @@ fi sed Makefile.tmpl $mkf \ -e [EMAIL PROTECTED]@%$PERL%g \ --e [EMAIL PROTECTED]@%$root%g \ +-e [EMAIL PROTECTED]@%$top%g \ -e [EMAIL PROTECTED]@%$src%g \ -e [EMAIL PROTECTED]@%$mkf%g \ -e [EMAIL PROTECTED]@%$aux%g \ 1.28 +120 -112 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile.tmpl 1998/04/27 10:22:30 1.27 +++ Makefile.tmpl 1998/04/27 10:46:08 1.28 @@ -70,7 +70,7 @@ SHELL = /bin/sh # paths to the source tree parts -ROOT= @ROOT@ +TOP = @TOP@ SRC = @SRC@ MKF = @MKF@ AUX = @AUX@ @@ -81,13 +81,18 @@ RM = rm -f TAR = tar UMASK = umask -MKDIR = $(AUX)/mkdir.sh -INSTALL = $(AUX)/install.sh -c +MKDIR = $(TOP)/$(AUX)/mkdir.sh +INSTALL = $(TOP)/$(AUX)/install.sh -c INSTALL_PROGRAM = $(INSTALL) -s -m 755 INSTALL_SCRIPT = $(INSTALL) -m 755 INSTALL_DATA= $(INSTALL) -m 644 PERL= @PERL@ +# installation root +# (overrideable by package maintainers for +# rolling packages without bristling the system) +root= + # installation paths prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -115,6 +120,9 @@ clean-support = @clean_support@ distclean-support = @distclean_support@ +# forwarding arguments +MFWD = root=$(root) + # list of shared objects which have to _ALWAYS_ be enabled # per default in the config file because of the directives used # in these default files. @@ -142,18 +150,18 @@ # build the package build: @echo === $(SRC) - @$(MAKE) -f $(MKF) $(MFLAGS) build-std $(build-support) - @touch $(SRC)/.apaci.build.ok + @$(MAKE) -f $(MKF) $(MFLAGS) $(MFWD) build-std $(build-support) + @touch $(TOP)/$(SRC)/.apaci.build.ok @echo === $(SRC) # build the standard stuff build-std: - @cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ all + @cd $(TOP)/$(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ all # build the additional support stuff build-support: @echo === $(SRC)/support; \ - cd $(SRC)/support; $(MAKE) $(MFLAGS) all; \ + cd $(TOP)/$(SRC)/support; $(MAKE) $(MFLAGS) all; \ if [ .$(suexec) = .1 ]; then \ $(MAKE) $(MFLAGS) \ EXTRA_CFLAGS='-DHTTPD_USER=\$(suexec_caller)\ -DUSERDIR_SUFFIX=\$(suexec_userdir)\' \ @@ -169,10 +177,10 @@ # package. This is implemented by running subtargets for the # separate parts of the installation process. install: - @if [ ! -f $(SRC)/.apaci.build.ok ]; then \ - $(MAKE) -f $(MKF) $(MFLAGS) build; \ + @if [ ! -f $(TOP)/$(SRC)/.apaci.build.ok ]; then \ + $(MAKE) -f $(MKF) $(MFLAGS) $(MFWD) build; \ fi - @$(MAKE) -f $(MKF) $(MFLAGS) \ +
cvs commit: apache-1.3/src CHANGES
rse 98/04/27 06:01:07 Modified:.STATUS INSTALL configure Makefile.tmpl src CHANGES Log: Add three additional configure options (--runtimedir, --logfiledir, --proxycachedir) to provide the possibility to adjust paths more granular. This is especially important for package maintainers. Revision ChangesPath 1.336 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.335 retrieving revision 1.336 diff -u -r1.335 -r1.336 --- STATUS1998/04/27 10:46:07 1.335 +++ STATUS1998/04/27 13:00:57 1.336 @@ -71,6 +71,7 @@ * Ralf's fix for SOCKS4 and adding of additional SOCKS5 support, PR#2140 * Ralf's workaround for sed limitation in configure script, PR#2136 * Ralf's support for making APACI install root overrideable by pkg authors +* Ralf's more granular install paths: runtimedir, logfiledir, proxycachedir Available Patches: 1.20 +15 -10apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- INSTALL 1998/04/27 11:02:44 1.19 +++ INSTALL 1998/04/27 13:00:58 1.20 @@ -143,11 +143,13 @@ [--mandir=DIR] [--disable-module=NAME] [--sysconfdir=DIR] [--enable-shared=NAME] [--datadir=DIR] [--disable-shared=NAME] - [--localstatedir=DIR] - [--compat] [--enable-suexec] - [--suexec-caller=UID] - [--with-perl=FILE] [--suexec-userdir=DIR] - [--without-support] + [--includedir=DIR] + [--localstatedir=DIR] [--enable-suexec] + [--runtimedir=DIR] [--suexec-caller=UID] + [--logfiledir=DIR] [--suexec-userdir=DIR] + [--proxycachedir=DIR] + [--compat] [--with-perl=FILE] + [--without-support] Use the CC, OPTIM, CFLAGS, INCLUDES, LDFLAGS, LIBS, CFLAGS_SHLIB, LDFLAGS_SHLIB, LDFLAGS_SHLIB_EXPORT and RANLIB environment variables to @@ -174,11 +176,14 @@ PREFIX=/usr/local/apache and EPREFIX=PREFIX. Use the --bindir=DIR, --sbindir=DIR, --libexecdir=DIR, --mandir=DIR, - --sysconfdir=DIR, --datadir=DIR and --localstatedir=DIR option to change - the paths for particular subdirectories of the installation tree. Defaults - are bindir=EPREFIX/bin, sbindir=EPREFIX/sbin, libexecdir=EPREFIX/libexec, - mandir=PREFIX/man, sysconfdir=PREFIX/etc, datadir=PREFIX/share and - localstatedir=PREFIX/var. + --sysconfdir=DIR, --datadir=DIR, --includedir=DIR, --localstatedir=DIR, + --runtimedir=DIR, --logfiledir=DIR and proxycachedir=DIR option to change + the paths for particular subdirectories of the installation tree. + Defaults are bindir=EPREFIX/bin, sbindir=EPREFIX/sbin, + libexecdir=EPREFIX/libexec, mandir=PREFIX/man, sysconfdir=PREFIX/etc, + datadir=PREFIX/share, includedir=PREFIX/include, + localstatedir=PREFIX/var, runtimedir=PREFIX/var/run, + logfiledir=PREFIX/var/log and proxycachedir=PREFIX/var/proxy. Use the --compat option to install Apache into a installation tree which has a similar layout than the one used with Apache 1.2. 1.22 +46 -26apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- configure 1998/04/27 10:46:08 1.21 +++ configure 1998/04/27 13:00:59 1.22 @@ -147,10 +147,11 @@ mandir='$prefix/man' sysconfdir='$prefix/etc' datadir='$prefix/share' -localstatedir='$prefix/var' -localstatesubdir_run='run' -localstatesubdir_logs='logs' includedir='$prefix/include' +localstatedir='$prefix/var' +runtimedir='$localstatedir/run' +logfiledir='$localstatedir/log' +proxycachedir='$localstatedir/proxy' # customization flags for # automatic apache suffix @@ -314,8 +315,11 @@ echo --mandir=DIR install manual pages in DIR [PREFIX/man] echo --sysconfdir=DIR install configuration files in DIR [PREFIX/etc]
cvs commit: apache-1.3/src/modules/proxy Makefile.tmpl
rse 98/04/27 06:35:22 Modified:src/modules/proxy Makefile.tmpl Log: Force rebuild of proxy module fr DSO situation, too. Revision ChangesPath 1.13 +1 -1 apache-1.3/src/modules/proxy/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/Makefile.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.tmpl 1998/04/09 10:22:52 1.12 +++ Makefile.tmpl 1998/04/27 13:35:21 1.13 @@ -56,7 +56,7 @@ #Dependencies -$(OBJS): Makefile +$(OBJS) $(SHLIB_OBJS): Makefile # DO NOT REMOVE mod_proxy.o: mod_proxy.c mod_proxy.h $(INCDIR)/httpd.h \
cvs commit: apache-1.3/src README.DSO
rse 98/04/27 09:11:41 Modified:.INSTALL src README.DSO Log: Document DSO support for OpenBSD. Revision ChangesPath 1.21 +3 -4 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- INSTALL 1998/04/27 13:00:58 1.20 +++ INSTALL 1998/04/27 16:11:40 1.21 @@ -75,10 +75,9 @@ platform-dependend. The current state is this: o Out-of-the-box supported platforms are: - - Linux - IRIX - - FreeBSD - OSF1 - - Solaris - UnixWare - - SunOS - HPUX + - Linux - SunOS- IRIX + - FreeBSD - Solaris - HPUX + - OpenBSD - OSF1 - UnixWare o Entirely unsupported platforms are: - Ultrix (because no dlopen-style interface) 1.5 +1 -0 apache-1.3/src/README.DSO Index: README.DSO === RCS file: /export/home/cvs/apache-1.3/src/README.DSO,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README.DSO1998/04/16 06:44:45 1.4 +++ README.DSO1998/04/27 16:11:41 1.5 @@ -142,6 +142,7 @@ (actually tested versions in parenthesis) o FreeBSD(2.1.5, 2.2.5, 2.2.6) + o OpenBSD(2.x) o Linux (Debian/1.3.1, RedHat/4.2) o Solaris(2.4, 2.5.1, 2.6) o SunOS (4.1.3)
cvs commit: apache-1.3/src/main http_log.c
martin 98/04/27 15:38:05 Modified:src CHANGES src/main http_log.c Log: Suppress error(0) messages for ap_log_error() when the APLOG_NOERRNO is unset (as it is in situations like timeouts) where it is unclear whether errno is set or not. It is questionable whether the ap_log_error() timeout calls in http_protocol should not have an APLOG_NOERRNO as well. Revision ChangesPath 1.800 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.799 retrieving revision 1.800 diff -u -u -r1.799 -r1.800 --- CHANGES 1998/04/27 13:01:05 1.799 +++ CHANGES 1998/04/27 22:37:47 1.800 @@ -1,5 +1,9 @@ Changes with Apache 1.3b7 + *) Suppress error(0) messages for ap_log_error() when the APLOG_NOERRNO + is unset (as it is in situations like timeouts) where it is unclear + whether errno is set or not. [Martin Kraemer] + *) Just having APACI's localstatedir is too general and not enough for most of the systems. 1.3b6 again required manual APACI patches by package maintainers from RedHat and FreeBSD because for their filesystem layout a 1.54 +1 -0 apache-1.3/src/main/http_log.c Index: http_log.c === RCS file: /home/cvs/apache-1.3/src/main/http_log.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -u -r1.53 -r1.54 --- http_log.c1998/04/18 10:54:55 1.53 +++ http_log.c1998/04/27 22:38:05 1.54 @@ -328,6 +328,7 @@ %s(%d): , file, line); } if (!(level APLOG_NOERRNO) + (save_errno != 0) #ifdef WIN32 !(level APLOG_WIN32ERROR) #endif
cvs commit: apache-2.0 STATUS
martin 98/04/27 15:50:18 Modified:.STATUS Log: vote (as long as I still can) Revision ChangesPath 1.36 +15 -9 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.35 retrieving revision 1.36 diff -u -u -r1.35 -r1.36 --- STATUS1998/04/03 19:48:44 1.35 +++ STATUS1998/04/27 22:50:17 1.36 @@ -25,17 +25,20 @@ segments should persist until the refcount drops to zero. It would be cool if pools could be created in such segments to allow things like shared tables and arrays. - +1: Roy, Paul, Ken, Ralf + +1: Roy, Paul, Ken, Ralf, Martin * Apache ports project - simple-to-install (a la CPAN) one-off tools, scripts (such as counters, guest books, et cetera) - +1: Roy, Paul, Ken, Ralf + +1: Roy, Paul, Ken, Ralf, Martin * Improve mod_include SSI handling, perhaps by caching offsets to directives. Also, clean up the conditional syntax to allow formats that bear a faint resemblance to other usages (such as allowing =~ and !~) in other languages. - +1: Roy, Ken + +1: Roy, Ken, Martin +Martin sez: I've been thinking about replacing the parser + by a recursive descent parser which would + reduce complexity tremendously. * Apache reusable code library, wherein we can put some of the stuff developed during the HTTP project that would be useful elsewhere. @@ -43,11 +46,11 @@ to have things like the arrays, tables, pools, and related primitives moved into a library of which httpd is just a client and other things can be too. - +1: Roy, Paul, Jim, Ken, Ralf + +1: Roy, Paul, Jim, Ken, Ralf, Martin * Replace the current Unix compilation model (Configuration.tmpl, home-brew Configure script) with the autoconf toolset. - +1: Brian, Roy, Dean, Ralf + +1: Brian, Roy, Dean, Ralf, Martin * Investigate replacing the current Unix compilation model (Configuration.tmpl home-brew Configure script) with the autoconf toolset. (this @@ -66,7 +69,7 @@ platforms... or even on a single platform, one copy with profiling another without. (There are a lot of possibilities: creating shadow trees, VPATH-style Makefile settings, etc.) - +1: Dean, Roy, Paul, Ralf + +1: Dean, Roy, Paul, Ralf, Martin * One of the main restrictions on Apache has been that we must assume a very low-level common denominator for the OSs out there. For example, @@ -164,7 +167,7 @@ o change API 'phase' model to use module-registered hooks rather than a fixed static structure -+1: Ken, Ralf, MarkC, Paul, Dean, Roy ++1: Ken, Ralf, MarkC, Paul, Dean, Roy, Martin Status: Ken has volunteered o use virtual functions for module hooks @@ -172,14 +175,14 @@ -1: Paul, Roy [would require two APIs] o clearly identify API functions by renaming them -+1: Ken, Ralf, Ben, Paul (plus back compat.), Dean, Jim, Roy ++1: Ken, Ralf, Ben, Paul (plus back compat.), Dean, Jim, Roy, Martin Status: Ken has volunteered [Roy: looks like it is already in 1.3] o backward compatibility with 1.3 (just require a recompile) if functions get renamed, old names retained as wrappers +1: Paul, Sameer, Marc, MarkC --1: Roy, Ralf +-1: Roy, Ralf, Martin o make API call syntax rational (e.g., all r*() routines list r as their first argument, et cetera) @@ -209,6 +212,9 @@ * make everything C++ friendly (fix that damned pool decl) +1: Roy, Paul, Ken, Ralf Status: nobody has volunteered yet + +* Proxy enhancements (or drop proxy altogether?) for HTTP/1.1 + and better ftp proxy Auth handling Closed issues:
cvs commit: apache-1.3 STATUS
martin 98/04/27 15:53:04 Modified:.STATUS Log: Reminder of DoS attack Revision ChangesPath 1.337 +4 -0 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.336 retrieving revision 1.337 diff -u -u -r1.336 -r1.337 --- STATUS1998/04/27 13:00:57 1.336 +++ STATUS1998/04/27 22:53:04 1.337 @@ -118,6 +118,10 @@ parent would then abort. See [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. + Msg-Id: ? + Documentation that needs writing: * Documentation for:
