cvs commit: apache-1.3/src CHANGES
rse 98/04/22 03:33:06 Modified:.STATUS Makefile.tmpl src CHANGES Log: Be friendly to existing mime.types and magic files on make install, too. Revision ChangesPath 1.325 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- STATUS1998/04/22 08:45:48 1.324 +++ STATUS1998/04/22 10:33:03 1.325 @@ -62,6 +62,7 @@ * 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 * Dynamic Shared Object (DSO) support for OpenBSD 2.x +* Ralf's enhanced make install carefulness for mime.types+magic files Available Patches: 1.24 +10 -2 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile.tmpl 1998/04/21 17:33:58 1.23 +++ Makefile.tmpl 1998/04/22 10:33:04 1.24 @@ -368,8 +368,16 @@ echo [PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]; \ fi; \ done - $(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types - $(CP) $(ROOT)/conf/magic $(sysconfdir)/magic + [EMAIL PROTECTED] conf in mime.types magic; do \ + echo $(INSTALL_DATA) $(ROOT)/conf/$$conf $(sysconfdir)/$$conf.default; \ + $(INSTALL_DATA) $(ROOT)/conf/$$conf $(sysconfdir)/$$conf.default; \ + if [ ! -f $(sysconfdir)/$$conf ]; then \ + echo $(INSTALL_DATA) $(ROOT)/conf/$$conf $(sysconfdir)/$$conf; \ + $(INSTALL_DATA) $(ROOT)/conf/$$conf $(sysconfdir)/$$conf; \ + else \ + echo [PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]; \ + fi; \ + done @echo === [config] 1.790 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.789 retrieving revision 1.790 diff -u -r1.789 -r1.790 --- CHANGES 1998/04/22 08:45:52 1.789 +++ CHANGES 1998/04/22 10:33:05 1.790 @@ -1,5 +1,10 @@ Changes with Apache 1.3b7 + *) Make sure that make install doesn't overwrite the `mime.types' and + `magic' files from an existing Apache installation. Because people often + customize these for own MIME and content types. + [Ralf S. Engelschall] + *) PORT: Dynamic Shared Object (DSO) support for OpenBSD 2.x [Peter Galbavy, Ralf S. Engelschall] PR#2109
cvs commit: apache-1.3/src CHANGES
rse 98/04/22 07:00:23
Modified:.STATUS configure
src CHANGES
Log:
Make sure all `for' loops in APACI's `configure' are running as expected by
explicitly initializing IFS for every loop and restoring it after the loop.
Submitted by: Ralf S. Engelschall
Reviewed by: Rasmus Lerdorf, Ralf S. Engelschall
Revision ChangesPath
1.326 +1 -0 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- STATUS1998/04/22 10:33:03 1.325
+++ STATUS1998/04/22 14:00:20 1.326
@@ -63,6 +63,7 @@
* Ralf's fix for the install-config target to get correct ScoreBoardFile
* Dynamic Shared Object (DSO) support for OpenBSD 2.x
* Ralf's enhanced make install carefulness for mime.types+magic files
+* Ralf's paranoia-fixes for the IFS-handling in `configure'
Available Patches:
1.16 +38 -19apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- configure 1998/04/21 16:00:33 1.15
+++ configure 1998/04/22 14:00:21 1.16
@@ -61,6 +61,10 @@
## Written by Ralf S. Engelschall [EMAIL PROTECTED]
##
+# default input separator chars: spacetabcr
+DIFS='
+'
+
##
## the paths to the Apache source tree
##
@@ -111,8 +115,9 @@
##
PERL=no-perl-on-this-system
-IFS=:
+OIFS=$IFS IFS=':'
for dir in $PATH; do
+OIFS=$IFS IFS=$DIFS
for exe in perl5 perl miniperl; do
if test -f $dir/$exe; then
if test -x $dir/$exe; then
@@ -120,7 +125,9 @@
fi
fi
done
+IFS=$OIFS
done
+IFS=$OIFS
PERL=`echo $PERL | sed -e 's://:/:'`
##
@@ -162,7 +169,7 @@
# determine rules
rules=
rulelist=
-IFS='
+OIFS=$IFS IFS='
'
for rule in `grep '^Rule' $src/Configuration.tmpl`; do
rule=`echo $rule | sed -e 's/^Rule[ ]*//'`
@@ -173,12 +180,13 @@
rules=$rules:$namelow
rulelist=$rulelist:$name=$arg
done
+IFS=$OIFS
# determine modules
rm -f $src/Configuration.apaci 2/dev/null
modules=
modulelist=
-IFS='
+OIFS=$IFS IFS='
'
for module in `egrep '^[# ]*(Add|Shared)Module' $src/Configuration.tmpl`; do
add=yes
@@ -202,12 +210,12 @@
modulelist=${modulelist}*
fi
done
+IFS=$OIFS
# backward compatibility from old src/Configuration.tmpl
# parameter names to the canonical Autoconf-style shell
# variable names.
-IFS='
-'
+OIFS=$IFS IFS=$DIFS
for var in CFLAGS LDFLAGS LIBS INCLUDES; do
eval val=\$EXTRA_$var
if [ .$val != . ]; then
@@ -216,14 +224,14 @@
echo + Hint: please use $var instead of EXTRA_$var next time
fi
done
+IFS=$OIFS
##
## parse argument line options
##
apc_prev=
-IFS='
-'
+OIFS=$IFS IFS=$DIFS
for apc_option
do
# if previous option needs an argument, assign it.
@@ -457,16 +465,18 @@
module )
case $apc_optarg in
all )
- IFS=:
+ OIFS=$IFS IFS=':'
for module in `echo $modules | sed -e
's/^://'`; do
eval module_${module}=yes
done
+ IFS=$OIFS
;;
most )
- IFS=:
+ OIFS=$IFS IFS=':'
for module in `echo $modules | sed -e
's/^://'`; do
eval module_${module}=yes
done
+ IFS=$OIFS
module_auth_db=no # not all platforms have
-ldb
module_mmap_static=no # not all platforms have
mmap()
module_so=no # not all platforms have
dlopen()
@@ -487,14 +497,15 @@
shared )
case $apc_optarg in
max )
- IFS=:
+ OIFS=$IFS IFS=':'
for module in `echo $modules | sed -e
's/^://'`; do
eval shared_${module}=yes
done
+ IFS=$OIFS
shared_so=no# because of bootstrapping
;;
remain )
- IFS
cvs commit: apache-1.3/src Configure
rse 98/04/22 07:49:39 Modified:src Configure Log: Make Marc happy... ;-) Revision ChangesPath 1.244 +5 -5 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- Configure 1998/04/22 08:45:54 1.243 +++ Configure 1998/04/22 14:49:37 1.244 @@ -667,9 +667,9 @@ uname -X echo Ideally, read the file PORTING, do what it says, and send the echo resulting patches to The Apache Group by filling out a report - echo form at http://bugs.apache.org/ - or, if your browser isn\'t - echo forms-capable, you can send them via email to - echo [EMAIL PROTECTED] If you don\'t wish to do the port + echo form at http://www.apache.org/bug_report.html - or, if your + echo browser isn\'t forms-capable, you can send them via email to + 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 echo @@ -934,8 +934,8 @@ echo ** luck: We were able to guess the compiler and linker flags echo ** for creating shared objects from your Perl installation. echo ** If they actually work, please send the following information -echo ** for inclusion into later releases to [EMAIL PROTECTED] or -echo ** make a suggestion report at http://bugs.apache.org/:; +echo ** for inclusion into later releases to new-httpd@apache.org or make +echo ** a suggestion report at http://www.apache.org/bug_report.html:; echo ** PLATFORM=$PLAT echo ** CFLAGS_SHLIB=$CFLAGS_SHLIB echo ** LDFLAGS_SHLIB=$LDFLAGS_SHLIB
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/22 07:56:29
Modified:.Makefile.tmpl
Log:
Consistency cleanups for top-level Makefile:
- use the .install.* files under $(SRC) as already done with
build-ok-file to avoid conflicts when using a shadow tree, i.e.
.install.tmp - $(SRC)/.apaci.install.tmp
.install.conf - $(SRC)/.apaci.install.conf
- use same tree copy variants for includes as already done for
htdocs, etc.: CP - $(TAR)+find, etc.
- show real source filenames (but with an [*] mark to indicate that the
source is on-the-fly adjusted) instead of the unmeaningly filename of the
temporary file.
- more parameter usage for commands:
ln - $(LN), rm -f - $(RM)
Revision ChangesPath
1.25 +43 -33apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.tmpl 1998/04/22 10:33:04 1.24
+++ Makefile.tmpl 1998/04/22 14:56:28 1.25
@@ -77,6 +77,8 @@
# build tools
CP = cp
+LN = ln
+RM = rm -f
TAR = tar
MKDIR = $(AUX)/mkdir.sh
INSTALL = $(AUX)/install.sh -c
@@ -172,8 +174,8 @@
@$(MAKE) -f $(MKF) $(MFLAGS) \
install-mktree install-programs $(install-support) \
install-include install-data install-config
- [EMAIL PROTECTED] -f .install.tmp
- [EMAIL PROTECTED] -f .install.conf
+ [EMAIL PROTECTED](RM) $(SRC)/.apaci.install.tmp
+ [EMAIL PROTECTED](RM) $(SRC)/.apaci.install.conf
[EMAIL PROTECTED] [ .$(QUIET) != .1 ]; then \
echo
++; \
echo | You now have successfully built and installed the
|; \
@@ -228,17 +230,17 @@
$(INSTALL_SCRIPT) $(SRC)/libhttpd.so $(libexecdir)/libhttpd.so;
\
SHLIB_SUFFIX_LIST=`grep '^SHLIB_SUFFIX_LIST=' $(SRC)/Makefile
| sed -e 's:^.*=::'`; \
if [ .$$SHLIB_SUFFIX_LIST != . ]; then \
- echo rm -f $(libexecdir)/libhttpd.so.*; \
- rm -f $(libexecdir)/libhttpd.so.*; \
+ echo $(RM) $(libexecdir)/libhttpd.so.*; \
+ $(RM) $(libexecdir)/libhttpd.so.*; \
for suffix in $$SHLIB_SUFFIX_LIST ; do \
[ .$$suffix = . ] continue; \
- echo ln $(libexecdir)/libhttpd.so
$(libexecdir)/libhttpd.so.$$suffix; \
- ln $(libexecdir)/libhttpd.so
$(libexecdir)/libhttpd.so.$$suffix; \
+ echo $(LN) $(libexecdir)/libhttpd.so
$(libexecdir)/libhttpd.so.$$suffix; \
+ $(LN) $(libexecdir)/libhttpd.so
$(libexecdir)/libhttpd.so.$$suffix; \
done; \
fi; \
fi
$(INSTALL_DATA) $(SRC)/support/httpd.8 $(mandir)/man8/httpd.8
- [EMAIL PROTECTED] -f .install.conf; touch .install.conf
+ [EMAIL PROTECTED](RM) $(SRC)/.apaci.install.conf; touch
$(SRC)/.apaci.install.conf
[EMAIL PROTECTED] [ .`grep '^[ ]*SharedModule'
$(SRC)/Configuration.apaci` != . ]; then \
for mod in `egrep '^[ ]*SharedModule'
$(SRC)/Configuration.apaci |\
sed -e 's/^[]*SharedModule[ ]*//'`; do \
@@ -250,7 +252,7 @@
echo dummy | awk '{ printf(%sLoadModule %-18s %s\n, \
prefix, modname, modpath); }' \
prefix=$$prefix modname=$$name \
- modpath=$(libexecdir_relative)$$file .install.conf;
\
+ modpath=$(libexecdir_relative)$$file
$(SRC)/.apaci.install.conf; \
done; \
fi
@echo === [programs]
@@ -260,31 +262,34 @@
@echo === [support: Installing Apache support programs and scripts]
$(INSTALL_PROGRAM) $(SRC)/support/ab $(sbindir)/ab
$(INSTALL_DATA) $(SRC)/support/ab.1 $(mandir)/man1/ab.1
+ @echo $(INSTALL_SCRIPT) $(SRC)/support/apachectl[*]
$(sbindir)/apachectl; \
sed -e
's;PIDFILE=.*;PIDFILE=$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-e 's;HTTPD=.*;HTTPD=$(sbindir)/httpd;' \
- $(SRC)/support/apachectl .install.tmp \
- $(INSTALL_SCRIPT) .install.tmp $(sbindir)/apachectl
+ $(SRC)/support/apachectl $(SRC)/.apaci.install.tmp \
+ $(INSTALL_SCRIPT) $(SRC)/.apaci.install.tmp $(sbindir)/apachectl
$(INSTALL_DATA) $(SRC)/support/apachectl.1 $(mandir)/man1/apachectl.1
$(INSTALL_PROGRAM) $(SRC)/support/htpasswd $(bindir)/htpasswd
$(INSTALL_DATA) $(SRC)/support/htpasswd.1 $(mandir)/man1/htpasswd.1
cvs commit: apache-1.3/src/modules/standard mod_cgi.c
rse 98/04/22 08:06:46 Modified:.STATUS src CHANGES src/modules/standard mod_cgi.c Log: Fix DEBUG_CGI situation in mod_cgi.c Submitted by: David MacKenzie [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall Revision ChangesPath 1.327 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.326 retrieving revision 1.327 diff -u -r1.326 -r1.327 --- STATUS1998/04/22 14:00:20 1.326 +++ STATUS1998/04/22 15:06:39 1.327 @@ -64,6 +64,7 @@ * Dynamic Shared Object (DSO) support for OpenBSD 2.x * Ralf's enhanced make install carefulness for mime.types+magic files * Ralf's paranoia-fixes for the IFS-handling in `configure' +* Fix for the DEBUG_CGI (#ifdef'ed) situation in mod_cgi.c, PR#2114 Available Patches: 1.792 +2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.791 retrieving revision 1.792 diff -u -r1.791 -r1.792 --- CHANGES 1998/04/22 14:00:22 1.791 +++ CHANGES 1998/04/22 15:06:41 1.792 @@ -1,5 +1,7 @@ Changes with Apache 1.3b7 + *) Fix DEBUG_CGI situation in mod_cgi.c [David MacKenzie] PR#2114 + *) Make sure the input field separator (IFS) shell variable is explicitly initialized correctly before _every_ `for' loop and also restored after the loops. [Ralf S. Engelschall] 1.76 +1 -1 apache-1.3/src/modules/standard/mod_cgi.c Index: mod_cgi.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_cgi.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- mod_cgi.c 1998/04/13 10:32:26 1.75 +++ mod_cgi.c 1998/04/22 15:06:45 1.76 @@ -303,7 +303,7 @@ RAISE_SIGSTOP(CGI_CHILD); #ifdef DEBUG_CGI fprintf(dbg, Attempting to exec %s as %sCGI child (argv0 = %s)\n, - r-filename, nph ? NPH : , argv0); + r-filename, cld-nph ? NPH : , argv0); #endif ap_add_cgi_vars(r);
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 EPREFIX
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 src
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 INSTALL
rse 98/04/19 23:14:49 Modified:.INSTALL Log: Add note about env usage or the C-shell variant setenv KEY VALUE. Thanks to Dean and Lars for mentioning this. Revision ChangesPath 1.13 +8 -0 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- INSTALL 1998/04/16 06:44:44 1.12 +++ INSTALL 1998/04/20 06:14:48 1.13 @@ -157,6 +157,14 @@ 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). + 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.
cvs commit: apache-1.3 configure
rse 98/04/19 23:30:59 Modified:.configure Log: Bugfix: libexecdir is based on exec_prefix, so the relative variant has to use exec_prefix when trying to reduce the prefix. Revision ChangesPath 1.12 +1 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- configure 1998/04/19 16:03:38 1.11 +++ configure 1998/04/20 06:30:59 1.12 @@ -646,7 +646,7 @@ ## localstatedir_relative=`echo $localstatedir | sed -e s:^$prefix/*:: -e 's:\(.\)$:\1/:'` sysconfdir_relative=`echo $sysconfdir | sed -e s:^$prefix/*:: -e 's:\(.\)$:\1/:'` -libexecdir_relative=`echo $libexecdir | sed -e s:^$prefix/*:: -e 's:\(.\)$:\1/:'` +libexecdir_relative=`echo $libexecdir | sed -e s:^$exec_prefix/*:: -e 's:\(.\)$:\1/:'` ## ## check and debug
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/19 23:40:00 Modified:.Makefile.tmpl Log: Add missing $(MFLAGS) which always should be passed down. Revision ChangesPath 1.20 +1 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile.tmpl 1998/04/17 07:36:12 1.19 +++ Makefile.tmpl 1998/04/20 06:40:00 1.20 @@ -196,7 +196,7 @@ # the non-verbose variant for package maintainers install-quiet: - @$(MAKE) -f $(MKF) QUIET=1 install + @$(MAKE) -f $(MKF) $(MFLAGS) QUIET=1 install # create the installation tree install-mktree:
cvs commit: apache-1.3 STATUS
rse 98/04/20 00:45:44 Modified:.STATUS Log: STATUS updates for the other guys... ;-) Revision ChangesPath 1.307 +3 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- STATUS1998/04/19 16:03:38 1.306 +++ STATUS1998/04/20 07:45:43 1.307 @@ -45,8 +45,11 @@ * 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 +* Marc's catching of defined handlers still ending in the default handler * Ralf's cast for dlopen's arg1 under OSF1 and FreeBSD 2.2.x * Lars' fix for the prefix setup on configure --compat +* Dean's add %pA, %pI, and %pp codes to ap_vformatter +* Dean's httpd -S command line option to dump parsed vhost setup Available Patches:
cvs commit: apache-1.3 Announcement
rse 98/04/20 01:53:09 Modified:.Announcement Log: Finally fix URLs now that the locations exists: apache-1.3b6 - apache_1.3b6 plus tree typos. Revision ChangesPath 1.17 +27 -27apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Announcement 1998/04/20 08:12:28 1.16 +++ Announcement 1998/04/20 08:53:09 1.17 @@ -23,77 +23,77 @@ which are new with version 1.3b6 are tagged '+'): 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 + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/windows + http://www.apache.org/dist/apache_1.3b6/README.NT o Ported to BS2000/OSD, a mainframe OS with EBCDIC charset - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/ebcdic + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/ebcdic + Apache Autoconf-style Interface (APACI) for out-of-the-box installation - http://www.apache.org/dist/apache-1.3b6/README.configure - http://www.apache.org/dist/apache-1.3b6/INSTALL + http://www.apache.org/dist/apache_1.3b6/README.configure + http://www.apache.org/dist/apache_1.3b6/INSTALL + Dynamic Shared Object (DSO) support for all major Unix platforms - http://www.apache.org/dist/apache-1.3b6/src/README.DSO + http://www.apache.org/dist/apache_1.3b6/src/README.DSO + APache eXtenSion (APXS) tool for building third-party modules as DSO - http://www.apache.org/dist/apache-1.3b6/src/README.DSO - http://www.apache.org/dist/apache-1.3b6/src/support/ + http://www.apache.org/dist/apache_1.3b6/src/README.DSO + http://www.apache.org/dist/apache_1.3b6/src/support/ + Additional support tools: apachectl, ab (ApacheBench), dbmmanage - http://www.apache.org/dist/apache-1.3b6/src/support/ + http://www.apache.org/dist/apache_1.3b6/src/support/ + Enhanced configuration support: Include and Line-Continuation - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1_3 + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/new_features_1_3 o New `Magic' MIME-typing module for content type guessing - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_mime_magic + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/mod/mod_mime_magic o Regular Expression support for Alias and Redirect directives - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_alias + 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 + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/mod/mod_rewrite o Spell-checking module for on-the-fly URL corrections - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_speling + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/mod/mod_speling o Additional access control via CIDR and Netmasks - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_access + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/mod/mod_access o Improved HTTP/1.1-style Virtual Host support - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/vhost/index + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/vhosts/ o Less Buffering of CGI Script Output (makes nph- obsolete) - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1_3 + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/new_features_1_3 + Various Proxy Enhancements (NoProxy, ProxyDomain, ProxyPassReverse) - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_proxy + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/mod/mod_proxy o Various internal performance improvements - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/new_features_1_3 + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/new_features_1_3 o Various fixes to the hostname DNS lookup handling - http://www.apache.org/dist/apache-1.3b6/htdocs/mod/core#hostnamelookups + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/mod/core o Various Directory Indexing enhancements - http://www.apache.org/dist/apache-1.3b6/htdocs/manual/mod/mod_autoindex + http://www.apache.org/dist/apache_1.3b6/htdocs/manual/mod/mod_autoindex o Various Logging enhancements (Reliable Piped
cvs commit: apache-site/dist .htaccess README.html
rse 98/04/20 02:31:15 Modified:.index.html dist .htaccess README.html Log: Update the frontdoor for 1.3b6. Revision ChangesPath 1.52 +12 -7 apache-site/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/index.html,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- index.html1998/03/30 03:13:50 1.51 +++ index.html1998/04/20 09:31:14 1.52 @@ -72,16 +72,21 @@ PHR -H2 ALIGN=CENTERApache 1.3b5 Now Available: -BRThe third beta release of Apache 1.3/H2 +H2 ALIGN=CENTERApache 1.3b6 Now Available: +BRThe latest public beta release of Apache 1.3/H2 PBLOCKQUOTE -Apache 1.3b5 is the third public beta of the forthcoming Apache 1.3 -Server. Apache 1.3 includes several new enhancements, improvements -and performance boosts, but the most visible addition is the ability -to run under Microsoft Windows NT 4.0 and 95. A compiled NT/95 binary -version of the server will shortly be available. +Apache 1.3b6 is the latest public beta of the forthcoming Apache 1.3 Server +and a release candidate for 1.3.0. Apache 1.3 includes several new +enhancements, improvements and performance boosts, but the most visible +additions are the ability to A HREF=docs/windowsrun under Microsoft +Windows NT 4.0 amp; 95/A and the new A +HREF=dist/apache_1.3b6/INSTALLAutoconf-style Interface for Unix/A. +For a compact summary of the more important changes check out the A +HREF=dist/Announcement.htmlAnnouncement/A and for a detailed log of all +changes check out the A HREF=dist/CHANGESCHANGES/A file. + /BLOCKQUOTE P ALIGN=CENTER 1.4 +3 -0 apache-site/dist/.htaccess Index: .htaccess === RCS file: /export/home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .htaccess 1998/02/20 18:55:39 1.3 +++ .htaccess 1998/04/20 09:31:15 1.4 @@ -3,6 +3,9 @@ AddDescription 1.3b3 gzipped source apache_1.3b3.tar.gz AddDescription 1.3b5 gzipped source apache_1.3b5.tar.gz AddDescription 1.3b5 compressed source apache_1.3b5.tar.Z +AddDescription 1.3b6 compressed source apache_1.3b6.tar.Z +AddDescription 1.3b6 gzipped source apache_1.3b6.tar.gz +AddDescription 1.3b6 NT binary apache_1.3b6_1.exe AddDescription 1.2.5 compressed source apache_1.2.5.tar.Z AddDescription 1.2.5 gzipped source apache_1.2.5.tar.gz AddDescription List of changes in 1.3 /export/pub/apache/dist/CHANGES 1.11 +12 -13apache-site/dist/README.html Index: README.html === RCS file: /export/home/cvs/apache-site/dist/README.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- README.html 1998/03/24 05:59:18 1.10 +++ README.html 1998/04/20 09:31:15 1.11 @@ -8,28 +8,27 @@ PFor information about new features in 1.2, see the A HREF=../docs/documentation/A. -H2Apache 1.3b5 Now Available/H2 +H2Apache 1.3b6 Released/H2 P -Apache 1.3b5 is the newest public beta of the forthcoming Apache 1.3 -Server. Apache 1.3 includes several new enhancements, improvements -and performance boosts, but the most visible addition is the ability -to run under Microsoft Windows NT 4.0 and 95. At present 1.3b5 is only -available in source code. It will require compiler to use it -(Microsoft Visual C++ 5.0 for Windows). A binary version for Windows -will be available shortly. If you are using, or had previously tried -an earlier alpha or beta release, please upgrade to 1.3b5 at your -earliest convenience. A summary of the more important changes is -available in the A HREF=CHANGESCHANGES/A file. +Apache 1.3b6 is the latest public beta of the forthcoming Apache 1.3 Server +and a release candidate for 1.3.0. Apache 1.3 includes several new +enhancements, improvements and performance boosts, but the most visible +additions are the ability to A HREF=../docs/windowsrun under Microsoft +Windows NT 4.0 amp; 95/A and the new A +HREF=apache_1.3b6/INSTALLAutoconf-style Interface for Unix/A. +For a compact summary of the more important changes check out the A +HREF=Announcement.htmlAnnouncement/A and for a detailed log of all changes +check out the A HREF=CHANGESCHANGES/A file. -pFONT COLOR=redImportant Note:/FONT Since 1.3b5 is a beta +pFONT COLOR=redImportant Note:/FONT Since 1.3b6 is a beta release, it undoubtedly has its share of warts and bugs. Although it has been tested quite strenuously, your milage may vary. PFor information about new features in 1.3, see the A HREF=../docs/documentation/A. For information about
cvs commit: apache-site index.html
rse 98/04/20 02:35:27 Modified:.index.html Log: Ops, one more hyperlink: b5 - b6 Revision ChangesPath 1.53 +1 -1 apache-site/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/index.html,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- index.html1998/04/20 09:31:14 1.52 +++ index.html1998/04/20 09:35:26 1.53 @@ -91,7 +91,7 @@ P ALIGN=CENTER -a href=dist/Download Apache 1.3b5/a | +a href=dist/Download Apache 1.3b6/a | a href=docs/windows.htmlApache for Windows/a | a href=docs/new_features_1_3.htmlNew Features in Apache 1.3/a
cvs commit: apache-site/dist .htaccess
rse 98/04/20 02:36:33 Modified:dist .htaccess Log: Pitfall: the Win32 binary uses underscores in filename Revision ChangesPath 1.5 +1 -1 apache-site/dist/.htaccess Index: .htaccess === RCS file: /export/home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .htaccess 1998/04/20 09:31:15 1.4 +++ .htaccess 1998/04/20 09:36:32 1.5 @@ -5,7 +5,7 @@ AddDescription 1.3b5 compressed source apache_1.3b5.tar.Z AddDescription 1.3b6 compressed source apache_1.3b6.tar.Z AddDescription 1.3b6 gzipped source apache_1.3b6.tar.gz -AddDescription 1.3b6 NT binary apache_1.3b6_1.exe +AddDescription 1.3b6 NT binary apache_1_3b6_1.exe AddDescription 1.2.5 compressed source apache_1.2.5.tar.Z AddDescription 1.2.5 gzipped source apache_1.2.5.tar.gz AddDescription List of changes in 1.3 /export/pub/apache/dist/CHANGES
cvs commit: apache-1.3/src/os/unix os.c
rse 98/04/19 05:25:22 Modified:src/os/unix os.c Log: Avoid warnings for discarded const under some platforms like OSF1 and FreeBSD 2.2.x where dlopen is defined to have a char * as its first argument instead of a const char *. Revision ChangesPath 1.10 +5 -0 apache-1.3/src/os/unix/os.c Index: os.c === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- os.c 1998/04/13 18:05:19 1.9 +++ os.c 1998/04/19 12:25:22 1.10 @@ -26,7 +26,12 @@ handle = shl_load(path, BIND_IMMEDIATE|BIND_VERBOSE|BIND_NOSTART, 0L); return (void *)handle; #else +#if defined(OSF1) ||\ +(defined(__FreeBSD_version) (__FreeBSD_version = 22)) +return dlopen((char *)path, RTLD_NOW); +#else return dlopen(path, RTLD_NOW); +#endif #endif }
cvs commit: apache-1.3/src/main http_core.c
rse 98/04/18 04:53:35 Modified:src/main http_core.c Log: Give the AddModule directive a more useful error message. Revision ChangesPath 1.184 +4 -3 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.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- http_core.c 1998/04/13 18:05:11 1.183 +++ http_core.c 1998/04/18 11:53:35 1.184 @@ -1244,9 +1244,10 @@ const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); if (err != NULL) return err; -if (ap_add_named_module (arg)) -return NULL; -return required module not found; +if (!ap_add_named_module(arg)) + return ap_pstrcat(cmd-pool, Cannot add module via name ', arg, + ': not in list of loaded modules, NULL); +return NULL; } static const char *clear_module_list_command (cmd_parms *cmd, void *dummy)
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/17 00:36:12
Modified:.Makefile.tmpl
Log:
Only whitespace cosmetics and cleanups:
- consistently replace leading whitespaces with tabs to make
the file correctly indented both with tabs=4 and tabs=8
- remove trailing whitespaces on lines to make every Make happy
Revision ChangesPath
1.19 +58 -58apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.tmpl 1998/04/16 06:47:12 1.18
+++ Makefile.tmpl 1998/04/17 07:36:12 1.19
@@ -6,7 +6,7 @@
## are met:
##
## 1. Redistributions of source code must retain the above copyright
-##notice, this list of conditions and the following disclaimer.
+##notice, this list of conditions and the following disclaimer.
##
## 2. Redistributions in binary form must reproduce the above copyright
##notice, this list of conditions and the following disclaimer in
@@ -63,7 +63,7 @@
##
## ==
-## Options
+## Options
## ==
# safe environment
@@ -126,7 +126,7 @@
setenvif_module
## ==
-## Targets
+## Targets
## ==
# default target
@@ -137,7 +137,7 @@
## --
# build the package
-build:
+build:
@echo === $(SRC)
@$(MAKE) -f $(MKF) $(MFLAGS) build-std $(build-support)
@touch $(SRC)/.apaci.build.ok
@@ -159,7 +159,7 @@
echo === $(SRC)/support
## --
-## Installation Targets
+## Installation Targets
## --
# the install target for installing the complete Apache
@@ -170,28 +170,28 @@
$(MAKE) -f $(MKF) $(MFLAGS) build; \
fi
@$(MAKE) -f $(MKF) $(MFLAGS) \
- install-mktree install-programs $(install-support) \
+ install-mktree install-programs $(install-support) \
install-include install-docroot install-config
[EMAIL PROTECTED] -f .install.tmp
[EMAIL PROTECTED] -f .install.conf
[EMAIL PROTECTED] [ .$(QUIET) != .1 ]; then \
- echo ++; \
- echo | You now have successfully built and installed the |; \
- echo | Apache 1.3 HTTP server. To verify that Apache actually |; \
- echo | works correctly you can immediately try to fire it up |; \
- echo | the first time by running: |; \
- echo ||; \
- echo | $(sbindir)/apachectl start; \
- echo ||; \
- echo | Then you should additionally adjust the configuration |; \
- echo | files which can be found under the following paths:|; \
- echo ||; \
- echo | $(sysconfdir)/{httpd,access,srm}.conf; \
- echo ||; \
- echo | Thanks for running Apache. |; \
- echo |The Apache Group|; \
- echo |http://www.apache.org/ |; \
- echo ++; \
+ echo
++; \
+ echo | You now have successfully built and installed the
|; \
+ echo | Apache 1.3 HTTP server. To verify that Apache actually
|; \
+ echo | works correctly you can immediately try to fire it up
|; \
+ echo | the first time by running:
|; \
+ echo |
|; \
+ echo | $(sbindir)/apachectl start; \
+ echo |
|; \
+ echo | Then you should additionally adjust the configuration
|; \
+ echo | files which can be found under the following paths:
|; \
+ echo
cvs commit: apache-1.3/src CHANGES Configure
rse 98/04/17 11:49:38
Modified:.STATUS
src CHANGES Configure
Log:
Make sure some AWK's don't fail in src/Configure with string too long errors
when generating the MODULES entry for src/Makefile
Submitted by: Ralf S. Engelschall
Reviewed by: Ben Hyde, Ralf S. Engelschall
Revision ChangesPath
1.300 +1 -0 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- STATUS1998/04/16 17:30:45 1.299
+++ STATUS1998/04/17 18:49:34 1.300
@@ -58,6 +58,7 @@
Committed Code Changes:
* Lars' Configure fix to avoid confusing message under APACI control
+* Ralf's Configure fix for AWK's failing with string to long error
Available Patches:
1.771 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- CHANGES 1998/04/16 17:30:46 1.770
+++ CHANGES 1998/04/17 18:49:35 1.771
@@ -1,5 +1,9 @@
Changes with Apache 1.3b7
+ *) PORT: Make sure some AWK's don't fail in src/Configure with string too
+ long errors when generating the MODULES entry for src/Makefile
+ [Ben Hyde, Ralf S. Engelschall]
+
*) Make sure src/Configure doesn't complain about the old directory
/usr/local/etc/httpd/ when APACI is used. [Lars Eilebrecht]
1.240 +4 -6 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- Configure 1998/04/16 17:30:47 1.239
+++ Configure 1998/04/17 18:49:36 1.240
@@ -1362,12 +1362,10 @@
## Now add the auto-generated library targets. Need to use awk so we
## don't hang a continuation on the last line.
##
-$CAT $awkfile EOF3
-BEGIN {
- split ($AUTOLIBS, libs)
-EOF3
-$CAT $awkfile 'EOF4'
+$CAT $awkfile 'EOF4'
+{
z = 0
+ split ($0, libs)
for ( lib in libs ) {
if (z != 0)
printf ( \\\n)
@@ -1379,7 +1377,7 @@
printf (\n)
}
EOF4
-awk -f $awkfile Makefile /dev/null
+echo $AUTOLIBS | awk -f $awkfile Makefile
echo Makefile
cvs commit: apache-1.3/src README.DSO
rse 98/04/15 23:44:46 Modified:.INSTALL src README.DSO Log: Make sure the user is notified about the possible side-effects LoadModule can have because of the different execution order of modules. Revision ChangesPath 1.12 +3 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- INSTALL 1998/04/15 06:51:27 1.11 +++ INSTALL 1998/04/16 06:44:44 1.12 @@ -94,7 +94,9 @@ installed from which Apache can guess the options. For more in-depth information about DSO support in Apache 1.3 please -read the file src/README.DSO. +read the file src/README.DSO carefully. Especially the section +entitled Advantages Disadvantages because using the DSO mechanism +can have strange side-effects if you are not carefully. BE WARNED! 3. Configuring the source tree --- 1.4 +21 -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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README.DSO1998/04/14 10:51:39 1.3 +++ README.DSO1998/04/16 06:44:45 1.4 @@ -264,6 +264,27 @@ complicated assembler tricks for relative addressing which are not necessarily as fast as absolute addressing. + - As of Apache 1.3 the in-core list of active modules is not priorized. + Instead it is just the list of statically linked modules in reverse order + as found in the src/Configuration* file (the list is constructed by + adding modules to the top, i.e. later in the config means earlier in the + list and thus results in higher priority). But DSO-based modules are + added to this in-core list of modules under run-time _after_ the + statically linked modules were already added. They are added again in + reverse order, i.e. each `LoadModule' command inserts the module again at + the top of the list. But because the list is not priorized the two parts + (statically linked modules and run-time loaded modules) are _NEVER_ + merged. They are just connected together but not sorted as a whole. + + In other words: When a module is compiled as a DSO it automatically + results in a higher priority than any statically compiled modules. This + can have strange side-effects because of different execution order. As a + consequence the rule of thumb is this: Either compile all modules + statically or all modules as DSO (--enable-shared=max) when you want to + avoid side-effects. And only compile just a subset of modules as DSO when + you are sure the different execution order has no side-effects for your + configuration. BE WARNED! + - Because DSO modules cannot be linked against other DSO-based libraries (ld -lfoo) you cannot use the DSO mechanism for all types of modules. Or in other words, modules compiled as DSO files are restricted to only use
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/15 23:47:13
Modified:.Makefile.tmpl
Log:
Typo. Thanks to Lars for hint.
Revision ChangesPath
1.18 +1 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.tmpl 1998/04/14 19:17:36 1.17
+++ Makefile.tmpl 1998/04/16 06:47:12 1.18
@@ -184,7 +184,7 @@
echo | $(sbindir)/apachectl start; \
echo ||; \
echo | Then you should additionally adjust the configuration |; \
- echo | files which you can found under the following paths: |; \
+ echo | files which can be found under the following paths:|; \
echo ||; \
echo | $(sysconfdir)/{httpd,access,srm}.conf; \
echo ||; \
cvs commit: apache-1.3/src CHANGES Configure
rse 98/04/16 10:30:49 Modified:.STATUS src CHANGES Configure Log: Make sure src/Configure only complains about old paths when not running under APACI's control. Submitted by: Lars Eilebrecht Reviewed by: Ralf S. Engelschall Revision ChangesPath 1.299 +2 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.298 retrieving revision 1.299 diff -u -r1.298 -r1.299 --- STATUS1998/04/16 00:33:45 1.298 +++ STATUS1998/04/16 17:30:45 1.299 @@ -57,6 +57,8 @@ Committed Code Changes: +* Lars' Configure fix to avoid confusing message under APACI control + Available Patches: * Arnt Gulbrandsen [EMAIL PROTECTED] 03 Apr 1998 21:28:17 +0200 1.770 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.769 retrieving revision 1.770 diff -u -r1.769 -r1.770 --- CHANGES 1998/04/15 17:10:17 1.769 +++ CHANGES 1998/04/16 17:30:46 1.770 @@ -1,3 +1,8 @@ +Changes with Apache 1.3b7 + + *) Make sure src/Configure doesn't complain about the old directory + /usr/local/etc/httpd/ when APACI is used. [Lars Eilebrecht] + Changes with Apache 1.3b6 *) PORT: Clean up warnings on Ultrix and HPUX. [Ben Hyde] 1.239 +4 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- Configure 1998/04/15 17:10:18 1.238 +++ Configure 1998/04/16 17:30:47 1.239 @@ -186,8 +186,10 @@ ## that the user was using the old default root directory ## and issue a notice about it. ## -if [ -d /usr/local/etc/httpd/ ] +if [ $file != Configuration.apaci ] then + if [ -d /usr/local/etc/httpd/ ] + then if egrep '^EXTRA_CFLAGS.*HTTPD_ROOT' $file /dev/null then : @@ -199,6 +201,7 @@ echo | httpd with the option '-d /usr/local/etc/httpd' if you still echo | want to use the old root directory for your server. fi + fi fi
cvs commit: apache-1.3 Announcement
rse 98/04/14 23:16:57 Modified:.Announcement Log: Ok, we now have to edit the Announcement in the CVS or we never get finished. This is my second cut of the Announcement: - based on my first version - merged in text changes of Jim's version but keep the +/- style because I really think it's better and more quickly to read then appended asterisks - replaced relative filenames with real URLs to make the users even more happy, but trimmed the URLs to fit into 80 cols via taz's Multiview. (BTW: We additionally could apply a s:dist/apache-1.3b6/htdocs/manual:docs:g Comments or votes?) Revision ChangesPath 1.13 +84 -60apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Announcement 1998/04/11 20:18:24 1.12 +++ Announcement 1998/04/15 06:16:56 1.13 @@ -1,62 +1,86 @@ -Apache 1.3beta6 Released - -The Apache Group is pleased to announce the release of the 1.3b6 version -of Apache, the latest beta release of the Apache web server. + Apache 1.3 Beta 6 Released + == -Apache 1.3 offers numerous enhancements, improvements and performance -boosts over the 1.2 code base. The most visible and noteworthy addition -is the ability to run Apache under Windows 95 and NT (known as the -``Win32'' port). - -Apache 1.3b6 under both Win32 and UNIX has undergone extensive testing, and is -much improved over the previous 1.3b5 release. We feel confident that the -Win32 port is ready for a wider audience, and with that in mind, we are -providing pre-compiled executables for the Win32 platform, as well as a true -Win32 environment Installer (InstallShield). This is, however, still a beta -release and there are known issues that will be fixed before the final 1.3 -release. The UNIX side is already stable now. - -As a premiere, this version of Apache comes with the new Apache Autoconf-style -Interface (APACI) for out-of-the-box building and installing the complete -Apache package. Actually APACI provides the commonly known and expected -configure interface to the old Apache source configuration scripts. It is -able to batch-control any existing Apache configuration options (usually -specified manually in src/Configuration) and provides some additional features -like on-the-fly adding third-party modules to the build process or configuring -and installing the suEXEC mechanism. - -Additionally this Apache version the first time provides greatly improved -support for loading Apache modules through dynamic shared object (DSO) files -under runtime through the improved mod_so. Apache currently supports this -feature under Linux, FreeBSD, Solaris, SunOS, IRIX, OSF1 and UnixWare. -Actually all distributed Apache modules now can be build and installed as -shared objects by individually enabling DSO for them via APACI's ---enable-shared option. For building third-party modules outside the Apache -source tree a new support tool named `apxs' is provided which hides the -platform-dependend DSO-build mechanism and automates the installation and -activation of those DSO files. - -Finally, this version of Apache attempts to protect against namespace -collisions by prefacing ``external'' functions, including API functions, -with the ap_ prefix. If you have or use an external module, the module -will need to be updated and/or recompiled in order to use the new -function names. - -Please be sure to read the CHANGES file and the New Features with Apache -1.3 document (at http://www.apache.org/docs/new_features_1_3.html). -This is particularly important if you are using non-IP based virtual hosts. - -Apache has been the most popular web server on the Internet since April -of 1996. The September 1997 WWW server site survey by Netcraft (see: -http://www.netcraft.co.uk/Survey/) found that more web servers were -using Apache than any other software. Apache and its derivatives are run -on over 50% of all web domains on the Internet. - -The Apache project has been organized in an attempt to answer some of -the concerns regarding active development of a public domain HTTP server -for UNIX. The goal of this project is to provide a secure, efficient and -extensible server which provides HTTP services in sync with the current -HTTP standards. - -For more information, please check out http://www.apache.org/ + The Apache Group is pleased to announce the release of the 1.3b6 version + of Apache, the latest beta release of the Apache HTTP server. 1.3b6 is + a release candidate for Apache 1.3.0; This version is stable under UNIX + but remains beta-level
cvs commit: apache-1.3 INSTALL configure
rse 98/04/14 23:23:09 Modified:.INSTALL configure Log: Make /usr/local/apache again the default installation PREFIX, even when this violates the GNU standards for configure scripts. But this way idiots who just use the defaults (i.e. not even use --prefix) do not get their /usr/local bristled with Apache files. We now have as the default the following directory layout: : ./configure --layout Configuring for Apache, Version 1.3b6-dev Installation paths: prefix: /usr/local/apache exec_prefix: /usr/local/apache bindir: /usr/local/apache/bin sbindir: /usr/local/apache/sbin libexecdir: /usr/local/apache/libexec mandir: /usr/local/apache/man sysconfdir: /usr/local/apache/etc datadir: /usr/local/apache/share localstatedir: /usr/local/apache/var includedir: /usr/local/apache/include Compilation paths: HTTPD_ROOT: /usr/local/apache SUEXEC_BIN: /usr/local/apache/sbin/suexec SHARED_CORE_DIR: /usr/local/apache/libexec DEFAULT_PIDLOG: var/run/httpd.pid DEFAULT_SCOREBOARD: var/run/httpd.scoreboard DEFAULT_LOCKFILE: var/run/httpd.lock DEFAULT_XFERLOG: var/logs/access_log DEFAULT_ERRORLOG: var/logs/error_log TYPES_CONFIG_FILE: etc/mime.types SERVER_CONFIG_FILE: etc/httpd.conf ACCESS_CONFIG_FILE: etc/access.conf RESOURCE_CONFIG_FILE: etc/srm.conf Revision ChangesPath 1.10 +1 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- INSTALL 1998/04/14 19:15:43 1.9 +++ INSTALL 1998/04/15 06:23:08 1.10 @@ -162,7 +162,7 @@ Use the --prefix=PREFIX and --exec-prefix=EPREFIX options to configure Apache to use a particular installation prefix. The default is - PREFIX=/usr/local and EPREFIX=PREFIX. + PREFIX=/usr/local/apache and EPREFIX=PREFIX. Use the --bindir=DIR, --sbindir=DIR, --libexecdir=DIR, --mandir=DIR, --sysconfdir=DIR, --datadir=DIR and --localstatedir=DIR option to change 1.9 +1 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure 1998/04/14 19:08:09 1.8 +++ configure 1998/04/15 06:23:08 1.9 @@ -128,7 +128,7 @@ ## # default paths -prefix='/usr/local' +prefix='/usr/local/apache' exec_prefix='$prefix' bindir='$exec_prefix/bin' sbindir='$exec_prefix/sbin'
cvs commit: apache-1.3 INSTALL
rse 98/04/14 23:51:28 Modified:.INSTALL Log: Make the example less shocking and remove reference to [EMAIL PROTECTED] to avoid flooding this address with mails from idots. Revision ChangesPath 1.11 +7 -16 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- INSTALL 1998/04/15 06:23:08 1.10 +++ INSTALL 1998/04/15 06:51:27 1.11 @@ -115,17 +115,12 @@ of other options available for your pleasure. For a short impression of what possibilities you have, here is a typical - example which compiles Apache with a particular compiler (Pentium- - optimized GCC), a statically compiled mod_auth_db module and the two - additional modules mod_rewrite and mod_proxy for later loading through - the DSO mechanism: - - $ CC=pgcc OPTIM=-O6 -fstrength-reduce \ - INCLUDES=-I/usr/local/db-1.85/include \ -LDFLAGS=-L/usr/local/db-1.85/lib LIBS=-ldb \ - ./configure --verbose \ - --prefix=/usr/local/apache \ - --enable-module=auth_db \ + example which compiles Apache for the installation tree /sw/pkg/apache + with a particular compiler and flags plus the two additional modules + mod_rewrite and mod_proxy for later loading through the DSO mechanism: + + $ CC=pgcc OPTIM=-O6 \ + ./configure --prefix=/sw/pkg/apache \ --enable-module=rewrite --enable-shared=rewrite \ --enable-module=proxy --enable-shared=proxy @@ -331,16 +326,12 @@ one of the companies and contractors which are listed at http://www.apache.org/info/support.cgi - o If you have any feedback, ideas or suggestions for the Apache server - please contact the Apache Group via E-mail at - [EMAIL PROTECTED] - o If you have a concrete bug report for Apache please go to the Apache Group Bug Database and submit your report: http://bugs.apache.org/ o If you want to participate in actively developing Apache please - subscribe to the new-httpd mailing list as described at + subscribe to the `new-httpd' mailing list as described at http://dev.apache.org/mailing-lists Thanks for running Apache.
cvs commit: apache-devsite how-to-release.html
rse 98/04/15 00:05:01
Modified:.how-to-release.html
Log:
Don't distribute .indent.pro files: they are out-of-date and there is no need
for the user to indent some of the distributed code theirself.
Revision ChangesPath
1.34 +3 -2 apache-devsite/how-to-release.html
Index: how-to-release.html
===
RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- how-to-release.html 1998/04/14 18:54:33 1.33
+++ how-to-release.html 1998/04/15 07:05:00 1.34
@@ -161,10 +161,11 @@
CODESTRONG$ cp src/Configuration.tmpl
src/Configuration/STRONG/CODE
P
LI Remove CODESTATUS/CODE, CODERULES.CVS/CODE,
CODEHTTP_Features.tsv/CODE,
- CODEsrc/INDENT/CODE, various CODE.cvsignore/CODE files
- and the developer's test subdirectories:BR
+ CODEsrc/INDENT/CODE, various CODE.cvsignore/CODE and
+ CODE.indent.pro/CODE files and the developer's test
subdirectories:BR
CODESTRONG$ rm STATUS RULES.CVS HTTP_Features.tsv
src/INDENT/STRONG/CODEBR
CODESTRONG$ find . -name .cvsignore -exec rm {}
\;/STRONG/CODEBR
+ CODESTRONG$ find . -name .indent.pro -exec rm {}
\;/STRONG/CODEBR
CODESTRONG$ rm -rf src/test/STRONG/CODEBR
CODESTRONG$ rm -rf src/modules/test/STRONG/CODE
UL
cvs commit: apache-devsite how-to-release.html
rse 98/04/15 02:31:27
Modified:.how-to-release.html
Log:
Remove another dotfile which need not be distributed: src/.gdbinit
Revision ChangesPath
1.35 +1 -1 apache-devsite/how-to-release.html
Index: how-to-release.html
===
RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- how-to-release.html 1998/04/15 07:05:00 1.34
+++ how-to-release.html 1998/04/15 09:31:26 1.35
@@ -163,7 +163,7 @@
LI Remove CODESTATUS/CODE, CODERULES.CVS/CODE,
CODEHTTP_Features.tsv/CODE,
CODEsrc/INDENT/CODE, various CODE.cvsignore/CODE and
CODE.indent.pro/CODE files and the developer's test
subdirectories:BR
- CODESTRONG$ rm STATUS RULES.CVS HTTP_Features.tsv
src/INDENT/STRONG/CODEBR
+ CODESTRONG$ rm STATUS RULES.CVS HTTP_Features.tsv src/INDENT
src/.gdbinit/STRONG/CODEBR
CODESTRONG$ find . -name .cvsignore -exec rm {}
\;/STRONG/CODEBR
CODESTRONG$ find . -name .indent.pro -exec rm {}
\;/STRONG/CODEBR
CODESTRONG$ rm -rf src/test/STRONG/CODEBR
cvs commit: apache-1.3/src/support apxs.pl
rse 98/04/15 02:46:58
Modified:src/support apxs.pl
Log:
Final cosmetics: Create LoadModule lines with same style
as APACI's make install target.
Revision ChangesPath
1.4 +1 -1 apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /export/home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apxs.pl 1998/04/03 13:29:07 1.3
+++ apxs.pl 1998/04/15 09:46:57 1.4
@@ -410,7 +410,7 @@
my $dir = $CFG_LIBEXECDIR;
$dir =~ s|^$CFG_PREFIX/?||;
$dir =~ s|(.)$|$1/|;
-push(@lmd, LoadModule ${name}_module $dir$t);
+push(@lmd, sprintf(LoadModule %-18s %s, ${name}_module,
$dir$t));
}
# execute the commands
cvs commit: apache-1.3 configure
rse 98/04/15 03:03:47 Modified:.configure Log: Last minute fix: Be even more friendly and conservative: Only append the /apache prefix to installation paths when the PREFIX does not contain it _AND_ the user didn't customize it via explicit options. Revision ChangesPath 1.10 +16 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure 1998/04/15 06:23:08 1.9 +++ configure 1998/04/15 10:03:46 1.10 @@ -141,6 +141,13 @@ localstatesubdir_logs='logs' includedir='$prefix/include' +# customization flags for +# automatic apache suffix +customized_sysconfdir=0 +customized_datadir=0 +customized_localstatedir=0 +customized_includedir=0 + # check and debug layout=0 @@ -324,15 +331,19 @@ ;; --sysconfdir=*) sysconfdir=$apc_optarg +customized_sysconfdir=1 ;; --datadir=*) datadir=$apc_optarg +customized_datadir=1 ;; --localstatedir=*) localstatedir=$apc_optarg +customized_localstatedir=1 ;; --includedir=*) includedir=$apc_optarg +customized_includedir=1 ;; --compat) prefix='/usr/local/apache' @@ -600,7 +611,11 @@ eval val=\$$var case $val in *apache | *apache* ) ;; - * ) eval $var=\$$var/apache ;; + * ) eval customized=\$customized_$var + if [ .$customized = .0 ]; then + eval $var=\$$var/apache + fi + ;; esac ;; esac
cvs commit: apache-1.3 STATUS
rse 98/04/15 10:25:14 Modified:.STATUS Log: Update our state Revision ChangesPath 1.295 +3 -7 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- STATUS1998/04/14 02:38:16 1.294 +++ STATUS1998/04/15 17:25:13 1.295 @@ -2,8 +2,8 @@ Release: -1.3b6: freeze; release proposed for Friday, April 17. Need - a RM (if no one volunteers, Jim will do it). +1.3b6: freeze; release proposed for Friday, April 17. + Jim is the RM and rolls the release in the next 24h 1.3b5: Tagged APACHE_1_3b5 and released 2.0 : In pre-alpha development, see apache-2.0 repository @@ -40,11 +40,6 @@ Apache 1.3b6 Release: - - from Saturday, April 11 to Tuesday, April 14: - FINAL TEST PERIOD FOR APACHE 1.3b6 - (no more major code changes, only bugfixes - and documentation enhancements!) - - Wednesday, April 15: Rolling the 1.3b6 tarball and pushing the version number to Apache 1.3.0-dev @@ -180,6 +175,7 @@ * THE BIG SYMBOL RENAMING * Ralf's DSO configuration updates for the UnixWare platform * Ralf's DSO support for the HP/UX platform by emulating dlopen +* Clean up warnings on Ultrix and HPUX. Available Patches:
cvs commit: apache-1.3 CHANGES
rse 98/04/13 23:28:36 Modified:.CHANGES Log: Make sure the big symbol renaming is also mentioned in the top-level CHANGES file. Revision ChangesPath 1.20 +11 -0 apache-1.3/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/CHANGES,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- CHANGES 1998/04/01 12:23:12 1.19 +++ CHANGES 1998/04/14 06:28:35 1.20 @@ -160,3 +160,14 @@ modules outside the Apache source tree. To achieve this APACI installs the Apache C header files together with the apxs tool. + *) THE BIG SYMBOL RENAMING + To avoid symbol clashes with third-party code compiled into the server, + the general prefix `ap_' was globally applied to the following classes + of symbols in the Apache source tree: Apache provided general functions + (e.g., ap_cpystrn), public API functions (e.g., palloc, bgets) and + private functions which can't be made static (because of cross-object + usage) but should be (e.g., new_connection). For backward source + compatibility with Apache 1.2 a new header file named compat.h was + created which provides defines for the old symbol names and should be + used by third-party module authors. +
cvs commit: apache-1.3/htdocs/manual upgrading_to_1_3.html
rse 98/04/14 00:36:22 Modified:htdocs/manual upgrading_to_1_3.html Log: Add an entry about compat.h to the Third Party Modules section of upgrading_to_1.3.html. Thanks to Dean for hint. Revision ChangesPath 1.18 +12 -0 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- upgrading_to_1_3.html 1998/04/14 02:07:31 1.17 +++ upgrading_to_1_3.html 1998/04/14 07:36:21 1.18 @@ -181,6 +181,18 @@ UL LI + To avoid symbol clashes with third-party code compiled into the server, the + general prefix `CODEap_/CODE' was globally applied to the following + classes of symbols: Apache provided general functions (e.g., + CODEap_cpystrn/CODE), public API functions (e.g., CODEpalloc/CODE, + CODEbgets/CODE) and private functions which can't be made static + (because of cross-object usage) but should be (e.g., + CODEnew_connection/CODE). For backward source compatibility with + Apache 1.2 a new header file named CODEcompat.h/CODE was created which + provides defines for the old symbol names and should be used by third-party + module authors. + /LI + LI Be sure and examine the A HREF=sourcereorg.htmlsource code reorganization page/A to see whether any item there affects you. If anything, the symbol renaming (prepending of CODEap_/CODE)
cvs commit: apache-1.3/src Configuration.tmpl README.DSO
rse 98/04/14 01:27:34 Modified:.README.configure INSTALL src Configuration.tmpl README.DSO Log: Reduce redundant information about DSO by referring to the new README.DSO where useful. Revision ChangesPath 1.5 +3 -3 apache-1.3/README.configure Index: README.configure === RCS file: /export/home/cvs/apache-1.3/README.configure,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README.configure 1998/03/31 07:03:23 1.4 +++ README.configure 1998/04/14 08:27:32 1.5 @@ -122,9 +122,9 @@ --- Apache 1.3 supports building modules as shared objects on all major - platforms like FreeBSD, Linux, SunOS, Solaris, IRIX, OSF/1 and UnixWare. - APACI has a nice way of enabling the building of these shared objects and - automatically installing them: + platforms (see section Supported Platforms in file src/README.DSO for + details). APACI has a nice way of enabling the building of these shared + objects and automatically installing them: $ ./configure --prefix=/path/to/apache \ --enable-module=rewrite \ 1.7 +4 -2 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- INSTALL 1998/04/13 18:35:34 1.6 +++ INSTALL 1998/04/14 08:27:32 1.7 @@ -81,10 +81,9 @@ - Linux - IRIX - FreeBSD - OSF1 - Solaris - UnixWare - - SunOS + - SunOS - HPUX o Entirely unsupported platforms are: - - HP-UX (because no dlopen-style interface) - Ultrix (because no dlopen-style interface) - AIX(although it has dlopen it is a braindead one) @@ -93,6 +92,9 @@ linker flags (see CFLAGS_SHLIB, LDFLAGS_SHLIB and LDFLAGS_SHLIB_EXPORT below) manually or at least make sure a Perl 5 interpreter is installed from which Apache can guess the options. + +For more information about DSO support in Apache 1.3 please +read the file src/README.DSO. 3. Configuring the source tree --- 1.100 +3 -8 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- Configuration.tmpl1998/04/12 15:49:26 1.99 +++ Configuration.tmpl1998/04/14 08:27:33 1.100 @@ -59,14 +59,9 @@ # # The Configure script currently has only limited built-in # knowledge on how to compile these DSO files because this is -# heavily platform-dependent. The current state is this: -# -# Out-of-the-box supported platforms: -# Linux, FreeBSD, Solaris, SunOS, OSF1 -# IRIX, HP/UX, UnixWare, SINIX, SVR4 -# -# Explicitly unsupported platforms: -# AIX, Ultrix +# heavily platform-dependent. The current state of supported and +# explicitly unsupported platforms can be found in the README.DSO +# file under Supported Platforms. # # For other platforms where you want to use the DSO mechanism you # first have to make sure it supports the pragmatic dlopen() 1.2 +31 -1 apache-1.3/src/README.DSO Index: README.DSO === RCS file: /export/home/cvs/apache-1.3/src/README.DSO,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.DSO1998/04/13 15:40:18 1.1 +++ README.DSO1998/04/14 08:27:33 1.2 @@ -114,6 +114,36 @@ distribution source tree and without having to fiddle with the platform-dependend compiler and linker flags for DSO support. + Supported Platforms + --- + + Apache's src/Configure script currently has only limited built-in knowledge + on how to compile DSO files because (as already mentioned) this is heavily + platform-dependent. Nevertheless all major Unix platforms are supported. The + definitive current state (April 1998) is this: + + Out-of-the-box supported platforms: + (actually tested versions in parenthesis) + + o FreeBSD (2.1.5, 2.2.5, 2.2.6) + o Linux (Debian/1.3.1, RedHat/4.2) + o Solaris (2.4, 2.5.1, 2.6) + o SunOS (4.1.3) + o OSF1 (4.0) + o IRIX (6.2) + o HP/UX (10.20) + o UnixWare (2.01, 2.1.2) + o SINIX (?) + o SVR4 (-) + + Explicitly unsupported platforms
cvs commit: apache-1.3 CHANGES
rse 98/04/14 01:40:24 Modified:.CHANGES Log: Fix some typos. Revision ChangesPath 1.21 +6 -6 apache-1.3/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/CHANGES,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- CHANGES 1998/04/14 06:28:35 1.20 +++ CHANGES 1998/04/14 08:40:24 1.21 @@ -14,7 +14,7 @@ *) Support for Windows NT/95 Apache now supports the Windows NT and Windows 95 operating - systems, as well as the Unix systems supported in previos + systems, as well as the Unix systems supported in previous releases. Although the Windows version of Apache may not be perform as well as on the Unix systems for which Apache was originally written, the ability to run on Windows gives Apache the @@ -58,9 +58,9 @@ *) HostNameLookups now defaults to Off The HostNameLookups directive now defaults to Off. This means - that, unless explictly turned on, the server will not resolve IP + that, unless explicitly turned on, the server will not resolve IP addresses into names. This was done to spare the Internet from - unneccessary DNS traffic. + unnecessary DNS traffic. *) New child_init function for module API A new phase for Apache's API is called once per heavy-weight @@ -102,9 +102,9 @@ In addition, sfio support allows plugin modules to manipulate the output of all modules, e.g. parsing the output of CGI programs. - *) New dbmmange script - A new Perl5 version of dbmmange allows modification of - various databases, Berkley DB, ndbm and gdbm. Security has + *) New dbmmanage script + A new Perl5 version of dbmmanage allows modification of + various databases, Berkeley DB, ndbm and gdbm. Security has been tightened such that passwords will no longer be echoed to the terminal, the seed for srand is more random and `add' will not overwrite and existing user, use the new `update' command
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/14 01:55:39
Modified:.Makefile.tmpl
Log:
Let the user explicitly know that we are preserving his existing
configuration files and make sure these hint messages are found
by the user by doing the install-config target last.
Revision ChangesPath
1.16 +32 -28apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.tmpl 1998/04/12 12:52:39 1.15
+++ Makefile.tmpl 1998/04/14 08:55:39 1.16
@@ -171,8 +171,7 @@
fi
@$(MAKE) -f $(MKF) $(MFLAGS) \
install-mktree install-programs $(install-support) \
- install-config install-include \
- install-docroot
+ install-include install-docroot install-config
[EMAIL PROTECTED] -f .install.tmp
[EMAIL PROTECTED] -f .install.conf
[EMAIL PROTECTED] [ .$(QUIET) != .1 ]; then \
@@ -299,11 +298,37 @@
fi
@echo === [support]
+# install the Apache C header files
+install-include:
+ @echo === [include: Installing Apache C header files]
+ $(CP) $(SRC)/include/*.h $(includedir)/
+ osdir=`grep '^OSDIR' $(SRC)/Makefile.config | sed -e 's:^OSDIR=::'`; \
+ $(CP) $(SRC)/$$osdir/os.h $(includedir)/
+ @echo === [include]
+
+# 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]
+
# create the initial configuration by providing default files
# and initial config files while preserving existing ones.
install-config:
@echo === [config: Installing Apache configuration files]
- for conf in httpd.conf access.conf srm.conf; do \
+ [EMAIL PROTECTED] conf in httpd.conf access.conf srm.conf; do \
(echo ##; \
echo ## $$conf -- Apache HTTP server configuration file; \
echo ##; \
@@ -322,40 +347,19 @@
-e
's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
-e
's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
.install.tmp \
+ echo $(INSTALL_DATA) .install.tmp
$(sysconfdir)/$$conf.default; \
$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
if [ ! -f $(sysconfdir)/$$conf ]; then \
+ echo $(INSTALL_DATA) .install.tmp
$(sysconfdir)/$$conf; \
$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf; \
+ else \
+ echo [PRESERVING EXISTING CONFIG FILE:
$(sysconfdir)/$$conf]; \
fi; \
done
$(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
$(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
@echo === [config]
-# install the Apache C header files
-install-include:
- @echo === [include: Installing Apache C header files]
- $(CP) $(SRC)/include/*.h $(includedir)/
- osdir=`grep '^OSDIR' $(SRC)/Makefile.config | sed -e 's:^OSDIR=::'`; \
- $(CP) $(SRC)/$$osdir/os.h $(includedir)/
- @echo === [include]
-
-# 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
cvs commit: apache-1.3 configure
rse 98/04/14 02:02:38
Modified:.configure
Log:
Make again --enable-module=most as conservative as it can.
Only modules which we can really expect to be workable
should be included.
Revision ChangesPath
1.7 +3 -2 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure 1998/04/10 10:34:31 1.6
+++ configure 1998/04/14 09:02:36 1.7
@@ -440,10 +440,11 @@
eval module_${module}=yes
done
module_auth_db=no # not all platforms have
-ldb
+ module_mmap_static=no # not all platforms have
mmap()
+ module_so=no # not all platforms have
dlopen()
+ module_example=no # only for developers
module_log_agent=no # deprecated
module_log_referer=no # deprecated
- module_example=no # only for developers
- module_so=no # not all platforms have
dlopen()
;;
* )
eval exists=\$module_${apc_optarg}
cvs commit: apache-1.3/src README.DSO
rse 98/04/14 03:51:40 Modified:src README.DSO Log: Merge in a lot of fixes and enhancements from Martin. Revision ChangesPath 1.3 +139 -119 apache-1.3/src/README.DSO Index: README.DSO === RCS file: /export/home/cvs/apache-1.3/src/README.DSO,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README.DSO1998/04/14 08:27:33 1.2 +++ README.DSO1998/04/14 10:51:39 1.3 @@ -7,111 +7,127 @@ Background -- - On modern Unix derivates there exists a nifty mechanism usually named Dynamic - Shared Object (DSO) which provides a way to build a piece of program code in - a special format to be able to load it under run-time into the address space - of an executable program. + On modern Unix derivatives there exists a nifty mechanism usually called + dynamic linking/loading of Dynamic Shared Objects (DSO) which provides a way + to build a piece of program code in a special format for loading it at + run-time into the address space of an executable program. This loading can usually be done in two ways: Automatically by a system - program named ld.so when the Unix loader has to start an executable program - or manually from within the executing program via a pragmatic system - interface to the Unix loader through the system calls dlopen()/dlsym(). + program called ld.so when an executable program is started or manually from + within the executing program via a programmatic system interface to the Unix + loader through the system calls dlopen()/dlsym(). In the first way the DSO's are usually called shared libraries or DSO - libraries and named libfoo.so or libfoo.so.1.2. They stay inside a system + libraries and named libfoo.so or libfoo.so.1.2. They reside in a system directory (usually /usr/lib) and the link to the executable program is - established under link-time by specifying -lfoo to the linker command. This - hardcodes library references into the executable program file therewith under - start-time the Unix loader is able to lookup libfoo.so from /usr/lib or from + established at link-time by specifying -lfoo to the linker command. This + hardcodes library references into the executable program file so that at + start-time the Unix loader is able to locate libfoo.so in /usr/lib or in paths configured via the environment variable LD_LIBRARY_PATH. It then - resolves any (still unresolved) symbols in the executable program which are - defined and exported in the DSO. Symbols in the executable program are - usually not used inside the DSO (because its a reuseable library of general - code) and hence no resolving this way has to be done. The executable program - has no to do anything to be able to use the symbols from the DSO because the - complete resolving is done by the Unix loader. + resolves any (yet unresolved) symbols in the executable program which are + available in the DSO. + + Symbols in the executable program are usually not referenced by the DSO + (because it's a reuseable library of general code) and hence no further + resolving has to be done. The executable program has no need to do anything + on its own to use the symbols from the DSO because the complete resolving is + done by the Unix loader. (In fact, the code to invoke ld.so is part of the + run-time startup code which is linked into every executable program which has + been bound non-static). The advantage of dynamic loading of common library + code is obvious: the library code needs to be stored only once, in a system + library like libc.so, saving disk space for every program. In the second way the DSO's are usually called shared objects or DSO - files and can be arbitrarily named (although the canonical name is foo.so). - These files usually stay inside a program-specific directory and there is no - automatically established link to the executable program where they are used. - Instead the executable program under run-time manually loads the DSO into his - address space via dlopen(). At this time no resolving of symbols from the DSO - for the executable program is done. But instead the Unix loader automatically - resolves any (still unresolved) symbols in the DSO which are defined and - exported in the executable program. This way the DSO gets knowledge of - the executable program as it would have been statically linked to it - under program link-time. Finally to make the DSO accessible to the - executable program it resolves particular symbols from the DSO via dlsym() - for later use inside dispatch tables, etc. In other words: The executable - program has no to manually resolve anything to be able to use it. + files and can be named with an arbitrary extension (although the canonical + name is foo.so
cvs commit: apache-1.3/src/modules/standard mod_so.c
rse 98/04/14 03:58:24 Modified:src/helpers find-dbm-lib src/modules/standard mod_so.c Log: Make verbose messages of Configure step more consistent Revision ChangesPath 1.5 +1 -1 apache-1.3/src/helpers/find-dbm-lib Index: find-dbm-lib === RCS file: /export/home/cvs/apache-1.3/src/helpers/find-dbm-lib,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- find-dbm-lib 1998/03/07 21:43:32 1.4 +++ find-dbm-lib 1998/04/14 10:58:23 1.5 @@ -37,7 +37,7 @@ ;; esac if [ X$found_dbm = X1 ]; then - echo + using $DBM_LIB + echo + using $DBM_LIB for DBM support fi fi fi 1.22 +1 -1 apache-1.3/src/modules/standard/mod_so.c Index: mod_so.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_so.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_so.c 1998/04/13 18:05:16 1.21 +++ mod_so.c 1998/04/14 10:58:24 1.22 @@ -140,7 +140,7 @@ fi LIBS=$LIBS $DL_LIB if [ X$DL_LIB != X ]; then - echo + using $DL_LIB for dynamic loading (mod_so) + echo + using $DL_LIB for DSO support fi fi * ConfigEnd
cvs commit: apache-1.3 INSTALL
rse 98/04/14 04:32:41 Modified:.INSTALL Log: Cleanup and enhance top-level INSTALL file for release: - add at least one typical example to give the user an impression how to use the configure script - add contact informations to give the user the next logical step after installation - add four important notes to make the usage of --enable-shared more clear to the user - fix indentation Revision ChangesPath 1.8 +224 -147 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- INSTALL 1998/04/14 08:27:32 1.7 +++ INSTALL 1998/04/14 11:32:41 1.8 @@ -93,20 +93,47 @@ below) manually or at least make sure a Perl 5 interpreter is installed from which Apache can guess the options. -For more information about DSO support in Apache 1.3 please +For more in-depth information about DSO support in Apache 1.3 please read the file src/README.DSO. 3. Configuring the source tree --- - HINT: This is the reference which describes all configuration - possibilities. For real-life configuration examples please - read the file `README.configure', too. + 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. + Introduction: + The next step is to configure the Apache source tree for your particular - system/platform and personal requirements. The most important setup here - is the location prefix where Apache is to be installed later, because - Apache has to be configured for this location to work correctly. + platform and personal requirements. The most important setup here is the + location prefix where Apache is to be installed later, because Apache has + to be configured for this location to work correctly. But there are a lot + of other options available for your pleasure. + + For a short impression of what possibilities you have, here is a typical + example which compiles Apache with a particular compiler (Pentium- + optimized GCC), a statically compiled mod_auth_db module and the two + additional modules mod_rewrite and mod_proxy for later loading through + the DSO mechanism: + + $ CC=pgcc OPTIM=-O6 -fstrength-reduce \ + INCLUDES=-I/usr/local/db-1.85/include \ +LDFLAGS=-L/usr/local/db-1.85/lib LIBS=-ldb \ + ./configure --verbose \ + --prefix=/usr/local/apache \ + --enable-module=auth_db \ + --enable-module=rewrite --enable-shared=rewrite \ + --enable-module=proxy --enable-shared=proxy + + The complete reference of all configuration possibilities follows. For + more real-life configuration examples please check out the file + README.configure. + + Reference: $ [CC=...][CFLAGS_SHLIB=...] [OPTIM=...] [LDFLAGS_SHLIB=...] @@ -128,144 +155,194 @@ [--with-perl=FILE] [--suexec-userdir=DIR] [--without-support] -Use the CC, OPTIM, CFLAGS, INCLUDES, LDFLAGS, LIBS, CFLAGS_SHLIB, -LDFLAGS_SHLIB, LDFLAGS_SHLIB_EXPORT and RANLIB environment variables to -override the corresponding default entries in the src/Configuration.tmpl -file (see there for more information about their usage). - -Use the --prefix=PREFIX and --exec-prefix=EPREFIX options to configure -Apache to use a particular installation prefix. The default is -PREFIX=/usr/local and EPREFIX=PREFIX. - -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. - -Use the --compat option to install Apache into a installation tree which -has a similar layout than the one used with Apache 1.2. - -Use the --layout option to check the final installation path layout while -fiddling with the options above. - -Use
cvs commit: apache-1.3 ABOUT_APACHE
rse 98/04/14 08:55:36 Modified:.ABOUT_APACHE.html .ABOUT_APACHE .ABOUT_APACHE Log: Sync apache-site/ABOUT_APACHE.html and apache-1.2/ABOUT_APACHE with contents of apache-1.3/ABOUT_APACHE. Revision ChangesPath 1.12 +17 -15apache-site/ABOUT_APACHE.html Index: ABOUT_APACHE.html === RCS file: /export/home/cvs/apache-site/ABOUT_APACHE.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ABOUT_APACHE.html 1998/01/29 12:30:10 1.11 +++ ABOUT_APACHE.html 1998/04/14 15:55:34 1.12 @@ -136,7 +136,7 @@ /P HR SIZE=4 H2 - Current Apache Group in alphabetical order as of 1 January 1998: + Current Apache Group in alphabetical order as of 8 April 1998: /H2 DL DD @@ -167,12 +167,6 @@ /TD /TR TR - TDRoy T. Fieldingnbsp;nbsp;nbsp;nbsp;nbsp;nbsp; - /TD - TDUC Irvine, California - /TD - /TR - TR TDDean Gaudetnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD @@ -224,12 +218,6 @@ /TD /TR TR - TDChuck Murckonbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; - /TD - TDThe Topsail Group, Pennsylvania - /TD - /TR - TR TDSameer Parekhnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD TDC2Net, California @@ -277,6 +265,18 @@ DD TABLE TR + TDRoy T. Fieldingnbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + /TD + TDUC Irvine, California + /TD + /TR + TR + TDChuck Murckonbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + /TD + TDThe Topsail Group, Pennsylvania + /TD + /TR + TR TDDavid Robinsonnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD TDCambridge University, UK @@ -314,13 +314,15 @@ /LI LIAmbarish Malpani (NT port). /LI + LIBen Hyde (multi-platform build tests). + /LI /UL P Many 3SUPrd/SUP-party modules, frequently used and recommended, are also freely-available and linked from the related projects page: lt;A - HREF=http://www.covalent.net/module_registry/; - SAMPhttp://www.covalent.net/module_registry//SAMP/Agt;, and + HREF=http://modules.apache.org/; + SAMPhttp://modules.apache.org//SAMP/Agt;, and their authors frequently contribute ideas, patches, and testing. In particular, Doug MacEachern (SAMPmod_perl/SAMP) and Rasmus Lerdorf (SAMPmod_php/SAMP). 1.3 +41 -30apache-1.2/ABOUT_APACHE Index: ABOUT_APACHE === RCS file: /export/home/cvs/apache-1.2/ABOUT_APACHE,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ABOUT_APACHE 1998/01/30 09:12:39 1.2 +++ ABOUT_APACHE 1998/04/14 15:55:35 1.3 @@ -3,7 +3,7 @@ http://www.apache.org/ - June 1997 + April 1998 The Apache Project is a collaborative software development effort aimed at creating a robust, commercial-grade, featureful, and freely-available @@ -67,22 +67,22 @@ -Current Apache Group in alphabetical order as of 1 August 1997: +Current Apache Group in alphabetical order as of 8 April 1998: Brian Behlendorf Organic Online, California - Ken Coar Process Software Corporation, New England, USA - Mark J. CoxUKWeb, UK + Ken Coar MeepZor Consulting, New England, USA + Mark J. CoxC2Net Europe, UK Ralf S. EngelschallMunich, Germany. - Roy T. FieldingUC Irvine, California - Dean GaudetSteam Tunnel Operations, California + Dean GaudetTransmeta Corporation, California Rob HartillInternet Movie DB, UK Jim Jagielski jaguNET ISP, Maryland Alexei Kosut Stanford University, California + Martin Kraemer Munich, Germany Ben Laurie Freelance Consultant, UK - Chuck Murcko The Topsail Group, Pennsylvania + Doug MacEachernTOG Research Institute, Massachusetts Aram W. Mirzadeh Qosina Corporation, New York Sameer Parekh C2Net, California - Paul SuttonUKWeb, UK + Paul SuttonC2Net Europe, UK Marc SlemkoCanada Randy Terbush Zyzzyva ISP, Nebraska Dirk-Willem van Gulik Freelance Consultant, Italy @@ -90,8 +90,10 @@ Apache Emeritae (old group members now off doing other
cvs commit: apache-1.3 README.configure
rse 98/04/14 08:56:44 Modified:.README.configure Log: Update URL of Apache Module Registry. Revision ChangesPath 1.6 +4 -4 apache-1.3/README.configure Index: README.configure === RCS file: /export/home/cvs/apache-1.3/README.configure,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README.configure 1998/04/14 08:27:32 1.5 +++ README.configure 1998/04/14 15:56:43 1.6 @@ -172,10 +172,10 @@ For Apache there are a lot of modules flying around on the net which solve particular problems. For a good reference see the Apache Module Registory at - http://www.covalent.net/module_registry/ and the Apache Group's contribution - directory at http://www.apache.org/dist/contrib/modules/. These modules - usually come in a file named mod_foo.c. APACI supports adding these sources - on-the-fly to the build process: + http://modules.apache.org/ and the Apache Group's contribution directory at + http://www.apache.org/dist/contrib/modules/. These modules usually come in a + file named mod_foo.c. APACI supports adding these sources on-the-fly to the + build process: $ ./configure --prefix=/path/to/apache \ --add-module=/path/to/mod_foo.c
cvs commit: apache-1.3/htdocs/manual upgrading_to_1_3.html
rse 98/04/14 10:27:08 Modified:htdocs/manual upgrading_to_1_3.html Log: Ops, Marc is right, now we have two entries. I merged them. Revision ChangesPath 1.19 +3 -5 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.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- upgrading_to_1_3.html 1998/04/14 07:36:21 1.18 +++ upgrading_to_1_3.html 1998/04/14 17:27:07 1.19 @@ -189,15 +189,13 @@ (because of cross-object usage) but should be (e.g., CODEnew_connection/CODE). For backward source compatibility with Apache 1.2 a new header file named CODEcompat.h/CODE was created which - provides defines for the old symbol names and should be used by third-party - module authors. + provides defines for the old symbol names. + You'll either have to CODE#include compat.h/CODE or update the API + symbols you use. /LI LI Be sure and examine the A HREF=sourcereorg.htmlsource code reorganization page/A to see whether any item there affects you. - If anything, the symbol renaming (prepending of CODEap_/CODE) - will probably have an impact, as you'll either have to - CODE#include compat.h/CODE or update the API symbols you use. /LI LIUse of SAMPSERVER_VERSION/SAMP definition. If third-party
cvs commit: apache-devsite how-to-release.html
rse 98/04/14 11:54:33
Modified:.how-to-release.html
Log:
Make sure HTTP_Features.tsv is removed and the
checked-out documents have correct permissions.
Revision ChangesPath
1.33 +3 -2 apache-devsite/how-to-release.html
Index: how-to-release.html
===
RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- how-to-release.html 1998/04/14 14:38:40 1.32
+++ how-to-release.html 1998/04/14 18:54:33 1.33
@@ -160,10 +160,10 @@
LI Create CODEsrc/Configuration/CODE file:BR
CODESTRONG$ cp src/Configuration.tmpl
src/Configuration/STRONG/CODE
P
-LI Remove CODESTATUS/CODE, CODERULES.CVS/CODE,
+LI Remove CODESTATUS/CODE, CODERULES.CVS/CODE,
CODEHTTP_Features.tsv/CODE,
CODEsrc/INDENT/CODE, various CODE.cvsignore/CODE files
and the developer's test subdirectories:BR
- CODESTRONG$ rm STATUS RULES.CVS src/INDENT/STRONG/CODEBR
+ CODESTRONG$ rm STATUS RULES.CVS HTTP_Features.tsv
src/INDENT/STRONG/CODEBR
CODESTRONG$ find . -name .cvsignore -exec rm {}
\;/STRONG/CODEBR
CODESTRONG$ rm -rf src/test/STRONG/CODEBR
CODESTRONG$ rm -rf src/modules/test/STRONG/CODE
@@ -278,6 +278,7 @@
P
LI Update the checked-out versions of the CODEapache-site/CODE
documents
for the web server:BR
+ CODESTRONG$ umask 002/STRONG/CODEBR
CODESTRONG$ cd /pub/apache//STRONG/CODEBR
CODESTRONG$ cvs update index.html/STRONG/CODEBR
CODESTRONG$ cvs update dist/index.html/STRONG/CODE
cvs commit: apache-1.3 configure
rse 98/04/14 12:08:09 Modified:.configure Log: Make sure the includedir gets PREFIX/include/apache if PREFIX not already contains the words apache to make sure Apache headers do not bristle a standard include directory. Just the same behaviour as already for sysconfdir, datadir and localstatedir. Thanks to Marc for discovering this bug. Revision ChangesPath 1.8 +1 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- configure 1998/04/14 09:02:36 1.7 +++ configure 1998/04/14 19:08:09 1.8 @@ -596,7 +596,7 @@ val=`echo $val | sed -e 's:/*$::'` eval $var=\$val\ case $var in - sysconfdir|datadir|localstatedir ) + sysconfdir|datadir|localstatedir|includedir ) eval val=\$$var case $val in *apache | *apache* ) ;;
cvs commit: apache-1.3 INSTALL
rse 98/04/14 12:15:44 Modified:.INSTALL Log: Merge in some of Marc suggestions... Revision ChangesPath 1.9 +10 -9 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- INSTALL 1998/04/14 11:32:41 1.8 +++ INSTALL 1998/04/14 19:15:43 1.9 @@ -320,29 +320,30 @@ o If you want to be informed about new code releases, bug fixes, security fixes, general news and information about the Apache server subscribe to the apache-announce mailing list as described under - http://www.apache.org/announcelist.html. + http://www.apache.org/announcelist.html - o If you want freely available support for running Apache please join - the Apache user community by subscribing to the USENET newsgroup - comp.infosystems.www.servers.unix. + o If you want freely available support for running Apache please join the + Apache user community by subscribing at least to the following USENET + newsgroup: + comp.infosystems.www.servers.unix o If you want commercial support for running Apache please contact one of the companies and contractors which are listed at - http://www.apache.org/info/support.cgi. + http://www.apache.org/info/support.cgi o If you have any feedback, ideas or suggestions for the Apache server please contact the Apache Group via E-mail at - [EMAIL PROTECTED]. + [EMAIL PROTECTED] o If you have a concrete bug report for Apache please go to the Apache Group Bug Database and submit your report: - http://bugs.apache.org/. + http://bugs.apache.org/ o If you want to participate in actively developing Apache please subscribe to the new-httpd mailing list as described at - http://dev.apache.org/mailing-lists. + http://dev.apache.org/mailing-lists Thanks for running Apache. The Apache Group - www.apache.org + http://www.apache.org/
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/14 12:17:42
Modified:.Makefile.tmpl
Log:
If idiots could fly, Internet would be an airport...
Revision ChangesPath
1.17 +2 -2 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.tmpl 1998/04/14 08:55:39 1.16
+++ Makefile.tmpl 1998/04/14 19:17:36 1.17
@@ -189,8 +189,8 @@
echo | $(sysconfdir)/{httpd,access,srm}.conf; \
echo ||; \
echo | Thanks for running Apache. |; \
- echo | The Apache Group |; \
- echo | www.apache.org|; \
+ echo |The Apache Group|; \
+ echo |http://www.apache.org/ |; \
echo ++; \
fi
cvs commit: apache-1.3/src/include compat.h
rse 98/04/13 03:32:28 Modified:src/os/win32 os.h src/os/unix os.h os.c src/os/bs2000 os.h os.c src/modules/standard mod_so.c mod_cgi.c src/main http_core.c src/include compat.h Log: Manual DSO cleanup after renaming: - renamed remaining os_ stuff in os/unix/ and os/bs2000/ to ap_ variants - merged the ap_dso_ non-HPUX-specific #defines and the HPUX-specific functions - moved the FreeBSD-underscore hack from mod_so (where it was badly placed because it is a low-level stuff) to the dlsym() call in os/unix/os.c (where is is placed better because _there_ is the os-specific stuff) - some minor cleanups to os.h - additions to compat.h Revision ChangesPath 1.16 +5 -5 apache-1.3/src/os/win32/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/win32/os.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- os.h 1998/04/11 12:01:06 1.15 +++ os.h 1998/04/13 10:32:23 1.16 @@ -101,8 +101,8 @@ /* Abstractions for dealing with shared object files (DLLs on Win32). * These are used by mod_so.c */ -#define os_dl_module_handle_type HINSTANCE -#define os_dl_load(l) LoadLibraryEx(l, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) -#define os_dl_unload(l) FreeLibrary(l) -#define os_dl_sym(h,s) GetProcAddress(h,s) -#define os_dl_error() /* for now */ +#define ap_dso_handle_t HINSTANCE +#define ap_dso_load(l) LoadLibraryEx(l, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) +#define ap_dso_unload(l) FreeLibrary(l) +#define ap_dso_sym(h,s) GetProcAddress(h,s) +#define ap_dso_error() /* for now */ 1.20 +26 -32apache-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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- os.h 1998/04/12 15:49:28 1.19 +++ os.h 1998/04/13 10:32:23 1.20 @@ -80,55 +80,49 @@ #endif /* - * Abstraction layer for dynamic loading of modules (mod_so.c) + * Abstraction layer for loading + * Apache modules under run-time via + * dynamic shared object (DSO) mechanism */ -#if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \ -defined(__bsdi__) || defined(IRIX) || defined(SVR4) || defined(OSF1) -# define HAVE_DLFCN_H 1 +#if defined(HPUX) || defined(HPUX10) +#define HAVE_DL_H 1 #endif -#if defined(__FreeBSD__) -# define NEED_UNDERSCORE_SYM +#if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \ +defined(__bsdi__) || defined(IRIX) || defined(SVR4) || defined(OSF1) +#define HAVE_DLFCN_H 1 #endif - /* OSes that don't support dlopen */ -#if defined(UW) || defined(ULTRIX) || defined(HPUX) || defined(HPUX10) -# define NO_DL +#ifdef HAVE_DL_H +#include dl.h #endif - /* Start of real module */ #ifdef HAVE_DLFCN_H -# include dlfcn.h +#include dlfcn.h #else -void * dlopen (const char * __filename, int __flag); -const char * dlerror (void); -void * dlsym (void *, const char *); -int dlclose (void *); +void *dlopen(const char *, int); +int dlclose(void *); +void *dlsym(void *, const char *); +const char *dlerror(void); #endif -#ifndef RTLD_NOW -/* - * probably on an older system that doesn't support RTLD_NOW or RTLD_LAZY. +/* probably on an older system that doesn't support RTLD_NOW or RTLD_LAZY. * The below define is a lie since we are really doing RTLD_LAZY since the * system doesn't support RTLD_NOW. */ -# define RTLD_NOW 1 +#ifndef RTLD_NOW +#define RTLD_NOW 1 #endif -#if defined(HPUX) || defined(HPUX10) -#include dl.h -#define os_dl_module_handle_type void * -void *os_dl_load(char *path); -void os_dl_unload(void *handle); -void *os_dl_sym(void *handle, char *symname); -char *os_dl_error(void); -#else -#define os_dl_module_handle_type void * -#define os_dl_load(l) dlopen(l, RTLD_NOW) -#define os_dl_unload(l) dlclose(l) -#define os_dl_sym(h,s) dlsym(h,s) -#define os_dl_error() dlerror() +#if defined(__FreeBSD__) +#define DLSYM_NEEDS_UNDERSCORE #endif + +#define ap_dso_handle_t void * +void * ap_dso_load(const char *); +voidap_dso_unload(void *); +void * ap_dso_sym(void *, const char *); +const char *ap_dso_error(void); #endif /* !APACHE_OS_H */ 1.8 +31 -15apache-1.3/src/os/unix/os.c Index: os.c === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- os.c 1998/04/12 15:49:28
cvs commit: apache-1.3/src README.DSO
rse 98/04/13 08:40:18 Added: src README.DSO Log: Here it comes: My first cut for an overview README.DSO file describing the relevant aspects of dynamic shared object (DSO) support in Apache 1.3. My hope is that this information makes the DSO stuff more clear to those not very familiar with it. And I hope my written down information is correct... ;-) Revision ChangesPath 1.1 apache-1.3/src/README.DSO Index: README.DSO === Apache 1.3 Dynamic Shared Object (DSO) support == Ralf S. Engelschall, April 1998 Background -- On modern Unix derivates there exists a nifty mechanism usually named Dynamic Shared Object (DSO) which provides a way to build a piece of program code in a special format to be able to load it under run-time into the address space of an executable program. This loading can usually be done in two ways: Automatically by a system program named ld.so when the Unix loader has to start an executable program or manually from within the executing program via a pragmatic system interface to the Unix loader through the system calls dlopen()/dlsym(). In the first way the DSO's are usually called shared libraries or DSO libraries and named libfoo.so or libfoo.so.1.2. They stay inside a system directory (usually /usr/lib) and the link to the executable program is established under link-time by specifying -lfoo to the linker command. This hardcodes library references into the executable program file therewith under start-time the Unix loader is able to lookup libfoo.so from /usr/lib or from paths configured via the environment variable LD_LIBRARY_PATH. It then resolves any (still unresolved) symbols in the executable program which are defined and exported in the DSO. Symbols in the executable program are usually not used inside the DSO (because its a reuseable library of general code) and hence no resolving this way has to be done. The executable program has no to do anything to be able to use the symbols from the DSO because the complete resolving is done by the Unix loader. In the second way the DSO's are usually called shared objects or DSO files and can be arbitrarily named (although the canonical name is foo.so). These files usually stay inside a program-specific directory and there is no automatically established link to the executable program where they are used. Instead the executable program under run-time manually loads the DSO into his address space via dlopen(). At this time no resolving of symbols from the DSO for the executable program is done. But instead the Unix loader automatically resolves any (still unresolved) symbols in the DSO which are defined and exported in the executable program. This way the DSO gets knowledge of the executable program as it would have been statically linked to it under program link-time. Finally to make the DSO accessible to the executable program it resolves particular symbols from the DSO via dlsym() for later use inside dispatch tables, etc. In other words: The executable program has no to manually resolve anything to be able to use it. Although this DSO mechanism sounds straight foreward there is at least one difficult step here: The resolving of symbols from the executable program for the DSO when using a DSO to extend a program (the second way). Why? Because this resolving is against the library design (where the library has no knowledge of any program it is used for) and is neither available under all platforms nor standardized. In practice only global symbols from the executable program are available to the DSO which are explicitly marked as exported. And forcing this exportation of global symbols is the main problem one has to solve when using DSO for extending a program under run-time. Practical Usage --- The shared library approach is the typical one, because this is the way the DSO mechanism was designed for, hence it is used for mostly all types of libraries the operating system provides. On the other hand using shared objects for extending a program is not used by a lot of programs. As of 1998 there are only a few software package available which use the DSO mechanism to actually extend their functionality under run-time: Perl 5 (via it's XS mechanism and the DynaLoader module), GIMP, Netscape Server, etc. But Apache 1.3 now is also one of these, because Apache already uses a module concept to extend its functionality and really uses a dispatch-list-based approach to link these modules into the Apache core functionality. So, Apache is really predestinated for using DSO to load it's modules under run-time. The idea now
cvs commit: apache-1.3/src/os/win32 os.h util_win32.c
rse 98/04/13 11:05:21 Modified:src/include compat.h httpd.h src/main http_config.c http_core.c http_request.c util.c src/modules/standard mod_alias.c mod_autoindex.c mod_so.c mod_userdir.c src/os/bs2000 os-inline.c os.h src/os/emx os-inline.c os.h src/os/unix os-inline.c os.c os.h src/os/win32 os.h util_win32.c Log: Manually rename some symbols to again get the os-distinction which was lost in the big renaming procedure: ap_canonical_filename ap_os_canonical_filename ap_is_path_absolute ap_os_is_path_absolute ap_escape_path ap_os_escape_path ap_dso_handle_t ap_os_dso_handle_t ap_dso_error -- ap_os_dso_error ap_dso_sym ap_os_dso_sym ap_dso_unload ap_os_dso_unload ap_dso_load ap_os_dso_load Revision ChangesPath 1.3 +7 -7 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- compat.h 1998/04/13 10:32:27 1.2 +++ compat.h 1998/04/13 18:05:09 1.3 @@ -208,9 +208,9 @@ #define open_logs ap_open_logs #define open_mutex ap_open_mutex #define open_piped_log ap_open_piped_log -#define os_canonical_filename ap_canonical_filename -#define os_escape_path ap_escape_path -#define os_is_path_absoluteap_is_path_absolute +#define os_canonical_filename ap_os_canonical_filename +#define os_escape_path ap_os_escape_path +#define os_is_path_absoluteap_os_is_path_absolute #define overlay_tables ap_overlay_tables #define palloc ap_palloc #define parseHTTPdate ap_parseHTTPdate @@ -389,9 +389,9 @@ #define util_uri_init ap_util_uri_init #define uudecode ap_uudecode #define vbprintf ap_vbprintf -#define os_dl_load ap_dso_load -#define os_dl_unload ap_dso_unload -#define os_dl_sym ap_dso_sym -#define os_dl_errorap_dso_error +#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.203 +4 -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.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- httpd.h 1998/04/11 12:00:22 1.202 +++ httpd.h 1998/04/13 18:05:09 1.203 @@ -843,8 +843,8 @@ API_EXPORT(void) ap_no2slash(char *name); API_EXPORT(void) ap_getparents(char *name); API_EXPORT(char *) ap_escape_path_segment(pool *p, const char *s); -API_EXPORT(char *) ap_escape_path(pool *p, const char *path, int partial); -#define escape_uri(ppool,path) ap_escape_path(ppool,path,1) +API_EXPORT(char *) ap_os_escape_path(pool *p, const char *path, int partial); +#define escape_uri(ppool,path) ap_os_escape_path(ppool,path,1) API_EXPORT(char *) ap_escape_html(pool *p, const char *s); API_EXPORT(char *) ap_construct_server(pool *p, const char *hostname, unsigned port, const request_rec *r); @@ -913,9 +913,9 @@ API_EXPORT(void) ap_chdir_file(const char *file); #ifndef HAVE_CANONICAL_FILENAME -#define ap_canonical_filename(p,f) (f) +#define ap_os_canonical_filename(p,f) (f) #else -API_EXPORT(char *) ap_canonical_filename(pool *p, const char *file); +API_EXPORT(char *) ap_os_canonical_filename(pool *p, const char *file); #endif char *ap_get_local_host(pool *); 1.114 +2 -2 apache-1.3/src/main/http_config.c Index: http_config.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- http_config.c 1998/04/11 12:00:28 1.113 +++ http_config.c 1998/04/13 18:05:10 1.114 @@ -983,7 +983,7 @@ so the server can be moved or mirrored with less pain. */ char *p; int offset = (int) (long) cmd-info; -if (ap_is_path_absolute(arg)) +if (ap_os_is_path_absolute(arg)) p = arg; else p = ap_make_full_path(cmd-pool, ap_server_root, arg); @@ -1001,7 +1001,7
cvs commit: apache-1.3/src/include http_config.h
rse 98/04/13 11:11:52 Modified:src/include http_config.h Log: Bump up MODULE_MAGIC_NUMBER because of the BIG SYMBOL RENAMING. Thanks to Dean for hint. Revision ChangesPath 1.80 +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.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- http_config.h 1998/04/11 12:00:19 1.79 +++ http_config.h 1998/04/13 18:11:51 1.80 @@ -271,7 +271,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19980324 +#define MODULE_MAGIC_NUMBER 19980413 #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
rse 98/04/13 11:14:51 Modified:.mmn.txt Log: Remember API change. Revision ChangesPath 1.18 +2 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mmn.txt 1998/03/24 04:14:28 1.17 +++ mmn.txt 1998/04/13 18:14:51 1.18 @@ -49,3 +49,5 @@ tm2sec - spacetoplus(), plustospace(), client_to_stdout() removed 19980324 (1.3b6-dev) - API_EXPORT(index_of_response) +19980413 (1.3b6-dev) - The BIG SYMBOL RENAMING: general ap_ prefix + (see src/include/compat.h for more details)
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/12 05:52:40
Modified:.Makefile.tmpl
Log:
Make APACI's make install more robust
by using tar-based command instead of cp -R commands.
Revision ChangesPath
1.15 +7 -3 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.tmpl 1998/04/11 15:22:02 1.14
+++ Makefile.tmpl 1998/04/12 12:52:39 1.15
@@ -77,6 +77,7 @@
# build tools
CP = cp
+TAR = tar
MKDIR = $(AUX)/mkdir.sh
INSTALL = $(AUX)/install.sh -c
INSTALL_PROGRAM = $(INSTALL) -s -m 755
@@ -342,13 +343,16 @@
# icons and distributed CGI scripts.
install-docroot:
@echo === [docroot: Installing initial DocumentRoot files]
- -$(CP) -R $(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 {} \;
- -$(CP) -R $(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 {} \;
- -$(CP) -R $(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 {} \;
@echo === [docroot]
cvs commit: apache-1.3 INSTALL
rse 98/04/12 05:54:01 Modified:.INSTALL Log: Typo Revision ChangesPath 1.5 +1 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- INSTALL 1998/04/04 18:02:46 1.4 +++ INSTALL 1998/04/12 12:54:01 1.5 @@ -11,7 +11,7 @@ If you really want to build and install Apache 1.3 manually, you can still use the Apache 1.2 way by following the instructions in the file src/INSTALL - as in the past. Nothing has changes there. So when you are already familiar + as in the past. Nothing has changed there. So when you are already familiar with this procedure or really need a very special custom configuration go for it.
cvs commit: apache-1.3/src/os/unix os.c os.h
rse 98/04/12 08:49:28
Modified:.STATUS
src CHANGES Configuration.tmpl Configure
src/os/unix os.c os.h
Log:
Although I though we have no chance under HP/UX for using shared objects I
today figured out that their proprietary shl_xxx system calls are very close
to the dlopen-style interface. And because our os/unix/ stuff already provides
an abstraction layer we now can provide DSO support for HP/UX by emulating the
dlopen-style interface while not changing anything inside mod_so ;-)
Revision ChangesPath
1.293 +1 -0 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- STATUS1998/04/11 15:46:29 1.292
+++ STATUS1998/04/12 15:49:24 1.293
@@ -178,6 +178,7 @@
* Ralf's and Martin's DSO support for all SVR4-derivate Unix platforms
* THE BIG SYMBOL RENAMING
* Ralf's DSO configuration updates for the UnixWare platform
+* Ralf's DSO support for the HP/UX platform by emulating dlopen
Available Patches:
1.767 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.766
retrieving revision 1.767
diff -u -r1.766 -r1.767
--- CHANGES 1998/04/11 15:22:03 1.766
+++ CHANGES 1998/04/12 15:49:25 1.767
@@ -1,5 +1,9 @@
Changes with Apache 1.3b6
+ *) Adding DSO support for the HP/UX platform by emulating the dlopen-style
+ interface via the similar but proprietary HP/UX shl_xxx-style system
+ calls. [Ralf S. Engelschall]
+
*) PORT: Updated UnixWare 2.0.x and 2.1.x entries for DSO support and made
APACI Makefile.tmpl install target more robust for sensible UnixWare
Make. [Ralf S. Engelschall]
1.99 +3 -3 apache-1.3/src/Configuration.tmpl
Index: Configuration.tmpl
===
RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- Configuration.tmpl1998/04/10 10:34:32 1.98
+++ Configuration.tmpl1998/04/12 15:49:26 1.99
@@ -62,11 +62,11 @@
# heavily platform-dependent. The current state is this:
#
# Out-of-the-box supported platforms:
-# Linux, FreeBSD, Solaris, SunOS,
-# IRIX, OSF1, UnixWare, SINIX, SVR4
+# Linux, FreeBSD, Solaris, SunOS, OSF1
+# IRIX, HP/UX, UnixWare, SINIX, SVR4
#
# Explicitly unsupported platforms:
-# HP/UX, AIX, Ultrix
+# AIX, Ultrix
#
# For other platforms where you want to use the DSO mechanism you
# first have to make sure it supports the pragmatic dlopen()
1.237 +16 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- Configure 1998/04/11 15:22:04 1.236
+++ Configure 1998/04/12 15:49:26 1.237
@@ -858,6 +858,22 @@
LDFLAGS_SHLIB_EXPORT=
DEF_SHARED_CORE=yes
;;
+*-hp-hpux9.*)
+case $CC in
+*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;;
+*/cc|cc ) CFLAGS_SHLIB=+z ;;
+esac
+LDFLAGS_SHLIB=-b
+LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred
+;;
+*-hp-hpux10.*)
+case $CC in
+*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;;
+*/cc|cc ) CFLAGS_SHLIB=+z ;;
+esac
+LDFLAGS_SHLIB=-b
+LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred
+;;
*)
## ok, no known explict support for shared objects
## on this platform, but we give not up immediately.
1.7 +43 -0 apache-1.3/src/os/unix/os.c
Index: os.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- os.c 1998/03/17 07:54:27 1.6
+++ os.c 1998/04/12 15:49:28 1.7
@@ -12,3 +12,46 @@
*/
extern void os_is_not_here(void);
void os_is_not_here(void) {}
+
+
+#if defined(HPUX) || defined(HPUX10)
+
+/*
+ * HPUX dlopen interface-emulation
+ */
+
+#include dl.h
+#include errno.h
+
+void *os_dl_load(char *path)
+{
+shl_t handle;
+handle = shl_load(path, BIND_IMMEDIATE|BIND_VERBOSE|BIND_NOSTART, 0L);
+return (void
cvs commit: apache-1.3/src/test/rename rename.cf
rse 98/04/11 03:07:19 Modified:src/test/rename rename.cf Log: Add some missing symbols for the renaming, Jim discovered recently. Revision ChangesPath 1.5 +6 -0 apache-1.3/src/test/rename/rename.cf Index: rename.cf === RCS file: /export/home/cvs/apache-1.3/src/test/rename/rename.cf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rename.cf 1998/04/09 08:32:49 1.4 +++ rename.cf 1998/04/11 10:07:19 1.5 @@ -384,6 +384,12 @@ aplog_errorPREFIX_log_error log_error PREFIX_log_error_old os_escape_path PREFIX_escape_path +os_canonical_filename PREFIX_canonical_filename +acquire_mutex PREFIX_acquire_mutex +create_mutex PREFIX_create_mutex +destroy_mutex PREFIX_destroy_mutex +open_mutex PREFIX_open_mutex +release_mutex PREFIX_release_mutex # specials: needs tag in source to become PREFIX_! os_is_path_absolutePREFIX_is_path_absolute
cvs commit: apache-1.3/src/test/rename compat.h
rse 98/04/11 03:20:37 Modified:src/test/rename compat.h Log: And the updated compat.h header file. Revision ChangesPath 1.2 +6 -0 apache-1.3/src/test/rename/compat.h Index: compat.h === RCS file: /export/home/cvs/apache-1.3/src/test/rename/compat.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- compat.h 1998/04/09 08:32:48 1.1 +++ compat.h 1998/04/11 10:20:37 1.2 @@ -16,6 +16,7 @@ #define MD5Final ap_MD5Final #define MD5Initap_MD5Init #define MD5Update ap_MD5Update +#define acquire_mutex ap_acquire_mutex #define add_cgi_vars ap_add_cgi_vars #define add_common_varsap_add_common_vars #define add_module ap_add_module @@ -86,6 +87,7 @@ #define coredump_dir ap_coredump_dir #define count_dirs ap_count_dirs #define create_environment ap_create_environment +#define create_mutex ap_create_mutex #define create_per_dir_config ap_create_per_dir_config #define create_request_config ap_create_request_config #define daemons_limit ap_daemons_limit @@ -96,6 +98,7 @@ #define default_port_for_request ap_default_port_for_request #define default_port_for_schemeap_default_port_for_scheme #define default_type ap_default_type +#define destroy_mutex ap_destroy_mutex #define destroy_pool ap_destroy_pool #define destroy_sub_reqap_destroy_sub_req #define dieap_die @@ -203,7 +206,9 @@ #define note_subprocessap_note_subprocess #define null_cleanup ap_null_cleanup #define open_logs ap_open_logs +#define open_mutex ap_open_mutex #define open_piped_log ap_open_piped_log +#define os_canonical_filename ap_canonical_filename #define os_escape_path ap_escape_path #define os_is_path_absoluteap_is_path_absolute #define overlay_tables ap_overlay_tables @@ -282,6 +287,7 @@ #define read_request ap_read_request #define register_cleanup ap_register_cleanup #define register_other_child ap_register_other_child +#define release_mutex ap_release_mutex #define remove_module ap_remove_module #define requires ap_requires #define reset_timeout ap_reset_timeout
cvs commit: apache-1.3/src/test/rename rename.cf
rse 98/04/11 05:01:10 Modified:.STATUS src CHANGES Configure buildmark.c src/ap ap_slack.c ap_strings.c src/include alloc.h buff.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_script.h util_uri.h src/main alloc.c buff.c fnmatch.c http_config.c http_core.c http_log.c http_main.c http_protocol.c http_request.c http_vhost.c md5c.c rfc1413.c util.c util_date.c util_md5.c util_script.c util_uri.c src/modules/example mod_example.c src/modules/experimental mod_mmap_static.c src/modules/proxy mod_proxy.c mod_proxy.h proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c proxy_util.c src/modules/standard mod_access.c mod_actions.c mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_autoindex.c mod_cern_meta.c mod_cgi.c mod_digest.c mod_dir.c mod_env.c mod_expires.c mod_headers.c mod_imap.c mod_include.c mod_info.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_mime.c mod_mime_magic.c mod_negotiation.c mod_rewrite.c mod_setenvif.c mod_so.c mod_speling.c mod_status.c mod_unique_id.c mod_userdir.c mod_usertrack.c src/modules/test mod_rndchunk.c mod_test_util_uri.c src/os/bs2000 os-inline.c os.c os.h src/os/emx os-inline.c os.h src/os/unix os-inline.c os.h src/os/win32 mod_dll.c mod_isapi.c modules.c multithread.c os.h registry.c service.c util_win32.c src/support htdigest.c src/test/rename rename.cf Log: THE BIG SYMBOL RENAMING FOR APACHE 1.3 The used renaming configuration: === bind_address ap_bind_address coredump_dir ap_coredump_dir daemons_limit ap_daemons_limit daemons_max_free ap_daemons_max_free daemons_min_free ap_daemons_min_free daemons_to_start ap_daemons_to_start excess_requests_per_child ap_excess_requests_per_child group_id ap_group_id listenbacklog ap_listenbacklog listeners ap_listeners lock_fname ap_lock_fname max_requests_per_child ap_max_requests_per_child pid_fname ap_pid_fname restart_time ap_restart_time scoreboard_fname ap_scoreboard_fname server_argv0 ap_server_argv0 server_confnameap_server_confname server_post_read_configap_server_post_read_config server_pre_read_config ap_server_pre_read_config server_rootap_server_root standalone ap_standalone threads_per_child ap_threads_per_child user_idap_user_id user_name ap_user_name suexec_enabled ap_suexec_enabled day_snames ap_day_snames dummy_mutexap_dummy_mutex month_snames ap_month_snames rfc1413_timeoutap_rfc1413_timeout scoreboard_image ap_scoreboard_image MD5Final ap_MD5Final MD5Initap_MD5Init MD5Update ap_MD5Update add_cgi_vars ap_add_cgi_vars add_common_varsap_add_common_vars add_module ap_add_module add_named_module ap_add_named_module add_per_dir_conf ap_add_per_dir_conf add_per_url_conf ap_add_per_url_conf allow_options ap_allow_options allow_overridesap_allow_overrides append_arrays ap_append_arrays array_cat ap_array_cat auth_name ap_auth_name auth_type ap_auth_type basic_http_header ap_basic_http_header bclose ap_bclose bcreateap_bcreate bfilbufap_bfilbuf bfilenoap_bfileno bflsbufap_bflsbuf bflush ap_bflush bgetopt
cvs commit: apache-1.3/src/include compat.h
rse 98/04/11 05:02:37 Added: src/include compat.h Log: This is the new backward-compatibility header containing the defines for the old symbols. Revision ChangesPath 1.1 apache-1.3/src/include/compat.h Index: compat.h === /* ** compat.h -- Apache Backward Compatibility ** ** INCLUDE THIS HEADER FILE ONLY IF YOU REALLY NEED ** BACKWARD COMPATIBILITY TO OLD APACHE RESOURCES. */ #ifndef APACHE_COMPAT_H #define APACHE_COMPAT_H /* * Mapping of Apache 1.2 global symbols to the * namespace conflict free variants used in Apache 1.3 */ #define MD5Final ap_MD5Final #define MD5Initap_MD5Init #define MD5Update ap_MD5Update #define acquire_mutex ap_acquire_mutex #define add_cgi_vars ap_add_cgi_vars #define add_common_varsap_add_common_vars #define add_module ap_add_module #define add_named_module ap_add_named_module #define add_per_dir_conf ap_add_per_dir_conf #define add_per_url_conf ap_add_per_url_conf #define allow_options ap_allow_options #define allow_overridesap_allow_overrides #define apapi_get_server_built ap_get_server_built #define apapi_get_server_version ap_get_server_version #define aplog_errorap_log_error #define append_arrays ap_append_arrays #define array_cat ap_array_cat #define auth_name ap_auth_name #define auth_type ap_auth_type #define basic_http_header ap_basic_http_header #define bclose ap_bclose #define bcreateap_bcreate #define bfilbufap_bfilbuf #define bfilenoap_bfileno #define bflsbufap_bflsbuf #define bflush ap_bflush #define bgetoptap_bgetopt #define bgets ap_bgets #define bhalfduplexap_bhalfduplex #define bind_address ap_bind_address #define block_alarms ap_block_alarms #define blookc ap_blookc #define bnonblock ap_bnonblock #define bonerror ap_bonerror #define bprintfap_bprintf #define bpushfdap_bpushfd #define bputs ap_bputs #define bread ap_bread #define bsetflag ap_bsetflag #define bsetoptap_bsetopt #define bskiplfap_bskiplf #define bvputs ap_bvputs #define bwrite ap_bwrite #define bytes_in_free_blocks ap_bytes_in_free_blocks #define bytes_in_pool ap_bytes_in_pool #define call_exec ap_call_exec #define can_exec ap_can_exec #define cfg_closefile ap_cfg_closefile #define cfg_getc ap_cfg_getc #define cfg_getlineap_cfg_getline #define chdir_file ap_chdir_file #define check_access ap_check_access #define check_alarmap_check_alarm #define check_auth ap_check_auth #define check_cmd_context ap_check_cmd_context #define check_user_id ap_check_user_id #define checkmask ap_checkmask #define child_exit_modules ap_child_exit_modules #define child_init_modules ap_child_init_modules #define child_terminateap_child_terminate #define cleanup_for_exec ap_cleanup_for_exec #define clear_module_list ap_clear_module_list #define clear_pool ap_clear_pool #define clear_tableap_clear_table #define close_piped_logap_close_piped_log #define construct_server ap_construct_server #define construct_url ap_construct_url #define copy_array ap_copy_array #define copy_array_hdr ap_copy_array_hdr #define copy_table ap_copy_table #define core_reorder_directories ap_core_reorder_directories #define coredump_dir ap_coredump_dir #define count_dirs ap_count_dirs #define create_environment ap_create_environment #define create_mutex ap_create_mutex #define create_per_dir_config ap_create_per_dir_config #define
cvs commit: apache-1.3/htdocs/manual sourcereorg.html
rse 98/04/11 05:27:51 Modified:htdocs/manual sourcereorg.html Log: Document the BIG SYMBOL RENAMING change. Revision ChangesPath 1.10 +8 -1 apache-1.3/htdocs/manual/sourcereorg.html Index: sourcereorg.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/sourcereorg.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sourcereorg.html 1998/04/01 13:53:44 1.9 +++ sourcereorg.html 1998/04/11 12:27:50 1.10 @@ -23,7 +23,7 @@ H2Summary of Changes/H2 -The source directory changes are: +The source changes are: UL LIThe non-module source files have moved from CODEsrc/CODE into CODEsrc/main/CODE @@ -32,6 +32,13 @@ to CODEsrc/modules/standard/CODE /LI LIThe CODEsupport/CODE directory is now in CODEsrc/support/CODE + /LI + LIThe existing symbol names used for global Apache function and variable + identifiers have been renamed in the source. This way namespace conflicts + are avoided when linking Apache with third-party libraries. See the file + CODEsrc/include/compat.h/CODE both for the list of renamed symbol + names and for a way to get source backward compatibility in existing + third-party module sources. /LI /UL
cvs commit: apache-1.3/src CHANGES Configure
rse 98/04/11 08:22:05 Modified:.STATUS Makefile.tmpl src CHANGES Configure Log: Today I had personal access to a UnixWare machine and the result are these slight changes to again make UnixWare happy. Revision ChangesPath 1.291 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- STATUS1998/04/11 12:00:14 1.290 +++ STATUS1998/04/11 15:22:02 1.291 @@ -157,6 +157,7 @@ * Build the libraries before building the rest of the tools * Ralf's and Martin's DSO support for all SVR4-derivate Unix platforms * THE BIG SYMBOL RENAMING +* Ralf's DSO configuration updates for the UnixWare platform Available Patches: 1.14 +2 -2 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile.tmpl 1998/04/10 10:34:31 1.13 +++ Makefile.tmpl 1998/04/11 15:22:02 1.14 @@ -221,7 +221,7 @@ install-programs: @echo === [programs: Installing Apache httpd program and shared objects] $(INSTALL_PROGRAM) $(SRC)/httpd $(sbindir)/httpd - @if [ .`grep 'SUBTARGET=target_shared' $(SRC)/Makefile` != . ]; then \ + [EMAIL PROTECTED] [ .`grep 'SUBTARGET=target_shared' $(SRC)/Makefile` != . ]; then \ echo $(INSTALL_PROGRAM) $(SRC)/libhttpd.ep $(libexecdir)/libhttpd.ep; \ $(INSTALL_SCRIPT) $(SRC)/libhttpd.ep $(libexecdir)/libhttpd.ep; \ echo $(INSTALL_SCRIPT) $(SRC)/libhttpd.so $(libexecdir)/libhttpd.so; \ @@ -286,7 +286,7 @@ $(SRC)/support/apxs .install.tmp \ $(INSTALL_SCRIPT) .install.tmp $(sbindir)/apxs $(INSTALL_DATA) $(SRC)/support/apxs.8 $(mandir)/man8/apxs.8 - @if [ .$(suexec) = .1 ]; then \ + [EMAIL PROTECTED] [ .$(suexec) = .1 ]; then \ echo $(INSTALL_PROGRAM) $(SRC)/support/suexec $(sbindir)/suexec; \ $(INSTALL_PROGRAM) $(SRC)/support/suexec $(sbindir)/suexec; \ echo chown root $(sbindir)/suexec; \ 1.766 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.765 retrieving revision 1.766 diff -u -r1.765 -r1.766 --- CHANGES 1998/04/11 12:00:15 1.765 +++ CHANGES 1998/04/11 15:22:03 1.766 @@ -1,4 +1,8 @@ Changes with Apache 1.3b6 + + *) PORT: Updated UnixWare 2.0.x and 2.1.x entries for DSO support and made + APACI Makefile.tmpl install target more robust for sensible UnixWare + Make. [Ralf S. Engelschall] *) THE BIG SYMBOL RENAMING To avoid symbol clashes with third-party code compiled into the server, 1.236 +13 -6 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- Configure 1998/04/11 14:30:32 1.235 +++ Configure 1998/04/11 15:22:04 1.236 @@ -518,23 +518,23 @@ ;; *-unixware1) DEF_WANTHSREGEX=yes - OS='Unixware' + OS='UnixWare 1.x' CFLAGS=$CFLAGS -DUW=100 LIBS=$LIBS -lsocket -lnsl -lcrypt ;; *-unixware2) DEF_WANTHSREGEX=yes - OS='Unixware' + OS='UnixWare 2.x' CFLAGS=$CFLAGS -DUW=200 LIBS=$LIBS -lsocket -lnsl -lcrypt -lgen ;; *-unixware211) - OS='Unixware 2.1.1' + OS='UnixWare 2.1.1' CFLAGS=$CFLAGS -DUW=211 LIBS=$LIBS -lsocket -lnsl -lcrypt -lgen ;; *-unixware212) - OS='Unixware 2.1.2' + OS='UnixWare 2.1.2' CFLAGS=$CFLAGS -DUW=212 LIBS=$LIBS -lsocket -lnsl -lcrypt -lgen DBM_LIB= @@ -813,14 +813,21 @@ LDFLAGS_SHLIB=-shared -expect_unresolved '*' -msym -s LDFLAGS_SHLIB_EXPORT= ;; +*-unixware2) +case $CC in +*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;; +*/cc|cc ) CFLAGS_SHLIB=-KPIC ;; +esac +LDFLAGS_SHLIB=-Bdynamic -G +LDFLAGS_SHLIB_EXPORT=-Wl,-Bexport +;; *-unixware21*) case $CC in */gcc|gcc ) CFLAGS_SHLIB=-fpic ;; */cc|cc ) CFLAGS_SHLIB=-KPIC ;; esac LDFLAGS_SHLIB=-Bdynamic -G -LDFLAGS_SHLIB_EXPORT
cvs commit: apache-1.3 STATUS
rse 98/04/11 08:46:30 Modified:.STATUS Log: Ok guys, now that the HIDE-veto is solved and 1.3b6-dev looks better than ever (hopefully ;-), let us concentrate on the proposed 1.3b6 release next Friday. Revision ChangesPath 1.292 +21 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.291 retrieving revision 1.292 diff -u -r1.291 -r1.292 --- STATUS1998/04/11 15:22:02 1.291 +++ STATUS1998/04/11 15:46:29 1.292 @@ -2,7 +2,7 @@ Release: -1.3b6: in development; release proposed for Friday, April 17 +1.3b6: freeze; release proposed for Friday, April 17 1.3b5: Tagged APACHE_1_3b5 and released 2.0 : In pre-alpha development, see apache-2.0 repository @@ -36,6 +36,26 @@ fair. Plan: + + Apache 1.3b6 Release: + + - from Saturday, April 11 to Tuesday, April 14: + FINAL TEST PERIOD FOR APACHE 1.3b6 + (no more major code changes, only bugfixes + and documentation enhancements!) + + - Wednesday, April 15: + Rolling the 1.3b6 tarball and pushing the version + number to Apache 1.3.0-dev + + - Thursday, April 16: + Double-checking the rolled 1.3b6 tarball + + - Friday, April 17: + Moving the tarball to the public locations and sending + the Announcement message to the public + + - ...ENTERING THE LONG-AWAITED FINAL 1.3.0 RELEASE STEP H... Showstoppers:
cvs commit: apache-1.3/htdocs/manual man-template.html
rse 98/04/11 08:53:06 Modified:htdocs/manual man-template.html Log: Bad URL. Revision ChangesPath 1.11 +1 -1 apache-1.3/htdocs/manual/man-template.html Index: man-template.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/man-template.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- man-template.html 1998/01/26 16:53:33 1.10 +++ man-template.html 1998/04/11 15:53:05 1.11 @@ -15,7 +15,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERModule mod_foobar/H1 -BLOCKQUOTEEMAdd this file as a link in modules.html/EM/BLOCKQUOTE +BLOCKQUOTEEMAdd this file as a link in mod/index.html/EM/BLOCKQUOTE P This module is contained in the CODEmod_foobar.c/CODE file, and
cvs commit: apache-1.3/src/test/rename README
rse 98/04/09 01:20:36
Modified:.STATUS
src ApacheCore.dsp ApacheCore.mak CHANGES
Configuration.tmpl Configure Makefile.tmpl
src/ap Makefile.tmpl
src/include alloc.h conf.h
src/main Makefile.tmpl gen_test_char.mak
src/modules/experimental Makefile.tmpl
src/modules/proxy ApacheModuleProxy.mak Makefile.tmpl
src/modules/standard Makefile.tmpl mod_so.c
src/modules/test Makefile.tmpl
src/os/unix Makefile.tmpl os.h
src/os/win32 ApacheModuleAuthAnon.mak
ApacheModuleCERNMeta.mak ApacheModuleDigest.mak
ApacheModuleExpires.mak ApacheModuleHeaders.mak
ApacheModuleInfo.mak ApacheModuleRewrite.mak
ApacheModuleSpeling.mak ApacheModuleStatus.mak
ApacheModuleUserTrack.mak
src/test/rename README
Removed: src/helpers UpdateHide
src/include hide.h
Log:
Time has come to remove the HIDE stuff as the first step or we never get 1.3b6
out of the door. (Hmmm a unthankfully job I have to do here, a very
unthankfully one... removing stuff for which we've investigated a lot of time,
especially myself)
Revision ChangesPath
1.283 +0 -12 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- STATUS1998/04/09 01:28:57 1.282
+++ STATUS1998/04/09 08:20:17 1.283
@@ -76,8 +76,6 @@
* 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
-* Ralf's `Rule HIDE' feature for hiding the symbol namespace
- -- under debate
* Make \\ behave as expected.
* Fix for poly directive in image maps. PR#1771
* Reduce memory usage, and speed up ServerAlias support. PR#1531
@@ -86,8 +84,6 @@
* Dean's new mod_test_util_uri.c
* back out USE_PTHREAD_SERIALIZED_ACCEPT for solaris
* Ken's abstraction of SERVER_{BUILT,VERSION}
-* Ken's fix for os/unix/os.h and the new -DHIDE functionality
- -- needs to be undone when HIDE is backed out
* Ralf's Config File Line Continuation
* Ralf's Reanimation of DBM support for RewriteMap in mod_rewrite PR#1696
* Ralf's fix for the `VirtualHost w/o mod_rewrite' situation. PR#1790
@@ -117,8 +113,6 @@
* Marc's mod_proxy was not clearing the Proxy-Connection header
* Dean's API_EXPORT and CORE_EXPORT cleanup for core functions
* Ralf's new ApacheBench support program (src/support/ab.c)
-* Ken's change HIDE default to yes, always include hide.h
- -- under debate
* Ralf's major Configure cleanup
* Ralf's additional manual pages for the support programs
* Ben Hyde's Configure check for unknown command switch
@@ -127,8 +121,6 @@
* Ralf's mod_proxy fix to use FTP SIZE response for Content-Length,
PR#1183
* Ralf's change to make the shared object compilation command more
portable
* Dean's protect against FD_SETSIZE mismatches
-* Ralf's fallback stategy because of HIDE for loading shared object
modules
- -- does this need to be revisited due to HIDE rollback?
* Martin's fix to allow %2F chars in proxy requests and in the uri query
part
* fix to mark listening sockets for closure in the parent after a SIGHUP
@@ -219,10 +211,6 @@
NOTES:
- Marc: this is the wrong time for such a big change
- - Ralf: Yes, I personally also would like to keep HIDE, but
- now because it's vetoed, it's better to rename the
- source instead of just having the
- namespace-conflicts again.
* What prefixes to use for the renaming:
1.26 +0 -4 apache-1.3/src/ApacheCore.dsp
Index: ApacheCore.dsp
===
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.dsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ApacheCore.dsp1998/03/30 13:27:39 1.25
+++ ApacheCore.dsp1998/04/09 08:20:18 1.26
@@ -402,10 +402,6 @@
# PROP Default_Filter
# Begin Source File
-SOURCE=.\include\hide.h
-# End Source File
-# Begin Source File
-
SOURCE=.\main\test_char.h
# End Source File
# Begin Source File
1.36 +0 -82 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===
RCS file
cvs commit: apache-1.3/src/test/rename compat.h compat.h.mk rename.cf.clean-api rename.cf
rse 98/04/09 01:32:50 Modified:src/test/rename rename.cf Added: src/test/rename compat.h compat.h.mk rename.cf.clean-api Log: Adjust the renaming stuff from the big change (namespace-cleanup plus API-decision) to the not such big change (only namespace-cleanups) variant. ONLY rename.cf AND compat.h ARE NOW USED! ANYTHING ELSE IS FOR THE FUTURE OR FOR NEVER! Revision ChangesPath 1.4 +376 -436 apache-1.3/src/test/rename/rename.cf Index: rename.cf === RCS file: /export/home/cvs/apache-1.3/src/test/rename/rename.cf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rename.cf 1998/04/06 10:49:49 1.3 +++ rename.cf 1998/04/09 08:32:49 1.4 @@ -2,453 +2,393 @@ ## rename.cf -- global symbol renaming list for Apache 1.3b6 ## -## The used prefixes for function/variable names of -## -## - Apache official API symbols (API): -##the ones the user can use for programming modules -##(should be as short as possible while still Apache specific) -## -## - Apache official module handles (APM): -##the symbols used for the module structures which -##are a special case due to DSO support [mod_so] ! -##(should only be Apache specific and indicate module structs) -## -## - Apache internal cross-object symbols (APX): -##the ones we need for internal cross-object references -##(should only be Apache specific and indicate cross-object symbols) -## -API_ = ap_ -APM_ = apm_ -APX_ = apx_ +PREFIX_ = ap_ ## ## The actual list of symbols to rename ## # BSS -bind_address APX_bind_address -coredump_dir APX_coredump_dir -daemons_limit APX_daemons_limit -daemons_max_free APX_daemons_max_free -daemons_min_free APX_daemons_min_free -daemons_to_start APX_daemons_to_start -excess_requests_per_child APX_excess_requests_per_child -group_id APX_group_id -listenbacklog APX_listenbacklog -listeners APX_listeners -lock_fname APX_lock_fname -max_requests_per_child APX_max_requests_per_child -pid_fname APX_pid_fname -restart_time APX_restart_time -scoreboard_fname APX_scoreboard_fname -server_argv0 APX_server_argv0 -server_confnameAPX_server_confname -server_post_read_configAPX_server_post_read_config -server_pre_read_config APX_server_pre_read_config -server_rootAPI_server_root -standalone APX_standalone -threads_per_child APX_threads_per_child -user_idAPX_user_id -user_name APX_user_name +bind_address PREFIX_bind_address +coredump_dir PREFIX_coredump_dir +daemons_limit PREFIX_daemons_limit +daemons_max_free PREFIX_daemons_max_free +daemons_min_free PREFIX_daemons_min_free +daemons_to_start PREFIX_daemons_to_start +excess_requests_per_child PREFIX_excess_requests_per_child +group_id PREFIX_group_id +listenbacklog PREFIX_listenbacklog +listeners PREFIX_listeners +lock_fname PREFIX_lock_fname +max_requests_per_child PREFIX_max_requests_per_child +pid_fname PREFIX_pid_fname +restart_time PREFIX_restart_time +scoreboard_fname PREFIX_scoreboard_fname +server_argv0 PREFIX_server_argv0 +server_confnamePREFIX_server_confname +server_post_read_configPREFIX_server_post_read_config +server_pre_read_config PREFIX_server_pre_read_config +server_rootPREFIX_server_root +standalone PREFIX_standalone +threads_per_child PREFIX_threads_per_child +user_idPREFIX_user_id +user_name PREFIX_user_name #DATA -suexec_enabled APX_suexec_enabled -day_snames API_day_snames -dummy_mutexAPX_dummy_mutex -month_snames API_month_snames -rfc1413_timeoutAPX_rfc1413_timeout -scoreboard_image APX_scoreboard_image +suexec_enabled PREFIX_suexec_enabled +day_snames PREFIX_day_snames +dummy_mutexPREFIX_dummy_mutex +month_snames PREFIX_month_snames +rfc1413_timeoutPREFIX_rfc1413_timeout +scoreboard_image PREFIX_scoreboard_image
cvs commit: apache-1.3/src/support Makefile.tmpl
rse 98/04/09 03:22:55 Modified:.STATUS Makefile.tmpl src CHANGES Configure Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/proxy Makefile.tmpl src/os/bs2000 Makefile.tmpl src/os/emx Makefile.tmpl src/os/unix Makefile.tmpl src/regex Makefile.tmpl src/support Makefile.tmpl Log: More consistency cleanups for 1.3b6: distclean targets for all Makefiles under src/, too. Revision ChangesPath 1.285 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.284 retrieving revision 1.285 diff -u -r1.284 -r1.285 --- STATUS1998/04/09 08:34:46 1.284 +++ STATUS1998/04/09 10:22:47 1.285 @@ -151,6 +151,7 @@ * OS/2 tweak to deal with multiple .exe targets. [Brian Havard] * Fixed ordering of argument checks for RewriteBase directive, PR#2045 * Ralf's cleanup of subdir movement to again allow correct breaks on error +* Ralf's consistent add of distclean targets for the src/-Makefiles Available Patches: 1.12 +17 -20apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.tmpl 1998/04/08 16:16:42 1.11 +++ Makefile.tmpl 1998/04/09 10:22:48 1.12 @@ -346,8 +346,8 @@ clean: @echo === $(SRC) @$(MAKE) -f $(MKF) $(MFLAGS) clean-std $(clean-support) - @rm -f $(SRC)/.apaci.build.ok @echo === $(SRC) + @rm -f $(SRC)/.apaci.build.ok # clean the standard stuff clean-std: @@ -363,10 +363,9 @@ fi; \ echo === $(SRC)/support -# first cleanup with the clean target and then additionally -# remove anything the configure script has created, i.e. -# create a really vanially source tree. When --shadow is used -# we just remove the complete shadow tree. +# cleanup the source tree by removing anything which was +# created by the configure step and the build target. +# When --shadow is used we just remove the complete shadow tree. distclean: @if [ .$(SRC) = .src ]; then \ $(MAKE) -f $(MKF) $(MFLAGS) distclean-normal; \ @@ -375,28 +374,26 @@ fi distclean-normal: - @$(MAKE) -f $(MKF) $(MFLAGS) clean distclean-std $(distclean-support) + @echo === $(SRC) + @$(MAKE) -f $(MKF) $(MFLAGS) distclean-std $(distclean-support) + @echo === $(SRC) -rm -f $(SRC)/Configuration.apaci -rm -f $(SRC)/apaci + @rm -f $(SRC)/.apaci.build.ok -rm -f Makefile +# clean the standard stuff distclean-std: - -rm -f $(SRC)/main/Makefile - -rm -f $(SRC)/ap/Makefile - -rm -f $(SRC)/regex/Makefile - -rm -f $(SRC)/os/unix/Makefile - -rm -f $(SRC)/modules/experimental/Makefile - -rm -f $(SRC)/modules/extra/Makefile - -rm -f $(SRC)/modules/standard/Makefile - -rm -f $(SRC)/modules/proxy/Makefile - -rm -f $(SRC)/modules/Makefile - -rm -f $(SRC)/modules.c - -rm -f $(SRC)/include/ap_config.h - -rm -f $(SRC)/Makefile.config - -rm -f $(SRC)/Makefile + @cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ distclean distclean-support: - -rm -f $(SRC)/support/Makefile + @echo === $(SRC)/support; \ + cd $(SRC)/support; $(MAKE) $(MFLAGS) distclean; \ + if [ .$(suexec) = .1 ]; then \ + echo rm -f suexec; \ + rm -f suexec; \ + fi; \ + echo === $(SRC)/support distclean-shadow: rm -rf $(SRC) 1.762 +8 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.761 retrieving revision 1.762 diff -u -r1.761 -r1.762 --- CHANGES 1998/04/09 08:20:19 1.761 +++ CHANGES 1998/04/09 10:22:49 1.762 @@ -1,5 +1,13 @@ Changes with Apache 1.3b6 + *) Add distclean target to src/-Makefiles to provide make distclean also + inside the src subtree (i.e. for non-APACI users). Following GNU Makefile + conventions while clean removes only stuff created by all targets, + distclean additionally removes the stuff from the configuration + process. This way make distclean (hence the name) provides a fresh + source tree as it was for distribution. + [Ralf S. Engelschall] + *) Allow top-level (APACI) Makefile to break on build errors the same way the src/ subtree Makefiles breaks on them
cvs commit: apache-1.3/src/main http_protocol.c
rse 98/04/07 23:30:48
Modified:src/include http_protocol.h
src/main http_protocol.c
Log:
Change parse_uri back to a core function on Dean and Martins request.
Revision ChangesPath
1.40 +1 -1 apache-1.3/src/include/http_protocol.h
Index: http_protocol.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_protocol.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- http_protocol.h 1998/04/06 07:26:24 1.39
+++ http_protocol.h 1998/04/08 06:30:46 1.40
@@ -203,6 +203,6 @@
/* This is also useful for putting sub_reqs and internal_redirects together
*/
-API_EXPORT(void) parse_uri(request_rec *r, const char *uri);
+CORE_EXPORT(void) parse_uri(request_rec *r, const char *uri);
#endif /* !APACHE_HTTP_PROTOCOL_H */
1.210 +1 -1 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- http_protocol.c 1998/04/06 07:26:28 1.209
+++ http_protocol.c 1998/04/08 06:30:47 1.210
@@ -575,7 +575,7 @@
* - sets r-uri to request uri (without r-args part)
* - sets r-hostname (if not set already) from request (scheme://host:port)
*/
-API_EXPORT(void) parse_uri(request_rec *r, const char *uri)
+CORE_EXPORT(void) parse_uri(request_rec *r, const char *uri)
{
int status = HTTP_OK;
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 98/04/07 23:40:25
Modified:.STATUS
src CHANGES
src/modules/standard mod_rewrite.c
Log:
A little fix for the error messages from RewriteBase directive.
Submitted by: Todd Eigenschink [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
Revision ChangesPath
1.276 +1 -0 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- STATUS1998/04/07 15:15:17 1.275
+++ STATUS1998/04/08 06:40:21 1.276
@@ -155,6 +155,7 @@
* Ralf's add of the query (-q) option to apxs
* Ralf's initial doc and Configuration.tmpl entry for mod_mmap_static
* OS/2 tweak to deal with multiple .exe targets. [Brian Havard]
+* Fixed ordering of argument checks for RewriteBase directive, PR#2045
Available Patches:
1.759 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.758
retrieving revision 1.759
diff -u -r1.758 -r1.759
--- CHANGES 1998/04/06 05:21:40 1.758
+++ CHANGES 1998/04/08 06:40:22 1.759
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) Fixed ordering of argument checks for RewriteBase directive.
+ [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
remove #define IS_MODULE from modules and add SHARED_MODULE define
1.100 +2 -2 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- mod_rewrite.c 1998/04/01 14:24:35 1.99
+++ mod_rewrite.c 1998/04/08 06:40:24 1.100
@@ -520,10 +520,10 @@
{
if (cmd-path == NULL || dconf == NULL)
return RewriteBase: only valid in per-directory config files;
-if (a1[0] != '/')
-return RewriteBase: argument is not a valid URL;
if (a1[0] == '\0')
return RewriteBase: empty URL not allowed;
+if (a1[0] != '/')
+return RewriteBase: argument is not a valid URL;
dconf-baseurl = a1;
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/08 02:38:49 Modified:.Makefile.tmpl Log: APACI's make distclean should leave the source tree as it was, i.e. it also has to remove some more stuff src/Configure has created. Revision ChangesPath 1.8 +2 -0 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.tmpl 1998/04/01 13:16:38 1.7 +++ Makefile.tmpl 1998/04/08 09:38:49 1.8 @@ -384,6 +384,8 @@ -rm -f $(SRC)/modules/standard/Makefile -rm -f $(SRC)/modules/proxy/Makefile -rm -f $(SRC)/modules/Makefile + -rm -f $(SRC)/modules.c + -rm -f $(SRC)/include/ap_config.h -rm -f $(SRC)/Makefile.config -rm -f $(SRC)/Makefile
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/08 04:59:57 Modified:.Makefile.tmpl Log: Make sure the initial data files have correct permissions the hard and complicated but portable way (notice that datadir can be equal prefix!) Revision ChangesPath 1.9 +6 -0 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.tmpl 1998/04/08 09:38:49 1.8 +++ Makefile.tmpl 1998/04/08 11:59:56 1.9 @@ -327,8 +327,14 @@ install-docroot: @echo === [docroot: Installing initial DocumentRoot files] -$(CP) -R $(ROOT)/htdocs/* $(datadir)/htdocs/ + -find $(datadir)/htdocs/ -type d -print | xargs chmod a+rx + -find $(datadir)/htdocs/ -type f -print | xargs chmod a+r -$(CP) -R $(ROOT)/icons/* $(datadir)/icons/ + -find $(datadir)/icons/ -type d -print | xargs chmod a+rx + -find $(datadir)/icons/ -type f -print | xargs chmod a+r -$(CP) -R $(ROOT)/cgi-bin/* $(datadir)/cgi-bin/ + -find $(datadir)/cgi-bin/ -type d -print | xargs chmod a+rx + -find $(datadir)/cgi-bin/ -type f -print | xargs chmod a+r @echo === [docroot] ## --
cvs commit: apache-1.3/src CHANGES Configure Makefile.tmpl
rse 98/04/08 09:08:13 Modified:.STATUS Makefile.tmpl src CHANGES Configure Makefile.tmpl Log: Allow correct breaks on errors even for the top-level Makefile. Revision ChangesPath 1.279 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- STATUS1998/04/08 10:34:04 1.278 +++ STATUS1998/04/08 16:08:09 1.279 @@ -158,6 +158,7 @@ * Ralf's initial doc and Configuration.tmpl entry for mod_mmap_static * OS/2 tweak to deal with multiple .exe targets. [Brian Havard] * Fixed ordering of argument checks for RewriteBase directive, PR#2045 +* Ralf's cleanup of subdir movement to again allow correct breaks on error Available Patches: 1.10 +2 -2 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.tmpl 1998/04/08 11:59:56 1.9 +++ Makefile.tmpl 1998/04/08 16:08:10 1.10 @@ -144,7 +144,7 @@ # build the standard stuff build-std: - @cd $(SRC); $(MAKE) $(MFLAGS) all 21 | sed -e 's:^\([=]==[=]\) :\1 $(SRC)/:' + @cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ all # build the additional support stuff build-support: @@ -351,7 +351,7 @@ # clean the standard stuff clean-std: - @cd $(SRC); $(MAKE) $(MFLAGS) clean | sed -e 's:^\([=]==[=]\) :\1 $(SRC)/:' + @cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ clean # clean additional support stuff clean-support: 1.760 +8 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.759 retrieving revision 1.760 diff -u -r1.759 -r1.760 --- CHANGES 1998/04/08 06:40:22 1.759 +++ CHANGES 1998/04/08 16:08:11 1.760 @@ -1,5 +1,13 @@ Changes with Apache 1.3b6 + *) Allow top-level (APACI) Makefile to break on build errors + the same way the src/ subtree Makefiles breaks on them by replacing the + initial APACI sed-subdir-display-kludge with a more clean + variable-passing-solution: variable SDP can optionally hold the subdir + prefix which is consistently used for displaying the subdir movement. + This way even the top-level Makefile can stop correctly on errors as the + user expects. [Ralf S. Engelschall] + *) Fixed ordering of argument checks for RewriteBase directive. [Todd Eigenschink [EMAIL PROTECTED], PR#2045] 1.229 +3 -3 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- Configure 1998/04/05 21:34:38 1.228 +++ Configure 1998/04/08 16:08:11 1.229 @@ -1389,9 +1389,9 @@ all clean depend :: @for i in \$(MODULES); do \\ - echo === modules/\$\$i; \\ - (cd \$\$i \$(MAKE) \$(MFLAGS_STATIC) CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\ - echo === modules/\$\$i; \\ + echo === \$(SDP)modules/\$\$i; \\ + (cd \$\$i \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\ + echo === \$(SDP)modules/\$\$i; \\ done EOF 1.88 +9 -9 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- Makefile.tmpl 1998/03/26 04:58:37 1.87 +++ Makefile.tmpl 1998/04/08 16:08:12 1.88 @@ -29,24 +29,24 @@ subdirs: @for i in $(SUBDIRS); do \ - echo === $$i; \ - ( cd $$i $(MAKE) $(MFLAGS_STATIC) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1; \ - echo === $$i; \ + echo === $(SDP)$$i; \ + ( cd $$i $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1; \ + echo === $(SDP)$$i; \ done support: support-dir support-dir: - @echo === support; \ - cd support; $(MAKE) $(MFLAGS_STATIC) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)'; \ - echo === support + @echo === $(SDP)support
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/08 09:16:43
Modified:.Makefile.tmpl
Log:
Although both xargs and find -exec are POSIX.2, Marc is right:
find -exec is a little bit better because this is even available under
some really old Unix-derivates
Revision ChangesPath
1.11 +6 -6 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.tmpl 1998/04/08 16:08:10 1.10
+++ Makefile.tmpl 1998/04/08 16:16:42 1.11
@@ -327,14 +327,14 @@
install-docroot:
@echo === [docroot: Installing initial DocumentRoot files]
-$(CP) -R $(ROOT)/htdocs/* $(datadir)/htdocs/
- -find $(datadir)/htdocs/ -type d -print | xargs chmod a+rx
- -find $(datadir)/htdocs/ -type f -print | xargs chmod a+r
+ -find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
+ -find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
-$(CP) -R $(ROOT)/icons/* $(datadir)/icons/
- -find $(datadir)/icons/ -type d -print | xargs chmod a+rx
- -find $(datadir)/icons/ -type f -print | xargs chmod a+r
+ -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
+ -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
-$(CP) -R $(ROOT)/cgi-bin/* $(datadir)/cgi-bin/
- -find $(datadir)/cgi-bin/ -type d -print | xargs chmod a+rx
- -find $(datadir)/cgi-bin/ -type f -print | xargs chmod a+r
+ -find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
+ -find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
@echo === [docroot]
## --
cvs commit: apache-1.3 STATUS
rse 98/04/07 08:15:18 Modified:.STATUS Log: The renaming debate gets more and more worse and I dislike it really how Jim and Kens opinions get silently ignored Hmmm... but ok, I've done my technical work by preparing both the renaming scripts and the HIDE-remove-path for Roy, so I've done my part (for which no one has asked me to do it ;-). The remaining decisions and commits are not my job... I hate political discussions, so I'm now concentrating on more useful stuff IMHO: Working on the DSO-support for SVR4-platforms. Revision ChangesPath 1.275 +34 -55apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- STATUS1998/04/07 13:27:07 1.274 +++ STATUS1998/04/07 15:15:17 1.275 @@ -18,8 +18,23 @@ +1: Roy, Dean, Paul, Jim, Martin, Ralf, Randy, Brian, Ken +0: -1: - (Ken: 'lazy consensus' needs to be defined.) + Notes: + - Ken: 'lazy consensus' needs to be defined. + - Ralf: At least the following points should be added: + 1. A statement that really everyone has the equal right to veto + in general and that only the one can rescind a veto who has + done it originally. + 2. The statements that although a veto can be done at any point + if it gets done more then approximately two weeks after some + stuff already went in or was changed, the guy who vetoes + really _HAS_ to provide a reasonable alternative solution + idea _AND_ at least someone (not really the guy who vetoes) + who wants to volunteer for this alternative solution. Or + the veto will not make much sense IMHO at this stage and + always just creates flamewars! I think only this way it's + fair. + Plan: Showstoppers: @@ -152,12 +167,11 @@ In progress: -* The proposed steps for the big symbol renaming change: +* The proposed steps of Roy for the big symbol renaming change: NOTE: Roy won't even start down this path until there is at least three +1 votes for the prefix option(s) applied (see below). - Step 1: Roy - completely remove HIDE stuff from src/Configure, include/*, APACI, etc. @@ -198,54 +212,6 @@ $ cd apache-1.3 $ cvs tag POST_AP_PREFIX_RENAME . - Step 2: Ralf -- tag the source tree - $ cd apache-1.3 - $ cvs tag PRE_AP_PREFIX_RENAME_CLEANUP . -- manual editing the source tree for the remaining - changes which cannot be automated: - 1. change exported module structure symbols from - mod_abc_def.c from def_abc_module to APM_abc_def (where APM_ is - the prefix in rename.cf) and adjust/simplify src/Configure, - mod_so.c accordingly etc. These APM_ symbols were commented - in rename.cf for Roys step. - [Roy doesn't think this step is necessary] - 2. change the prelinked_modules and preloaded_modules symbols - to APX_ variants manually and adjust src/Configure accordingly. - These APX_ symbols were commented in rename.cf for Roys step - because these cannot be done automatically. - [Roy might do this himself if the changes are clear] -- compile entire server (static variant) - $ cd apache-1.3 - $ ./configure --prefix=/tmp/apache ---enable-module=most -- check symbols - $ cd apache-1.3/src - $ nm -g httpd |more -- check operation of server - $ cd apache-1.3 - $ make install - $ /tmp/apache/sbin/apachectl start -- compile entire server (shared variant) - $ cd apache-1.3 - $ ./configure --prefix=/tmp/apache ---enable-module=most ---enable-shared=max -- check symbols - $ cd apache-1.3/src - $ nm -g httpd | egrep -v 'ap(x|m)?_' | grep -v '.o$' - $ nm -g httpd | more -- check operation of server - $ cd apache-1.3 - $ make install - $ /tmp/apache/sbin/apachectl start -- commit - $ cd apache-1.3/src - $ cvs commit . -- tag the source tree - $ cd apache-1.3 - $ cvs tag POST_AP_PREFIX_RENAME_CLEANUP . - * Ralf's and Martin's enhancement to the DSO support in Apache to be able to support DSO under
cvs commit: apache-1.3/src/test/rename/csubst util.h Makefile csubst.c lexer.c lexer.l util.c
rse 98/04/05 23:16:49
Modified:src/test/rename/csubst Makefile csubst.c lexer.c lexer.l
util.c
Added: src/test/rename/csubst util.h
Log:
Make the csubst program more portable, so Roy can use
it at least under Solaris, too.
Revision ChangesPath
1.2 +0 -1 apache-1.3/src/test/rename/csubst/Makefile
Index: Makefile
===
RCS file: /export/home/cvs/apache-1.3/src/test/rename/csubst/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 1998/04/03 06:20:14 1.1
+++ Makefile 1998/04/06 06:16:44 1.2
@@ -26,7 +26,6 @@
-rm -f $(PROG) *.o
distclean: clean
- -rm -f Makefile
realclean: distclean
-rm -f lexer.c
1.2 +2 -1 apache-1.3/src/test/rename/csubst/csubst.c
Index: csubst.c
===
RCS file: /export/home/cvs/apache-1.3/src/test/rename/csubst/csubst.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csubst.c 1998/04/03 06:20:14 1.1
+++ csubst.c 1998/04/06 06:16:44 1.2
@@ -3,7 +3,8 @@
#include stdlib.h
#include string.h
#include unistd.h
-#include err.h
+
+#include util.h
#include tokens.h
1.2 +2 -2 apache-1.3/src/test/rename/csubst/lexer.c
Index: lexer.c
===
RCS file: /export/home/cvs/apache-1.3/src/test/rename/csubst/lexer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lexer.c 1998/04/03 06:20:15 1.1
+++ lexer.c 1998/04/06 06:16:45 1.2
@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /export/home/cvs/apache-1.3/src/test/rename/csubst/lexer.c,v 1.1
1998/04/03 06:20:15 rse Exp $
+ * $Header: /export/home/cvs/apache-1.3/src/test/rename/csubst/lexer.c,v 1.2
1998/04/06 06:16:45 rse Exp $
*/
#define FLEX_SCANNER
@@ -534,8 +534,8 @@
#include stdio.h
#include stdlib.h
#include string.h
-#include err.h
+#include util.h
#include tokens.h
extern int opt_directives;
1.2 +1 -1 apache-1.3/src/test/rename/csubst/lexer.l
Index: lexer.l
===
RCS file: /export/home/cvs/apache-1.3/src/test/rename/csubst/lexer.l,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lexer.l 1998/04/03 06:20:15 1.1
+++ lexer.l 1998/04/06 06:16:45 1.2
@@ -10,8 +10,8 @@
#include stdio.h
#include stdlib.h
#include string.h
-#include err.h
+#include util.h
#include tokens.h
extern int opt_directives;
1.2 +6 -8 apache-1.3/src/test/rename/csubst/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/test/rename/csubst/util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util.c1998/04/03 06:20:16 1.1
+++ util.c1998/04/06 06:16:45 1.2
@@ -6,8 +6,9 @@
#include stdio.h
#include stdlib.h
#include string.h
-#include err.h
+#include util.h
+
/*
* Return an allocated memory area.
*/
@@ -47,9 +48,6 @@
*/
-/* The name of the running program. */
-extern char *__progname;
-
void
err(int status, const char *fmt, ...)
{
@@ -65,7 +63,7 @@
{
int olderrno = errno;
- fprintf(stderr, %s: , __progname);
+ fprintf(stderr, csubst: );
if (fmt != NULL) {
vfprintf(stderr, fmt, ap);
fprintf(stderr, : );
@@ -88,7 +86,7 @@
void
verrx(int status, const char *fmt, va_list ap)
{
- fprintf(stderr, %s: , __progname);
+ fprintf(stderr, csubst: );
if (fmt != NULL)
vfprintf(stderr, fmt, ap);
fputc('\n', stderr);
@@ -111,7 +109,7 @@
{
int olderrno = errno;
- fprintf(stderr, %s: , __progname);
+ fprintf(stderr, csubst: );
if (fmt != NULL) {
vfprintf(stderr, fmt, ap);
fprintf(stderr, : );
@@ -132,7 +130,7 @@
void
vwarnx(const char *fmt, va_list ap)
{
- fprintf(stderr, %s: , __progname);
+ fprintf(stderr, csubst: );
if (fmt != NULL)
vfprintf(stderr, fmt, ap);
fputc('\n', stderr);
1.1 apache-1.3/src/test/rename/csubst/util.h
Index: util.h
===
#include stdarg.h
extern void err(int status, const char *fmt, ...);
extern void verr(int status, const char *fmt, va_list ap);
extern void errx(int status, const char *fmt
cvs commit: apache-1.3/src/test/rename README
rse 98/04/05 23:20:40 Modified:src/test/rename README Log: A little but more information... Revision ChangesPath 1.2 +8 -2 apache-1.3/src/test/rename/README Index: README === RCS file: /export/home/cvs/apache-1.3/src/test/rename/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README1998/04/03 06:20:09 1.1 +++ README1998/04/06 06:20:39 1.2 @@ -1,10 +1,16 @@ -This can be used directly for everyone: +This stuff is only temporary. +It is used for the global symbol renaming in the Apache 1.3 sources. +It replaces identifiers in our C source files according to +the rename.cf file. +This can be used directly by everyone: +(but finally only by Roy!) +-- rename.pl .. The source renaming script These three Needs adjustments to work out-of-the-box: - +- rename.cf.update ... Updates rename.cf according to API_EXPORT tags in the sources. Needs an ID file in src/ which is generated by mkid from GNU id-utils
cvs commit: apache-1.3/src/main http_main.c alloc.c
rse 98/04/05 23:43:17
Modified:src/include http_main.h alloc.h
src/main http_main.c alloc.c
Log:
Correct definitions of pstrcat() and check_alarm() to
get a correct global symbol renaming configuration.
Revision ChangesPath
1.27 +1 -1 apache-1.3/src/include/http_main.h
Index: http_main.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_main.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- http_main.h 1998/03/31 12:52:25 1.26
+++ http_main.h 1998/04/06 06:43:14 1.27
@@ -121,7 +121,7 @@
int update_child_status(int child_num, int status, request_rec *r);
void time_process_request(int child_num, int status);
unsigned int set_callback_and_alarm(void (*fn) (int), int x);
-int check_alarm(void);
+API_EXPORT(int) check_alarm(void);
#ifndef NO_OTHER_CHILD
/*
1.53 +1 -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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- alloc.h 1998/03/31 12:52:16 1.52
+++ alloc.h 1998/04/06 06:43:14 1.53
@@ -122,7 +122,7 @@
API_EXPORT(char *) pstrdup(struct pool *, const char *s);
/* make a nul terminated copy of the n characters starting with s */
API_EXPORT(char *) pstrndup(struct pool *, const char *s, int n);
-API_EXPORT(char *) pstrcat(struct pool *,...); /* all '...' must be
char* */
+API_EXPORT_NONSTD(char *) pstrcat(struct pool *,...);/* all '...'
must be char* */
API_EXPORT_NONSTD(char *) psprintf(struct pool *, const char *fmt, ...)
__attribute__((format(printf,2,3)));
API_EXPORT(char *) pvsprintf(struct pool *, const char *fmt, va_list);
1.320 +1 -1 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.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- http_main.c 1998/04/05 23:16:09 1.319
+++ http_main.c 1998/04/06 06:43:15 1.320
@@ -976,7 +976,7 @@
#ifdef WIN32
-int check_alarm(void)
+API_EXPORT(int) check_alarm(void)
{
if (alarm_expiry_time) {
unsigned int t;
1.85 +1 -1 apache-1.3/src/main/alloc.c
Index: alloc.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- alloc.c 1998/03/31 12:52:39 1.84
+++ alloc.c 1998/04/06 06:43:16 1.85
@@ -737,7 +737,7 @@
return res;
}
-char *pstrcat(pool *a,...)
+API_EXPORT_NONSTD(char *) pstrcat(pool *a,...)
{
char *cp, *argp, *res;
cvs commit: apache-1.3/src/main http_main.c
rse 98/04/06 00:43:33 Modified:src/include http_conf_globals.h src/main http_main.c Log: One more symbol which is part of the API and already used in modules. Revision ChangesPath 1.26 +1 -1 apache-1.3/src/include/http_conf_globals.h Index: http_conf_globals.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_conf_globals.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- http_conf_globals.h 1998/03/31 12:52:21 1.25 +++ http_conf_globals.h 1998/04/06 07:43:31 1.26 @@ -92,7 +92,7 @@ * statically... */ -extern char server_root[MAX_STRING_LEN]; +extern API_VAR_EXPORT char server_root[MAX_STRING_LEN]; extern char server_confname[MAX_STRING_LEN]; /* for -C and -c switches */ 1.322 +1 -1 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.321 retrieving revision 1.322 diff -u -r1.321 -r1.322 --- http_main.c 1998/04/06 07:26:28 1.321 +++ http_main.c 1998/04/06 07:43:32 1.322 @@ -263,7 +263,7 @@ listen_rec *listeners; static listen_rec *head_listener; -char server_root[MAX_STRING_LEN]; +API_VAR_EXPORT char server_root[MAX_STRING_LEN]; char server_confname[MAX_STRING_LEN]; char coredump_dir[MAX_STRING_LEN];
cvs commit: apache-1.3 STATUS
rse 98/04/06 01:30:05 Modified:.STATUS Log: Even more details... Revision ChangesPath 1.265 +17 -9 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- STATUS1998/04/06 08:21:36 1.264 +++ STATUS1998/04/06 08:30:04 1.265 @@ -180,7 +180,8 @@ --disable-rule=HIDE - check symbols $ cd apache-1.3/src - $ nm -g httpd |more + $ nm -g httpd | egrep -v '_module$' | egrep -v 'apx?_' | grep -v '.o$' + $ nm -g httpd | more - check operation of server $ cd apache-1.3 $ make install @@ -196,13 +197,19 @@ - tag the source tree $ cd apache-1.3 $ cvs tag PRE_AP_PREFIX_RENAME_CLEANUP . -- manually change exported module structure symbols for - mod_abc_def.c from def_abc_module to APM_abc_def (where APM_ is - the prefix in rename.cf) and adjust/simplify src/Configure, - mod_so.c accordingly etc. - ...MANUAL EDITING... -- completely remove HIDE stuff because that's then obsolete - ...MANUAL EDITING... +- manual editing the source tree for the remaining + changes which cannot be automated: + 1. change exported module structure symbols from + mod_abc_def.c from def_abc_module to APM_abc_def (where APM_ is + the prefix in rename.cf) and adjust/simplify src/Configure, + mod_so.c accordingly etc. These APM_ symbols were commented + in rename.cf for Roys step. + 2. change the prelinked_modules and preloaded_modules symbols + to APX_ variants manually and adjust src/Configure accordingly. + These APX_ symbols were commented in rename.cf for Roys step + because these cannot be done automatically. + 3. completely remove HIDE stuff because that's now obsolete: + src/Configure, include/*, APACI, etc. - compile entire server (static variant) $ cd apache-1.3 $ ./configure --prefix=/tmp/apache @@ -221,7 +228,8 @@ --enable-shared=max - check symbols $ cd apache-1.3/src - $ nm -g httpd |more + $ nm -g httpd | egrep -v 'ap(x|m)?_' | grep -v '.o$' + $ nm -g httpd | more - check operation of server $ cd apache-1.3 $ make install
cvs commit: apache-1.3 STATUS
rse 98/04/06 01:31:41 Modified:.STATUS Log: When Roy sees preloaded_modules and prelinked_modules at his step this is ok. They have to be changed manually be me in step 2. Revision ChangesPath 1.266 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- STATUS1998/04/06 08:30:04 1.265 +++ STATUS1998/04/06 08:31:40 1.266 @@ -180,7 +180,7 @@ --disable-rule=HIDE - check symbols $ cd apache-1.3/src - $ nm -g httpd | egrep -v '_module$' | egrep -v 'apx?_' | grep -v '.o$' + $ nm -g httpd | egrep -v '_modules?$' | egrep -v 'apx?_' | grep -v '.o$' $ nm -g httpd | more - check operation of server $ cd apache-1.3
cvs commit: apache-1.3/src/test/rename README
rse 98/04/06 01:36:31 Modified:src/test/rename README Log: This is in more detail now in STATUS. Revision ChangesPath 1.4 +0 -32 apache-1.3/src/test/rename/README Index: README === RCS file: /export/home/cvs/apache-1.3/src/test/rename/README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README1998/04/06 08:04:23 1.3 +++ README1998/04/06 08:36:31 1.4 @@ -4,38 +4,6 @@ It replaces identifiers in our C source files according to the rename.cf file. - - -The proposed steps for this big change are: - -1. Roy: - tag PRE_AP_PREFIX_RENAME - - make rename - - compile entire server (without the back-compat) - - check symbols - - check operation of server - - compile entire server with the back-compat - - check symbols - - check operation of server - - commit - - tag POST_AP_PREFIX_RENAME - -2. Ralf: - tag PRE_AP_PREFIX_RENAME_CLEANUP - - manually change exported module structure symbols for - mod_abc_def.c from def_abc_module to APM_abc_def (where APM_ is - the prefix in rename.cf) and adjust/simplify src/Configure, - mod_so.c accordingly etc. - - completely remove HIDE stuff because that's then obsolete - - compile entire server (without the back-compat) - - check symbols - - check operation of server - - compile entire server with the back-compat - - check symbols - - check operation of server - - commit - - tag POST_AP_PREFIX_RENAME_CLEANUP - - - This can be used directly by everyone: (but finally only by Roy!) --
cvs commit: apache-1.3/src/main http_config.c
rse 98/04/06 03:40:16
Modified:src/main http_config.c
Log:
sync export type with the one from the include file.
Revision ChangesPath
1.112 +1 -1 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- http_config.c 1998/03/31 12:52:41 1.111
+++ http_config.c 1998/04/06 10:40:15 1.112
@@ -209,7 +209,7 @@
return create_empty_config(p);
}
-API_EXPORT(void *) create_per_dir_config(pool *p)
+CORE_EXPORT(void *) create_per_dir_config(pool *p)
{
return create_empty_config(p);
}
cvs commit: apache-1.3/src/test/rename apapi.h apapi.h.mk rename.cf
rse 98/04/06 03:49:50 Modified:src/test/rename apapi.h apapi.h.mk rename.cf Log: Ok, here it comes the last part: The completely generated apapi.h header file containing prototypes for all public API functions (ap_xxx) Revision ChangesPath 1.3 +259 -1apache-1.3/src/test/rename/apapi.h Index: apapi.h === RCS file: /export/home/cvs/apache-1.3/src/test/rename/apapi.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apapi.h 1998/04/06 08:04:23 1.2 +++ apapi.h 1998/04/06 10:49:48 1.3 @@ -1 +1,259 @@ -NEED MORE WORK! +/* +** apapi.h -- Apache 1.3 API prototypes +** +** THIS IS A COMPLETE LIST OF PROTOTYPES +** FOR ALL PUBLIC API FUNCTIONS +*/ + +#ifndef APAPI_H +#define APAPI_H + +extern char ap_server_root[MAX_STRING_LEN]; +extern const char ap_day_snames[7][4]; +extern const char ap_month_snames[12][4]; +extern void ap_MD5Final(unsigned char digest[16], AP_MD5_CTX * context); +extern void ap_MD5Init(AP_MD5_CTX * context); +extern void ap_MD5Update(AP_MD5_CTX * context, const unsigned char *input, unsigned int inputLen); +extern void ap_add_cgi_vars(request_rec *r); +extern void ap_add_common_vars(request_rec *r); +extern void ap_add_module(module *m); +extern int ap_add_named_module(const char *name); +extern int ap_allow_options (request_rec *); +extern int ap_allow_overrides (request_rec *); +extern array_header * ap_append_arrays(pool *, const array_header *, const array_header *); +extern void ap_array_cat(array_header *dst, const array_header *src); +extern char * ap_auth_name (request_rec *); +extern char * ap_auth_type (request_rec *); +extern void ap_basic_http_header(request_rec *r); +extern int ap_bclose(BUFF *fb); +extern BUFF * ap_bcreate(pool *p, int flags); +extern int ap_bfilbuf(BUFF *fb); +extern int ap_bfileno(BUFF *fb, int direction); +extern int ap_bflsbuf(int c, BUFF *fb); +extern int ap_bflush(BUFF *fb); +extern int ap_bgetopt(BUFF *fb, int optname, void *optval); +extern int ap_bgets(char *s, int n, BUFF *fb); +extern void ap_bhalfduplex(BUFF *fb); +extern void ap_block_alarms(void); +extern int ap_blookc(char *buff, BUFF *fb); +extern int ap_bnonblock(BUFF *fb, int direction); +extern void ap_bonerror(BUFF *fb, void (*error) (BUFF *, int, void *), void *data); +extern void ap_bpushfd(BUFF *fb, int fd_in, int fd_out); +extern int ap_bputs(const char *x, BUFF *fb); +extern int ap_bprintf(BUFF *fb, const char *fmt,...) __attribute__((format(printf,2,3))); +extern int ap_bread(BUFF *fb, void *buf, int nbyte); +extern int ap_bsetflag(BUFF *fb, int flag, int value); +extern int ap_bsetopt(BUFF *fb, int optname, const void *optval); +extern int ap_bskiplf(BUFF *fb); +extern int ap_bvputs(BUFF *fb,...); +extern int ap_bwrite(BUFF *fb, const void *buf, int nbyte); +extern long ap_bytes_in_free_blocks(void); +extern long ap_bytes_in_pool(pool *p); +extern int ap_call_exec(request_rec *r, char *argv0, char **env, int shellcmd); +extern int ap_can_exec(const struct stat *); +extern int ap_cfg_closefile(configfile_t *fp); +extern int ap_cfg_getc(configfile_t *cfp); +extern int ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp); +extern void ap_chdir_file(const char *file); +extern int ap_check_alarm(void); +extern const char * ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden); +extern int ap_checkmask(const char *data, const char *mask); +extern void ap_child_terminate(request_rec *r); +extern void ap_cleanup_for_exec(void); +extern void ap_clear_module_list(void); +extern void ap_clear_pool(struct pool *); +extern void ap_clear_table(table *); +extern void ap_close_piped_log (piped_log *); +extern char * ap_construct_server(pool *p, const char *hostname, unsigned port, const request_rec *r); +extern char * ap_construct_url(pool *p, const char *uri, const request_rec *r
cvs commit: apache-1.3/src Configure
rse 98/04/04 08:42:46 Modified:src Configure Log: Make the Perl interpreter check for the DSO fallback more robust by avoiding confusing perl: not found messages. Although it worked correctly this really makes the user think Perl is required for shared object support which is not the case. Revision ChangesPath 1.227 +36 -22apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- Configure 1998/04/04 16:21:23 1.226 +++ Configure 1998/04/04 16:42:45 1.227 @@ -811,28 +811,42 @@ ## We take a second chance by guessing the compiler ## and linker flags from the Perl installation ## if it exists. -if [ .`perl -V:dlsrc 2/dev/null | grep dlopen` != . ]; then -# cool, Perl is installed on this platform -# and actually uses the dlopen-style interface, -# so we can guess the flags from its knowledge -CFLAGS_SHLIB=`perl -V:cccdlflags | cut -d\' -f2` -LDFLAGS_SHLIB=`perl -V:lddlflags | cut -d\' -f2` -LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2` -# but additionally we have to inform the -# user that we are just guessing the flags -echo -echo ** WARNING: We have no explicit knowledge about shared object -echo ** support for your particular platform. But perhaps you have -echo ** luck: We were able to guess the compiler and linker flags -echo ** for creating shared objects from your Perl installation. -echo ** If they actually work, please send the following information -echo ** for inclusion into later releases to [EMAIL PROTECTED] or -echo ** make a suggestion report at http://bugs.apache.org/:; -echo ** PLATFORM=$PLAT -echo ** CFLAGS_SHLIB=$CFLAGS_SHLIB -echo ** LDFLAGS_SHLIB=$LDFLAGS_SHLIB -echo ** LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT -echo +PERL= +for dir in `echo $PATH | sed -e 's/:/ /g'` +do +if [ -f $dir/perl5 ]; then +PERL=$dir/perl5 +break +fi +if [ -f $dir/perl ]; then +PERL=$dir/perl +break +fi +done +if [ .$PERL != . ]; then +# cool, Perl is installed on this platform... +if [ .`$PERL -V:dlsrc 2/dev/null | grep dlopen` != . ]; then +# ...and actually uses the dlopen-style interface, +# so we can guess the flags from its knowledge +CFLAGS_SHLIB=`perl -V:cccdlflags | cut -d\' -f2` +LDFLAGS_SHLIB=`perl -V:lddlflags | cut -d\' -f2` +LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2` +# but additionally we have to inform the +# user that we are just guessing the flags +echo +echo ** WARNING: We have no explicit knowledge about shared object +echo ** support for your particular platform. But perhaps you have +echo ** luck: We were able to guess the compiler and linker flags +echo ** for creating shared objects from your Perl installation. +echo ** If they actually work, please send the following information +echo ** for inclusion into later releases to [EMAIL PROTECTED] or +echo ** make a suggestion report at http://bugs.apache.org/:; +echo ** PLATFORM=$PLAT +echo ** CFLAGS_SHLIB=$CFLAGS_SHLIB +echo ** LDFLAGS_SHLIB=$LDFLAGS_SHLIB +echo ** LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT +echo +fi fi ;; esac
cvs commit: apache-1.3 INSTALL
rse 98/04/04 10:02:46 Modified:.INSTALL Log: Make sure the user informed about DSO support even if he uses APACI and not reading src/Configuration.tmpl He has to notice that the nice --enable-shared option is only available if his platform really supports DSO. Revision ChangesPath 1.4 +40 -12apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- INSTALL 1998/04/01 12:59:56 1.3 +++ INSTALL 1998/04/04 18:02:46 1.4 @@ -41,12 +41,14 @@ The following requirements exist for building Apache: o Disk Space: + Make sure you have approximately 12 MB of temporary free disk space available. After installation Apache occupies approximately 3 MB of disk space (the actual required disk space depends on the amount of compiled in third party modules, etc). o ANSI-C Compiler: + Make sure you have an ANSI-C compiler installed. The GNU C compiler (GCC) from the Free Software Foundation (FSF) is recommended. If you don't have GCC then at least make sure your vendors compiler is ANSI @@ -54,15 +56,43 @@ http://www.gnu.ai.mit.edu/ and the GCC distribution under http://www.gnu.ai.mit.edu/order/ftp.html . - o Perl 5 Interpreter (OPTIONAL): -For some of the support scripts like `apachectl' (which are written in -Perl) the Perl 5 interpreter is required. If no such interpreter is -found by APACI's `configure' script this is no harm. You still can -build and install Apache 1.3. Only those support scripts cannot be -used. If you have multiple Perl interpreters installed (perhaps a Perl -4 from the vendor and a Perl 5 from your own), then it is recommended -to use the --with-perl option (see below) to make sure the correct one -is selected by APACI. + o Perl 5 Interpreter [OPTIONAL]: + +For some of the support scripts like `apxs' or `dbmmanage' (which are +written in Perl) the Perl 5 interpreter is required. If no such +interpreter is found by APACI's `configure' script this is no harm. +Of course, you still can build and install Apache 1.3. Only those +support scripts cannot be used. If you have multiple Perl interpreters +installed (perhaps a Perl 4 from the vendor and a Perl 5 from your +own), then it is recommended to use the --with-perl option (see below) +to make sure the correct one is selected by APACI. + + o Dynamic Shared Object (DSO) support [OPTIONAL]: + +To provide maximum flexibility Apache now is able to load modules +under runtime via the DSO mechanism by using the pragmatic +dlopen()/dlsym() system calls. These system calls are not available +under all operating systems therefore you cannot use the DSO mechanism +on all platforms. And Apache currently has only limited built-in +knowledge on how to compile shared objects because this is heavily +platform-dependend. The current state is this: + +o Out-of-the-box supported platforms are: + - Linux - IRIX + - FreeBSD - OSF1 + - Solaris - UnixWare + - SunOS + +o Entirely unsupported platforms are: + - HP-UX (because no dlopen-style interface) + - Ultrix (because no dlopen-style interface) + - AIX(although it has dlopen it is a braindead one) + +If your system is not on these lists but has the dlopen-style +interface, you either have to provide the appropriate compiler and +linker flags (see CFLAGS_SHLIB, LDFLAGS_SHLIB and LDFLAGS_SHLIB_EXPORT +below) manually or at least make sure a Perl 5 interpreter is +installed from which Apache can guess the options. 3. Configuring the source tree --- @@ -152,9 +182,7 @@ no=disabled) can be seen when running `./configure --help'. There are two special NAME variants: max for enabling or disabling all modules except the bootstrapping so module and remain for enabling or disabling only -these modules which are still not enabled. ATTENTION: Shared object -support is not available on all platforms. See the src/Configuration.tmpl -file for the definitive list of supported platforms. +these modules which are still not enabled. Use the --with-perl=FILE option to select a particular Perl interpreter executable to be used with Apache. Per default APACI tries to find it
cvs commit: apache-1.3/src/test/rename/csubst Makefile csubst.c lexer.c lexer.l tokens.h util.c
rse 98/04/02 22:20:17 Added: src/test/rename Makefile README apapi.h apapi.h.mk apapi_compat.h apapi_compat.h.mk rename.cf rename.cf.update rename.pl src/test/rename/csubst Makefile csubst.c lexer.c lexer.l tokens.h util.c Log: Move the global symbol renaming stuff from apache-core (where it was located wrong) to apache-1.3/src/test/rename/ (where it is not located a lot better, but a little bit better). After the renaming (if done) these stuff gets removed, of course. Brian: We should really create a, say apache-misc, repository for those (temporary) stuff. Revision ChangesPath 1.1 apache-1.3/src/test/rename/Makefile Index: Makefile === SRC=../.. all: @echo run 'make rename' for renaming _THIS_ source tree @echo run 'make rename SRC=/path/to/apache-1.3/src' for other test trees rename: programs ./rename.pl $(SRC)/buildmark.c \ $(SRC)/os \ $(SRC)/main \ $(SRC)/ap \ $(SRC)/modules \ $(SRC)/include programs: @cd csubst; make clean: @cd csubst; make clean 1.1 apache-1.3/src/test/rename/README Index: README === This can be used directly for everyone: rename.pl .. The source renaming script These three Needs adjustments to work out-of-the-box: rename.cf.update ... Updates rename.cf according to API_EXPORT tags in the sources. Needs an ID file in src/ which is generated by mkid from GNU id-utils apapi_compat.h.mk .. Creates apapi_compat.h file from rename.cf apapi.h.mk . Creates apapi.h file from rename.cf and ID file 1.1 apache-1.3/src/test/rename/apapi.h Index: apapi.h === /* ** apapi.h -- Apache API prototypes */ #ifndef APAPI_H #define APAPI_H extern void ap_MD5Final(unsigned char digest[16], AP_MD5_CTX * context); extern void ap_MD5Init(AP_MD5_CTX * context); extern ; extern void ap_add_cgi_vars(request_rec *r); extern void ap_add_common_vars(request_rec *r); extern void ap_add_module(module *m); extern int ap_add_named_module(const char *name); extern int ap_allow_options (request_rec *r); extern int ap_allow_overrides (request_rec *r); extern ; extern void ap_array_cat(array_header *dst, const array_header *src); extern char * ap_auth_name (request_rec *r); extern char * ap_auth_type (request_rec *r); extern void ap_basic_http_header(request_rec *r); extern int ap_bclose(BUFF *fb); extern BUFF * ap_bcreate(pool *p, int flags); extern int ap_bfilbuf(BUFF *fb); extern int ap_bfileno(BUFF *fb, int direction); extern int ap_bflsbuf(int c, BUFF *fb); extern int ap_bflush(BUFF *fb); extern int ap_bgetopt(BUFF *fb, int optname, void *optval); extern int ap_bgets(char *buff, int n, BUFF *fb); extern void ap_bhalfduplex(BUFF *fb); extern void ap_block_alarms(); extern int ap_blookc(char *buff, BUFF *fb); extern int ap_bnonblock(BUFF *fb, int direction); extern void ap_bonerror(BUFF *fb, void (*error); extern void ap_bpushfd(BUFF *fb, int fd_in, int fd_out); extern int ap_bputs(const char *x, BUFF *fb); extern int ap_bread(BUFF *fb, void *buf, int nbyte); extern int ap_bsetflag(BUFF *fb, int flag, int value); extern int ap_bsetopt(BUFF *fb, int optname, const void *optval); extern int ap_bskiplf(BUFF *fb); extern int ap_bwrite(BUFF *fb, const void *buf, int nbyte); extern long ap_bytes_in_free_blocks(void); extern long ap_bytes_in_pool(pool *p); extern int ap_call_exec(request_rec *r, char *argv0, char **env, int shellcmd); extern int ap_can_exec(const struct stat *finfo); extern int ap_cfg_closefile(configfile_t *fp); extern int ap_cfg_getc(configfile_t *cfp); extern int ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp); extern void ap_chdir_file(const char *file); extern const char * ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden); extern int ap_checkmask(const char *data, const char *mask); extern void ap_child_terminate(request_rec *r); extern void ap_cleanup_for_exec(void); extern void ap_clear_module_list(); extern void ap_clear_pool(struct pool *a); extern void ap_clear_table(table *t); extern void ap_close_piped_log (piped_log *pl); /* prototype for `ap_construct_server' cannot be found */ extern char * ap_construct_url(pool *p, const char *uri, const request_rec *r); extern array_header * ap_copy_array(pool *p, const array_header *arr
cvs commit: apache-1.3 STATUS
rse 98/04/02 23:59:28 Modified:.STATUS Log: Cleanup the two symbol rename and prefix debates for a clear voting. They are different: 1. Please give your vote to the symbol rename issue about the fact whether we now really should solve the problem by renaming the source or not (can be automatically done by the src/test/rename/ stuff). 2. Please give your vote to the prefix issue for the general fact about which prefix we really want. Either for the symbol renaming above (for 1.3) or at least for the new Apache 2.0. Revision ChangesPath 1.255 +99 -38apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- STATUS1998/04/03 00:32:45 1.254 +++ STATUS1998/04/03 07:59:27 1.255 @@ -169,45 +169,106 @@ Closed issues: Open issues: - -* Provide consistant prefixes; suggestions: - - Apache provided general functions (e.g., ap_cpystrn) - ap_xxx: +1: Ken, Brian, Ralf, Martin, Paul, Roy, Jim - - Public API functions (e.g., palloc) - apapi_xxx: +1: Ken, Ralf, Paul, Jim - appublic_xxx: - appub_xxx: - - Private functions which we can't make static - but should be (e.g., new_connection) - apprivate_xxx: - appri_xxx: +1: Paul, Jim, Ken - httpd_xxx: +1: - apint_xxx: +1: Ralf (int = internal) - Alternate proposal: - Everything should be ap_: +1 Dean, Randy, Roy, Martin - Why? Because it's far easier to type, and damn it, I - type these things far too much. Just using apapi_ for - the few hours I did while writing apapi_vformatter is - making me puke. So many extra characters, so much wasted - screen width, and keystrokes. -Dean -+1 Brian - -I agree with Dean 100%. The work created to keep this straight -far outweighs any gain this could give. -Randy - - -1: Jim. We should make some sort of logical effort to -keep things straight and organized. Taken to it's logical - conclusion, this argument could be used to keep all variable - and function names to 6 chars or less to cut down on all - that nasty typing. So instead of something like - 'lingering_close', we would use something like 'lcs' :) - We should make some effort to make our code reader and - maintainer friendly, because we aren't, and won't be, - the only one's to maintain this. +* Cleanup the symbol space now in the source for + 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, + too. But we have to additionally vote on them in the next point. + Votes: Ralf +1 + +* Use consistant prefixes for the renaming; suggestions: + + o Different prefixes to distinguish between +the type of functions: + +- Apache provided general functions (e.g., ap_cpystrn) +ap_xxx: +0: Ken, Brian, Ralf, Martin, Paul, Roy, Jim +- Public API functions (e.g., palloc) +ap_xxx: +1 Ralf +apapi_xxx: +1: Ken, Paul, Jim +- Private functions which we can't make static (because of + cross-object usage) but should be (e.g., new_connection) +apx_xxx +1: Ralf +appri_xxx +1: Paul, Jim, Ken +- Public API module structure variables (e.g., + status_module) which are used special in Configure, + mod_so, etc and have to be exported: +ap_xxx +1: +apm_xxx +1: Ralf + +Notes: +- Ralf: My opinion for my decisions are the following ones: + 1. The short ap_ prefix is a good idea because its + a handy prefix while still Apache specific, so I + would use it for those symbols we deal most: API + symbols. + 2. There is a distinction needed between symbols + we want explicitly export (API) and those we are + forced to export (cross-object references). + Hence a the apx_ prefix. It's different from ap_ + but as short as it can while still providing the + needed information: ap for Apache and x for + internal cross-object symbol. + 3. When you are look at the code you notice that + we use name_module for the names of the + module's dispatch structure. First, it always + was confusing in the past that a module named
cvs commit: apache-1.3/src CHANGES Configure
rse 98/04/03 04:12:54 Modified:.STATUS src CHANGES Configure Log: Add the fallback strategy for shared object support Rasmus has suggested some time ago. Revision ChangesPath 1.256 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- STATUS1998/04/03 07:59:27 1.255 +++ STATUS1998/04/03 12:12:48 1.256 @@ -135,6 +135,7 @@ * Ralf's APACI --without-support option * Martin's fix accept (and pass) http://user:[EMAIL PROTECTED] proxy requests * Martin's fix CONNECT proxy handling again +* Ralf's fallback strategy for DSO by trying to guess flags from Perl Available Patches: 1.753 +8 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.752 retrieving revision 1.753 diff -u -r1.752 -r1.753 --- CHANGES 1998/04/01 11:28:29 1.752 +++ CHANGES 1998/04/03 12:12:50 1.753 @@ -1,5 +1,13 @@ Changes with Apache 1.3b6 + *) Now src/Configure uses a fallback strategy for the shared object support + on platforms where no explicit information is available: If a Perl + installation exists we ask it about its shared object support and if it's + the dlopen-style one we shamelessly guess the compiler and linker flags + for creating shared objects from Perls knowledge. Of course, the user is + warning about what we are doing and informed that he should send us + the guessed flags when they work. [Ralf S. Engelschall] + *) Provide APACI --without-support option to be able to disable the build and installation of the support tools from the src/support/ area. Although its useful to have these installed per default we should provide 1.224 +38 -6 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- Configure 1998/03/31 15:59:54 1.223 +++ Configure 1998/04/03 12:12:52 1.224 @@ -805,6 +805,36 @@ LDFLAGS_SHLIB=-Bdynamic -G LDFLAGS_SHLIB_EXPORT= ;; +*) +## ok, no known explict support for shared objects +## on this platform, but we give not up immediately. +## We take a second chance by guessing the compiler +## and linker flags from the Perl installation +## if it exists. +if [ .`perl -V:dlsrc 2/dev/null | grep dlopen` != . ]; then +# cool, Perl is installed on this platform +# and actually uses the dlopen-style interface, +# so we can guess the flags from its knowledge +CFLAGS_SHLIB=`perl -V:cccdlflags | cut -d\' -f2` +LDFLAGS_SHLIB=`perl -V:lddlflags | cut -d\' -f2` +LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2` +# but additionally we have to inform the +# user that we are just guessing the flags +echo +echo ** WARNING: We have no explicit knowledge about shared object +echo ** support for your particular platform. But perhaps you have +echo ** luck: We were able to guess the compiler and linker flags +echo ** for creating shared objects from your Perl installation. +echo ** If they actually work, please send the following information +echo ** for inclusion into later releases to [EMAIL PROTECTED] or +echo ** make a suggestion report at http://bugs.apache.org/:; +echo ** PLATFORM=$PLAT +echo ** CFLAGS_SHLIB=$CFLAGS_SHLIB +echo ** LDFLAGS_SHLIB=$LDFLAGS_SHLIB +echo ** LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT +echo +fi +;; esac fi @@ -815,12 +845,14 @@ if [ x$using_shlib = x1 ] ; then if [ x$TCFLAGS_SHLIB = x -a x$CFLAGS_SHLIB = x -a \ x$TLDFLAGS_SHLIB = x -a x$LDFLAGS_SHLIB = x ]; then -echo Sorry, no shared object support available. -echo Either compile all modules statically (use AddModule instead -echo of SharedModule in the Configuration file) or at least provide -echo us with the apropriate compiler and linker flags via the -echo CFLAGS_SHLIB, LDFLAGS_SHLIB
cvs commit: apache-1.3/src/support apxs.pl apxs.8
rse 98/04/03 05:29:08
Modified:.STATUS
src CHANGES
src/support apxs.pl apxs.8
Log:
Add query option to APXS for manually determining setting.
Revision ChangesPath
1.257 +1 -0 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- STATUS1998/04/03 12:12:48 1.256
+++ STATUS1998/04/03 13:29:03 1.257
@@ -136,6 +136,7 @@
* Martin's fix accept (and pass) http://user:[EMAIL PROTECTED] proxy
requests
* Martin's fix CONNECT proxy handling again
* Ralf's fallback strategy for DSO by trying to guess flags from Perl
+* Ralf's add of the query (-q) option to apxs
Available Patches:
1.754 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.753
retrieving revision 1.754
diff -u -r1.753 -r1.754
--- CHANGES 1998/04/03 12:12:50 1.753
+++ CHANGES 1998/04/03 13:29:05 1.754
@@ -1,5 +1,11 @@
Changes with Apache 1.3b6
+ *) Add query (-q) option to apxs support tool to be able to manually query
+ specific settings from apxs. This is needed for instance when you
+ manually want to access Apache's header files and you need to assemble
+ the -I option. Now you can do -I`apxs -q INCLUDEDIR`.
+ [Ralf S. Engelschall]
+
*) Now src/Configure uses a fallback strategy for the shared object support
on platforms where no explicit information is available: If a Perl
installation exists we ask it about its shared object support and if
it's
1.3 +52 -14apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /export/home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apxs.pl 1998/04/01 11:48:28 1.2
+++ apxs.pl 1998/04/03 13:29:07 1.3
@@ -75,11 +75,18 @@
my $CFG_LDFLAGS_SHLIB = '@LDFLAGS_SHLIB@'; # substituted via Makefile.tmpl
my $CFG_PREFIX= '@prefix@';# substituted via APACI install
my $CFG_SBINDIR = '@sbindir@'; # substituted via APACI install
-my $CFG_INCDIR= '@includedir@';# substituted via APACI install
+my $CFG_INCLUDEDIR= '@includedir@';# substituted via APACI install
my $CFG_LIBEXECDIR= '@libexecdir@';# substituted via APACI install
my $CFG_SYSCONFDIR= '@sysconfdir@';# substituted via APACI install
##
+## Cleanup the above stuff
+##
+$CFG_CFLAGS =~ s|^\s+||;
+$CFG_CFLAGS =~ s|\s+$||;
+$CFG_CFLAGS =~ s|\s+`.+apaci`||;
+
+##
## Initial shared object support check
##
if (not grep(/mod_so/, `$CFG_SBINDIR/httpd -l`)) {
@@ -106,6 +113,7 @@
my $opt_i = 0;
my $opt_a = 0;
my $opt_A = 0;
+my $opt_q = 0;
# this subroutine is derived from Perl's getopts.pl with the enhancement of
# the + metacharater at the format string to allow a list to be build by
@@ -173,21 +181,23 @@
}
sub usage {
-print STDERR apxs:Usage: apxs -g -n name\n;
-print STDERR apxs:Usage: apxs -c [-o mod_name.so] [-D..] [-I..]
[-l..] [-L..] mod_name.c ...\n;
-print STDERR apxs:Usage: apxs -i [-e] [-n name] mod_name.so ...\n;
+print STDERR Usage: apxs -g -n modname\n;
+print STDERRapxs -q query ...\n;
+print STDERRapxs -c [-o dsofile] [-D name[=value]] [-I
incdir]\n;
+print STDERR[-L libdir] [-l libname] files ...\n;
+print STDERRapxs -i [-a] [-n modname] dsofile ...\n;
exit(1);
}
# option handling
my $rc;
-($rc, @ARGV) = Getopts(n:gco:I+D+L+l+iaA, @ARGV);
+($rc, @ARGV) = Getopts(qn:gco:I+D+L+l+iaA, @ARGV);
usage if ($rc == 0);
usage if ($#ARGV == -1 and not $opt_g);
-usage if (not ($opt_g and $opt_n) and not $opt_i and not $opt_c);
+usage if (not $opt_q and not ($opt_g and $opt_n) and not $opt_i and not
$opt_c);
# argument handling
-my @files = @ARGV;
+my @args = @ARGV;
my $name = 'unknown';
$name = $opt_n if ($opt_n ne '');
@@ -240,6 +250,37 @@
exit(0);
}
+
+if ($opt_q) {
+##
+## QUERY INFORMATION
+##
+
+my $result = '';
+my $arg;
+foreach $arg (@args) {
+my $ok = 0;
+my $name;
+foreach $name (qw(
+CC LD CFLAGS CFLAGS_SHLIB LDFLAGS_SHLIB
+PREFIX SBINDIR INCLUDEDIR LIBEXECDIR SYSCONFDIR
+)) {
+if ($arg eq $name or $arg eq lc($name)) {
+my $val = eval \$CFG_$name
cvs commit: apache-1.3/src INSTALL PORTING Configuration.tmpl Configure
rse 98/04/03 05:38:38 Modified:src INSTALL PORTING Configuration.tmpl Configure Log: Fix deprecated URL: http://www.apache.org/bugdb.cgi - http://bugs.apache.org/ Revision ChangesPath 1.21 +2 -2 apache-1.3/src/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/src/INSTALL,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- INSTALL 1998/04/01 12:59:57 1.20 +++ INSTALL 1998/04/03 13:38:34 1.21 @@ -103,8 +103,8 @@ If during compilation you get a warning about a missing 'regex.h', set WANTHSREGEX=yes in the 'Configuration', and let The Apache Group know you needed to do this for your OS by filling out a problem report form at - http://www.apache.org/bugdb.cgi, or by sending a mail message to - [EMAIL PROTECTED] Include the output of the command uname -a. + http://bugs.apache.org/, or by sending a mail message to + [EMAIL PROTECTED] Include the output of the command uname -a. Installation 1.24 +2 -2 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- PORTING 1998/03/28 16:53:17 1.23 +++ PORTING 1998/04/03 13:38:34 1.24 @@ -345,8 +345,8 @@ The above hints, and a good understanding of your OS and Apache, will go a LONG way in helping you get Apache built and running on your OS. If you have a port, PLEASE send Email to '[EMAIL PROTECTED]', -or log a suggestion report at http://www.apache.org/bugdb.cgi, -with the patches so that we may add them to the official version. +or log a suggestion report at http://bugs.apache.org/, with +the patches so that we may add them to the official version. If you hit a rough spot in the porting process, you can also try sending Email to that address as well and, if you are lucky, someone will respond. Another good source is the 'comp.infosystems.www.servers.unix' 1.92 +2 -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.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- Configuration.tmpl1998/04/01 12:24:53 1.91 +++ Configuration.tmpl1998/04/03 13:38:35 1.92 @@ -142,8 +142,8 @@ # your platform), or are set incorrectly, you may override them here. # If you have to do this, please let us know what you set and what your # platform is, by filling out a problem report form at the Apache web site: -# http://www.apache.org/bugdb.cgi. If your browser is forms-incapable, -# you can get the information to us by sending mail to [EMAIL PROTECTED] +# http://bugs.apache.org/. If your browser is forms-incapable, you +# can get the information to us by sending mail to [EMAIL PROTECTED] # # WANTHSREGEX: # Apache requires a POSIX regex implementation. Henry Spencer's 1.225 +2 -2 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.224 retrieving revision 1.225 diff -u -r1.224 -r1.225 --- Configure 1998/04/03 12:12:52 1.224 +++ Configure 1998/04/03 13:38:36 1.225 @@ -639,8 +639,8 @@ uname -X echo Ideally, read the file PORTING, do what it says, and send the echo resulting patches to The Apache Group by filling out a report - echo form at http://www.apache.org/bugdb.cgi - or, if your browser - echo isn\'t forms-capable, you can send them via email to + echo form at http://bugs.apache.org/ - or, if your browser isn\'t + echo forms-capable, you can send them via email to 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
cvs commit: apache-1.3/htdocs/manual/mod mod_mmap_static.html index.html directives.html
rse 98/04/03 08:07:17 Modified:.STATUS src CHANGES Configuration.tmpl htdocs/manual/mod index.html directives.html Added: htdocs/manual/mod mod_mmap_static.html Log: Although mod_mmap_static is an experimental module it works fine and already is distributed with Apache it was not prepared the same way as the other modules. Hence let us give it a first cut for a documentation and an (disabled, of course) entry in the Configuration.tmpl file. Dean: Feel free to fix both my english and my initial content in the mod_mmap_static.html document. It's your baby, so you know best what is missing. Revision ChangesPath 1.259 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- STATUS1998/04/03 13:37:41 1.258 +++ STATUS1998/04/03 16:07:10 1.259 @@ -137,6 +137,7 @@ * Martin's fix CONNECT proxy handling again * Ralf's fallback strategy for DSO by trying to guess flags from Perl * Ralf's add of the query (-q) option to apxs +* Ralf's initial doc and Configuration.tmpl entry for mod_mmap_static Available Patches: 1.755 +6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.754 retrieving revision 1.755 diff -u -r1.754 -r1.755 --- CHANGES 1998/04/03 13:29:05 1.754 +++ CHANGES 1998/04/03 16:07:11 1.755 @@ -1,4 +1,10 @@ Changes with Apache 1.3b6 + + *) Add documentation file and src/Configuration.tmpl entry for the + experimental mod_mmap_static module. Because although it is and marked as + an experimental one it is distributed and thus should be documented and + prepared for configuration the same way as all others modules. + [Ralf S. Engelschall] *) Add query (-q) option to apxs support tool to be able to manually query specific settings from apxs. This is needed for instance when you 1.93 +9 -0 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- Configuration.tmpl1998/04/03 13:38:35 1.92 +++ Configuration.tmpl1998/04/03 16:07:13 1.93 @@ -347,6 +347,15 @@ # AddModule modules/standard/mod_so.o +## mod_mmap_static lets you speedup the serving of a list of files +## by mmap()ing them at server startup-time into memory and thus +## avoiding a lot of I/O which is required on normal file serving. +## This is an experimental feature. USE IT WITH CARE AND ALWAYS +## REMMBER THAT WHENEVER ONE OF THESE FILES CHANGE THE SERVER HAS +## TO BE RESTARTED MANUALLY TO SYNC WITH THE CHANGED FILE CONTENTS. + +# AddModule modules/experimental/mod_mmap_static.o + ## mod_setenvif lets you set environment variables based on the HTTP header ## fields in the request; this is useful for conditional HTML, for example. ## Since it is also used to detect buggy browsers for workarounds, it 1.26 +2 -0 apache-1.3/htdocs/manual/mod/index.html Index: index.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/index.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- index.html1998/03/21 17:03:48 1.25 +++ index.html1998/04/03 16:07:14 1.26 @@ -91,6 +91,8 @@ DDDetermining document types using file extensions. DTA HREF=mod_mime_magic.htmlmod_mime_magic/A DDDetermining document types using magic numbers. +DTA HREF=mod_mmap_static.htmlmod_mmap_static/A +DDMapping files into memory for faster serving. DTA HREF=mod_negotiation.htmlmod_negotiation/A DDContent negotiation. DTA HREF=mod_proxy.htmlmod_proxy/A 1.43 +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.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- directives.html 1998/03/21 17:03:47 1.42 +++ directives.html 1998/04/03 16:07:15 1.43 @@ -136,6 +136,7 @@ LIA HREF=mod_cern_meta.html#metasuffixMetaSuffix/A LIA HREF=mod_mime_magic.html#mimemagicfileMimeMagicFile/A LIA HREF=core.html#minspareserversMinSpareServers/A +LIA HREF=mod_mmap_static.html
cvs commit: apache-1.3/src .cvsignore
rse 98/04/01 03:39:57 Modified:. Makefile.tmpl src .cvsignore Log: Make the install-can-go optimization-file less generic in name and make sure CVS doen't complain about it. Revision ChangesPath 1.6 +3 -3 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.tmpl 1998/04/01 11:28:37 1.5 +++ Makefile.tmpl 1998/04/01 11:39:56 1.6 @@ -139,7 +139,7 @@ build: @echo === $(SRC) @$(MAKE) -f $(MKF) $(MFLAGS) build-std $(build-support) - @touch $(SRC)/.build.ok + @touch $(SRC)/.apaci.build.ok @echo === $(SRC) # build the standard stuff @@ -165,7 +165,7 @@ # package. This is implemented by running subtargets for the # separate parts of the installation process. install: - @if [ ! -f $(SRC)/.build.ok ]; then \ + @if [ ! -f $(SRC)/.apaci.build.ok ]; then \ $(MAKE) -f $(MKF) $(MFLAGS) build; \ fi @$(MAKE) -f $(MKF) $(MFLAGS) \ @@ -341,7 +341,7 @@ clean: @echo === $(SRC) @$(MAKE) -f $(MKF) $(MFLAGS) clean-std $(clean-support) - @rm -f $(SRC)/.build.ok + @rm -f $(SRC)/.apaci.build.ok @echo === $(SRC) # clean the standard stuff 1.13 +1 -0 apache-1.3/src/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apache-1.3/src/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore1998/03/29 12:27:32 1.12 +++ .cvsignore1998/04/01 11:39:57 1.13 @@ -17,3 +17,4 @@ Makefile.config modules.c apaci +.apaci.build.ok
cvs commit: apache-1.3/src/support Makefile.tmpl
rse 98/04/01 03:45:21 Modified:src/support Makefile.tmpl Log: update dependency list: cls is now in src/test/ while ab is new. Revision ChangesPath 1.14 +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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile.tmpl 1998/03/31 15:46:16 1.13 +++ Makefile.tmpl 1998/04/01 11:45:20 1.14 @@ -55,7 +55,7 @@ $(OBJS): Makefile # DO NOT REMOVE -cls.o: cls.c +ab.o: ab.c htdigest.o: htdigest.c ../main/md5c.c $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/md5.h htpasswd.o: htpasswd.c
cvs commit: apache-1.3/src/support apxs.pl
rse 98/04/01 03:48:29 Modified:src/support apxs.pl Log: Perl 5.003 should work, too. Because apxs.pl uses my only as stand-alone and not inside any control structure (only in Perl 5.004). But a lot of systems have Perl 5.003 or 5.003_XX installed. Revision ChangesPath 1.2 +1 -1 apache-1.3/src/support/apxs.pl Index: apxs.pl === RCS file: /export/home/cvs/apache-1.3/src/support/apxs.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apxs.pl 1998/03/31 15:46:17 1.1 +++ apxs.pl 1998/04/01 11:48:28 1.2 @@ -60,7 +60,7 @@ ## Written by Ralf S. Engelschall [EMAIL PROTECTED] ## -require 5.004; +require 5.003; use strict; package apxs;
cvs commit: apache-1.3/htdocs/manual new_features_1_3.html
rse 98/04/01 04:23:13 Modified:. CHANGES htdocs/manual new_features_1_3.html Log: Give details about the greatly improved and extended shared object support in Apache 1.3 Revision ChangesPath 1.19 +24 -0 apache-1.3/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/CHANGES,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- CHANGES 1998/03/31 12:52:00 1.18 +++ CHANGES 1998/04/01 12:23:12 1.19 @@ -136,3 +136,27 @@ configuration scheme are available plus a lot of new options for flexibly customizing Apache. + *) Dynamic Shared Object (DSO) support + The support for loading Apache modules under runtime from DSO files was + greatly enhanced: First, mod_so was cleaned up and the src/Configure + script was extended to setup the totally platform-dependend commands to + build DSO files on all major Unix platforms which support the pragmatic + dlopen() interface (Linux, FreeBSD, Solaris, SunOS, IRIX, OSF1, + UnixWare). The two popular platforms HP/UX and AIX are not supported + because they both use a very special proprietary interface. Second the + modules mod_proxy and mod_mime were unbundled to be able to use them + independend from each other. Finally the Makefile generation stuff in + src/Configure was overhauled to support building shared objects as + clean as building static objects. Additionally the new APACI (see + below) provides a powerful mechanism for out-of-the-box enabling, + building, installing and activating those DSO-based modules. + + *) APache eXtenSion (APXS) support tool + Now that Apache provides full support for loading modules under runtime + from dynamic shared object (DSO) files, a new support tool apxs was + created which provides off-source building, installing and activating + of those DSO-based modules. It completely hides the platform-dependend + DSO-build commands from the user and provides an easy way to build + modules outside the Apache source tree. To achieve this APACI installs + the Apache C header files together with the apxs tool. + 1.52 +27 -0 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.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- new_features_1_3.html 1998/03/29 12:27:37 1.51 +++ new_features_1_3.html 1998/04/01 12:23:13 1.52 @@ -599,6 +599,33 @@ directory layout. Any options from the old configuration scheme are available plus a lot of new options for flexibly customizing Apache. /LI + LISTRONGDynamic Shared Object (DSO) support/STRONG + BR + The support for loading Apache modules under runtime from DSO files was + greatly enhanced: First, CODEmod_so/CODE was cleaned up and the + CODEsrc/Configure/CODE script was extended to setup the totally + platform-dependend commands to build DSO files on all major Unix platforms + which support the pragmatic CODEdlopen()/CODE interface (Linux, FreeBSD, + Solaris, SunOS, IRIX, OSF1, UnixWare). The two popular platforms HP/UX and + AIX are not supported because they both use a very special proprietary + interface. Second the modules CODEmod_proxy/CODE and + CODEmod_mime/CODE were unbundled to be able to use them independend from + each other. Finally the Makefile generation stuff in + CODEsrc/Configure/CODE was overhauled to support building shared objects + as clean as building static objects. Additionally the new APACI (see below) + provides a powerful mechanism for out-of-the-box enabling, building, + installing and activating those DSO-based modules. + /LI + LISTRONGAPache eXtenSion (APXS) support tool/STRONG + BR + Now that Apache provides full support for loading modules under runtime from + dynamic shared object (DSO) files, a new support tool CODEapxs/CODE was + created which provides off-source building, installing and activating of + those DSO-based modules. It completely hides the platform-dependend + DSO-build commands from the user and provides an easy way to build modules + outside the Apache source tree. To achieve this APACI installs the Apache C + header files together with the CODEapxs/CODE tool. + /LI /UL !--#include virtual=footer.html --
cvs commit: apache-1.3/src Configuration.tmpl
rse 98/04/01 04:24:54 Modified:src Configuration.tmpl Log: Ops, UnixWare _is_ supported. AIX is the bad guy. Revision ChangesPath 1.91 +2 -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.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- Configuration.tmpl1998/03/25 02:18:19 1.90 +++ Configuration.tmpl1998/04/01 12:24:53 1.91 @@ -66,10 +66,10 @@ # heavily platform-dependend. The current state is this: # # Out-of-the-box supported platforms: -# Linux, FreeBSD, Solaris, SunOS, IRIX, OSF1 +# Linux, FreeBSD, Solaris, SunOS, IRIX, OSF1, UnixWare # # Entirely unsupported platforms (no dlopen-style API): -# HP-UX, UnixWare, Ultrix +# HP-UX, AIX, Ultrix # # For other platforms where you want to use the `SharedModule' # directive you first have to make sure it supports the dlopen()
cvs commit: apache-1.3/src INSTALL
rse 98/04/01 04:59:58 Modified:. README INSTALL src INSTALL Log: Reorganisation and cleanup of the README, INSTALL and src/INSTALL files to avoid confusion by the user: 1. Merge the installation and compilation instructions for the manual way from top-level README into src/INSTALL because this is the INSTALL file for it. Now any information we have about this is there. I've not changed the text itself greatly, just merged and adjusted the sentences. 2. Made the same style for INSTALL and src/INSTALL plus cross-hints for the user where to find what plus general hint for both files about Windows installation. 3. Inserted a new and simple reference to top-level INSTALL file under the topic Installation to the top-level README file. I've also cleaned up the README file a little bit. Feel free to fix me where I've written down bad english... Revision ChangesPath 1.15 +57 -111 apache-1.3/README Index: README === RCS file: /export/home/cvs/apache-1.3/README,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- README1997/11/25 09:47:47 1.14 +++ README1998/04/01 12:59:55 1.15 @@ -1,117 +1,63 @@ + Apache Version 1.3 (and up) -What is it? + What is it? + --- + + Apache is an HTTP server designed as a plug-in replacement for + the NCSA server version 1.3 (or 1.4). It fixes numerous bugs in + the NCSA server and includes many frequently requested new + features, and has an API which allows it to be extended to meet + users' needs more easily. + + The Latest Version + -- + + Details of the latest version can be found on the Apache HTTP + server project page under http://www.apache.org/. + + Documentation + - + + The documentation available as of the date of this release is + also included, in HTML format, in the htdocs/manual/ directory. + For the most up-to-date documentation can be found on + http://www.apache.org/docs/. + + Installation + + + From Apache version 1.3 and up you have two possibilities to + build and install the Apache package: The old commonly known + but manual way from Apache 1.2 and below and the new + out-of-the-box way through the new Apache Autoconf-style + Interface (APACI). For detailed instructions see the file + INSTALL in this directory. + + Licensing + - + + Please see the file called LICENSE. + + Acknowledgments + + + We wish to acknowledge the following copyrighted works that + make up portions of the Apache software: + + Portions of this software were developed at the National Center + for Supercomputing Applications (NCSA) at the University of + Illinois at Urbana-Champaign. + + This software contains code derived from the RSA Data Security + Inc. MD5 Message-Digest Algorithm, including various + modifications by Spyglass Inc., Carnegie Mellon University, and + Bell Communications Research, Inc (Bellcore). -Apache is an HTTP server designed as a plug-in replacement for the NCSA -server version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server and -includes many frequently requested new features, and has an API which -allows it to be extended to meet users' needs more easily. - -Documentation -- - -The documentation available as of the date of this release is also -included, in HTML format, in the htdocs/manual/ directory. For the -most up-to-date documentation, visit us on the WWW, at -URL:http://www.apache.org/. - -New Installations -- - -NOTE: Windows users please see http://www.apache.org/docs/windows.html, - or the htdocs/manual/windows.html file included with Apache. The - following applies only to Unix users. - -Unless you grabbed a binary distribution of Apache, you must compile -it for your specific platform. In order to compile it, you must set -compile-time options (in particular, system type) for your system by -editing a Configuration file, run a script which generates a Makefile -and a small piece of C code, and then compile it. - -For instructions on compilation, see the file 'INSTALL' in the src/ directory. - -After compilation, you will have a binary called httpd in the src/ -directory. If you received a binary distribution of apache, you -should have this file already. - -The next step is to edit the configuration files for the server. In -the subdirectory called conf you should find distribution versions -of the three configuration files: srm.conf-dist, access.conf-dist, and -httpd.conf-dist. Copy
cvs commit: apache-1.3 INSTALL STATUS configure Makefile.tmpl
rse 98/04/01 03:28:38 Modified:src CHANGES . INSTALL STATUS configure Makefile.tmpl Log: Just a little APACI option to provide a way for the user to install Apache without the support tools when he has problems with it (for instance compiling them or no Perl interpreter installed, etc). Revision ChangesPath 1.752 +6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.751 retrieving revision 1.752 diff -u -r1.751 -r1.752 --- CHANGES 1998/03/31 15:46:14 1.751 +++ CHANGES 1998/04/01 11:28:29 1.752 @@ -1,5 +1,11 @@ Changes with Apache 1.3b6 + *) Provide APACI --without-support option to be able to disable the build + and installation of the support tools from the src/support/ area. + Although its useful to have these installed per default we should provide + a way to compile and install without them for backward-compatibility. + [Ralf S. Engelschall] + *) Add of the new APache eXtenSion (apxs) support tool for building and installing modules into an _already installed_ Apache package through the dynamic shared object (DSO) mechanism [mod_so.c]. The trick here is that 1.2 +9 -4 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- INSTALL 1998/03/29 12:27:28 1.1 +++ INSTALL 1998/04/01 11:28:32 1.2 @@ -82,10 +82,10 @@ [--sysconfdir=DIR] [--enable-shared=NAME] [--datadir=DIR] [--disable-shared=NAME] [--localstatedir=DIR] - [--compat] [--with-perl=FILE] - [--enable-suexec] - [--suexec-caller=UID] - [--suexec-userdir=DIR] + [--compat] [--enable-suexec] + [--suexec-caller=UID] + [--with-perl=FILE] [--suexec-userdir=DIR] + [--without-support] Use the CC, OPTIM, CFLAGS, INCLUDES, LDFLAGS, LIBS, CFLAGS_SHLIB, LDFLAGS_SHLIB, LDFLAGS_SHLIB_EXPORT and RANLIB environment variables to @@ -155,6 +155,11 @@ executable to be used with Apache. Per default APACI tries to find it automatically. But if multiple Perl instances exist on your system you have to select the correct one manually. + +Use the --without-support option to explicitly disable the build and +installation of support tools from the src/support/ area. This can be +useful when you have compilation problems with one or more of these not +programs on your platform or if you just don't need them. Use the --enable-suexec option to enable the suEXEC feature by building and installing the suexec support program. Use --suexec-caller=UID to 1.251 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- STATUS1998/03/31 15:46:08 1.250 +++ STATUS1998/04/01 11:28:33 1.251 @@ -132,6 +132,7 @@ * Rainer Scherg's fix for CONNECT proxy support: #1326, #1573, #1942 * Ken's reworking of the Apache LICENSE * Ralf's APache eXtenSion for easy off-source extending Apache via DSO +* Ralf's APACI --without-support option Available Patches: 1.5 +27 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- configure 1998/03/31 15:46:10 1.4 +++ configure 1998/04/01 11:28:36 1.5 @@ -149,6 +149,9 @@ suexec_caller=www suexec_userdir=public_html +# with support tools +support=1 + # determine rules rules= rulelist= @@ -289,6 +292,7 @@ echo --enable-shared=NAME enable build of Module named 'NAME' as a shared object echo --disable-shared=NAME disable build of Module named 'NAME' as a shared object echo --with-perl=FILE set the path to the optional Perl interpreter to use +echo --without-support disable
