cvs commit: apache-1.3 README.configure
rse 00/02/10 18:02:52 Modified:.README.configure Log: GNU layout is no longer default, so default path is bin and not sbin Revision ChangesPath 1.21 +1 -1 apache-1.3/README.configure Index: README.configure === RCS file: /e/apache/REPOS/apache-1.3/README.configure,v retrieving revision 1.20 retrieving revision 1.21 diff -u -u -r1.20 -r1.21 --- README.configure 1999/12/20 14:27:10 1.20 +++ README.configure 2000/02/10 17:02:51 1.21 @@ -26,7 +26,7 @@ already initially configured, so you can immediately fire it up the first time via -$ PREFIX/sbin/apachectl start +$ PREFIX/bin/apachectl start to get your first success event with the Apache HTTP server without having to fiddle around with various options for a long time. On the other hand
cvs commit: apache-apr/pthreads README.rse
rse 99/08/19 18:00:31 Modified:pthreads README.rse Log: Use Pth 1.1 release versions now Revision ChangesPath 1.2 +5 -7 apache-apr/pthreads/README.rse Index: README.rse === RCS file: /e/apache/REPOS/apache-apr/pthreads/README.rse,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- README.rse1999/08/12 07:31:01 1.1 +++ README.rse1999/08/19 16:00:31 1.2 @@ -97,11 +97,9 @@ Follow these steps: $ cd ROOT/apache-apr - $ lynx ftp://alpha.gnu.org/gnu/pth/pth-1.1b3.tar.gz - [You can use also any later Pth version, of course. ] - [Especially release versions = 1.1.0 from ftp://ftp.gnu.org/gnu/pth/] - $ gunzip pth-1.1b3.tar.gz | tar xvf - - $ cd pth-1.1b3 + $ lynx ftp://ftp.gnu.org/gnu/pth/pth-1.1.X.tar.gz + $ gunzip pth-1.1.X.tar.gz | tar xvf - + $ cd pth-1.1.X $ ./configure \ --disable-shared \ --enable-pthread \ @@ -112,8 +110,8 @@ $ cd ROOT/apache-apr/pthread $ CC='cc' \ OPTIM='-O2' \ - CFLAGS='-I\$(SRCDIR)/../pth-1.1b3 -DPTHREAD_EVERYWHERE -DNO_SERIALIZED_ACCEPT' \ - LDFLAGS='-L\$(SRCDIR)/../pth-1.1b3/.libs' \ + CFLAGS='-I\$(SRCDIR)/../pth-1.1.X -DPTHREAD_EVERYWHERE -DNO_SERIALIZED_ACCEPT' \ + LDFLAGS='-L\$(SRCDIR)/../pth-1.1.X/.libs' \ LIBS=-lpthread \ ./configure \ --with-layout=GNU \
cvs commit: apache-2.0/mpm/conf httpd.conf-dist
rse 99/08/12 13:35:41 Modified:mpm/conf httpd.conf-dist Log: Ops, Scoreboard twice? Revision ChangesPath 1.4 +0 -4 apache-2.0/mpm/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /e/apache/REPOS/apache-2.0/mpm/conf/httpd.conf-dist,v retrieving revision 1.3 retrieving revision 1.4 diff -u -u -r1.3 -r1.4 --- httpd.conf-dist 1999/08/12 08:59:11 1.3 +++ httpd.conf-dist 1999/08/12 11:35:41 1.4 @@ -123,10 +123,6 @@ # KeepAliveTimeout 15 -IfModule !dexter.c -ScoreBoardFile logs/apache_runtime_status -/IfModule - # # Server-pool size regulation #
cvs commit: apache-1.3/htdocs/manual/vhosts details_1_2.html vhosts-in-depth.html
rse 98/08/18 23:17:00 Modified:htdocs/manual/vhosts details_1_2.html vhosts-in-depth.html Log: Fix hyperlinks in vhost/ area. Thanks to Jean-Philippe BAUDOUIN [EMAIL PROTECTED] for hints. Revision ChangesPath 1.5 +14 -14apache-1.3/htdocs/manual/vhosts/details_1_2.html Index: details_1_2.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/vhosts/details_1_2.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- details_1_2.html 1998/05/20 14:22:46 1.4 +++ details_1_2.html 1998/08/19 06:16:56 1.5 @@ -29,23 +29,23 @@ outside of CODEVirtualHost/CODE sections. There are virtual servers, called EMvhosts/EM, which are defined by A - HREF=mod/core.html#virtualhost + HREF=../mod/core.html#virtualhost SAMPVirtualHost/SAMP/A sections. PThe directives A - HREF=mod/core.html#port + HREF=../mod/core.html#port SAMPPort/SAMP/A, A - HREF=mod/core.html#servername + HREF=../mod/core.html#servername SAMPServerName/SAMP/A, A - HREF=mod/core.html#serverpath + HREF=../mod/core.html#serverpath SAMPServerPath/SAMP/A, and A - HREF=mod/core.html#serveralias + HREF=../mod/core.html#serveralias SAMPServerAlias/SAMP/A can appear anywhere within the definition of a server. However, each appearance overrides the previous appearance @@ -57,7 +57,7 @@ PIn the absence of any A - HREF=mod/core.html#listen + HREF=../mod/core.html#listen SAMPListen/SAMP/A directives, the (final if there are multiple) CODEPort/CODE directive in the main_server indicates @@ -114,29 +114,29 @@ OL LIIf a vhost has no A - HREF=mod/core.html#serveradmin + HREF=../mod/core.html#serveradmin CODEServerAdmin/CODE/A, A - HREF=mod/core.html#resourceconfig + HREF=../mod/core.html#resourceconfig CODEResourceConfig/CODE/A, A - HREF=mod/core.html#accessconfig + HREF=../mod/core.html#accessconfig CODEAccessConfig/CODE/A, A - HREF=mod/core.html#timeout + HREF=../mod/core.html#timeout CODETimeout/CODE/A, A - HREF=mod/core.html#keepalivetimeout + HREF=../mod/core.html#keepalivetimeout CODEKeepAliveTimeout/CODE/A, A - HREF=mod/core.html#keepalive + HREF=../mod/core.html#keepalive CODEKeepAlive/CODE/A, A - HREF=mod/core.html#maxkeepaliverequests + HREF=../mod/core.html#maxkeepaliverequests CODEMaxKeepAliveRequests/CODE/A, or A - HREF=mod/core.html#sendbuffersize + HREF=../mod/core.html#sendbuffersize CODESendBufferSize/CODE/A directive then the respective value is inherited from the main_server. (That is, inherited from whatever 1.5 +14 -14apache-1.3/htdocs/manual/vhosts/vhosts-in-depth.html Index: vhosts-in-depth.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/vhosts/vhosts-in-depth.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vhosts-in-depth.html 1998/05/20 14:22:47 1.4 +++ vhosts-in-depth.html 1998/08/19 06:16:58 1.5 @@ -29,23 +29,23 @@ outside of CODEVirtualHost/CODE sections. There are virtual servers, called EMvhosts/EM, which are defined by A - HREF=mod/core.html#virtualhost + HREF=../mod/core.html#virtualhost SAMPVirtualHost/SAMP/A sections. PThe directives A - HREF=mod/core.html#port + HREF=../mod/core.html#port SAMPPort/SAMP/A, A - HREF=mod/core.html#servername + HREF=../mod/core.html#servername SAMPServerName/SAMP/A, A - HREF=mod/core.html#serverpath + HREF=../mod/core.html#serverpath SAMPServerPath/SAMP/A, and A - HREF=mod/core.html#serveralias + HREF=../mod/core.html#serveralias SAMPServerAlias/SAMP/A can appear anywhere within the definition of a server. However, each appearance overrides the previous appearance @@ -57,7 +57,7 @@ PIn the absence of any A - HREF=mod/core.html#listen + HREF=../mod/core.html#listen SAMPListen/SAMP/A directives, the (final if there are multiple) CODEPort/CODE directive in the main_server indicates @@ -114,29 +114,29 @@ OL LIIf a vhost has no A - HREF=mod/core.html#serveradmin + HREF=../mod/core.html#serveradmin CODEServerAdmin/CODE/A, A - HREF=mod/core.html#resourceconfig + HREF=../mod/core.html#resourceconfig CODEResourceConfig/CODE/A, A - HREF=mod/core.html#accessconfig + HREF=../mod/core.html#accessconfig CODEAccessConfig/CODE/A, A - HREF=mod/core.html#timeout + HREF=../mod/core.html#timeout CODETimeout/CODE/A, A -
cvs commit: apache-site related_projects.html
rse 98/08/16 23:58:47 Modified:.related_projects.html Log: Add entry for mod_ssl. Revision ChangesPath 1.31 +26 -0 apache-site/related_projects.html Index: related_projects.html === RCS file: /export/home/cvs/apache-site/related_projects.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- related_projects.html 1998/07/14 08:27:42 1.30 +++ related_projects.html 1998/08/17 06:58:46 1.31 @@ -23,6 +23,7 @@ UL LIA HREF=#apachesslApache-SSL/A +LIA HREF=#modsslApache Interface to SSLeay (mod_ssl)/A LIA HREF=#moduleregApache Module Registry/A LIA HREF=#phpPHP Project/A LIA HREF=#modperlApache/Perl Integration Project/A @@ -61,6 +62,31 @@ free.P Inside the United States in order to use Apache with SSL commercially you may want to look at A HREF=#strongholdStronghold/A or A HREF=#ravenRaven/A. + +PHR + +H3A NAME=modssl HREF=http://www.engelschall.com/sw/mod_ssl/;Apache Interface to SSLeay (mod_ssl)/A/H3 + +This module provides strong cryptography for A +HREF=http://www.apache.org/;Apache/A via A +HREF=http://www.netscape.com/;Netscape/A's A +HREF=http://www.netscape.com/newsref/std/SSL.html;Secure Socket Layer/A +(SSL) through the free SSL implementation library A +HREF=http://www.ssleay.org/;SSLeay/A from A +HREF=mailto:[EMAIL PROTECTED]Eric A. Young/A and A +HREF=mailto:[EMAIL PROTECTED]Tim Hudson/A. The mod_ssl package was +created by A HREF=http://www.engelschall.com/;Ralf S. Engelschall/A and +is based in parts on the A HREF=http://www.apache-ssl.org/;Apache-SSL/A +package developed by A HREF=mailto:[EMAIL PROTECTED]Ben Laurie/A. + +P +The mod_ssl package is A +HREF=http://www.engelschall.com/sw/mod_ssl/distrib/;distributed/A as a +source extension and set of patches for the Apache 1.3 webserver from outside +the United States. Inside the United States you are able to use it for +non-commercial purposes for free if you use RSAREF (due to various patents). +Outside the United States you can use it for non-commercial and commercial +purposes for free. PHR H3A NAME=raven HREF=http://raven.covalent.net/;
cvs commit: apache-1.3/src/modules/standard mod_rewrite.h
rse 98/08/17 11:36:19 Modified:src CHANGES src/modules/standard mod_rewrite.h Log: Bump up MAX_ENV_FLAGS in mod_rewrite.h from the too conservatice limit of 5 to 10 because there are some users out there who always have 5 to 8 variables in one RewriteRule and had to patch mod_rewrite.h for every release. So 15 should be now more than enough, even for them. (I never needed more than 4 in my RewriteRules ;-) Revision ChangesPath 1.1029+7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1028 retrieving revision 1.1029 diff -u -r1.1028 -r1.1029 --- CHANGES 1998/08/16 20:51:53 1.1028 +++ CHANGES 1998/08/17 18:36:16 1.1029 @@ -1,5 +1,12 @@ Changes with Apache 1.3.2 + *) Bump up MAX_ENV_FLAGS in mod_rewrite.h from the too conservatice limit of + 5 to 10 because there are some users out there who always have 5 to 8 + variables in one RewriteRule and had to patch mod_rewrite.h for every + release. So 15 should be now more than enough, even for them. (I never + needed more than 4 in my RewriteRules ;-) + [Ralf S. Engelschall] + *) Make the proxy generate and understand Via: headers [Martin Kraemer] 1.57 +1 -1 apache-1.3/src/modules/standard/mod_rewrite.h Index: mod_rewrite.h === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- mod_rewrite.h 1998/07/23 11:34:01 1.56 +++ mod_rewrite.h 1998/08/17 18:36:18 1.57 @@ -236,7 +236,7 @@ #define LONG_STRING_LEN 2048 #endif -#define MAX_ENV_FLAGS 5 +#define MAX_ENV_FLAGS 15 #define MAX_NMATCH10
cvs commit: apache-1.3 configure
rse 98/08/15 08:02:46 Modified:src CHANGES .configure Log: Make sure the config.status file is not overridden when just ``configure --help'' is used. PR: 2844 Revision ChangesPath 1.1026+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1025 retrieving revision 1.1026 diff -u -r1.1025 -r1.1026 --- CHANGES 1998/08/14 03:00:15 1.1025 +++ CHANGES 1998/08/15 15:02:44 1.1026 @@ -1,5 +1,8 @@ Changes with Apache 1.3.2 + *) Make sure the config.status file is not overridden when just + ``configure --help'' is used. [Ralf S. Engelschall] PR#2844 + *) Split MODULE_MAGIC_NUMBER into _MAJOR/_MINOR numbers. This should provide a way to trace API changes that add functionality but do not create a compatibility issue for precompiled modules, etc. 1.43 +36 -33apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- configure 1998/07/28 17:26:45 1.42 +++ configure 1998/08/15 15:02:46 1.43 @@ -81,10 +81,11 @@ ## pre-determine runtime modes ## +help=no quiet=no verbose=no case $* in ---help|*--help|*--help* ) quiet=yes ;; +--help|*--help|*--help* ) help=yes; quiet=yes ;; --quiet|*--quiet|*--quiet* ) quiet=yes ;; --verbose|*--verbose|*--verbose*|-v|*-v|*-v* ) verbose=yes ;; * ) ;; @@ -267,40 +268,42 @@ # create a config status script for restoring # the configuration via a simple shell script -rm -f $configstatus 2/dev/null -echo #!/bin/sh $configstatus -echo ## $configstatus -echo ## $configstatus -- APACI auto-generated configuration restore script $configstatus -echo ## $configstatus -echo ## Use this shell script to re-run the APACI configure script for $configstatus -echo ## restoring your configuration. Additional parameters can be supplied. $configstatus -echo ## $configstatus -echo $configstatus -for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ - LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do -eval val=\\$$var\ -if [ .$val != . ]; then -echo $var=$val |\ -sed -e 's:\([$\\]\):\\\1:g' \ --e 's:\([A-Z]*=\):\1:' \ --e 's:$: \\:' $configstatus -fi -done -if [ $# -eq 0 ]; then -echo ./configure $configstatus -else -echo $SEO ./configure \\ $configstatus -for arg -do -echo $arg |\ -sed -e 's:\([$\\]\):\\\1:g' \ --e 's:^::' \ --e 's:$: \\:' $configstatus +if [ .$help = .no ]; then +rm -f $configstatus 2/dev/null +echo #!/bin/sh $configstatus +echo ## $configstatus +echo ## $configstatus -- APACI auto-generated configuration restore script $configstatus +echo ## $configstatus +echo ## Use this shell script to re-run the APACI configure script for $configstatus +echo ## restoring your configuration. Additional parameters can be supplied. $configstatus +echo ## $configstatus +echo $configstatus +for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ + LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do +eval val=\\$$var\ +if [ .$val != . ]; then +echo $var=$val |\ +sed -e 's:\([$\\]\):\\\1:g' \ +-e 's:\([A-Z]*=\):\1:' \ +-e 's:$: \\:' $configstatus +fi done +if [ $# -eq 0 ]; then +echo ./configure $configstatus +else +echo $SEO ./configure \\ $configstatus +for arg +do +echo $arg |\ +sed -e 's:\([$\\]\):\\\1:g' \ +-e 's:^::' \ +-e 's:$: \\:' $configstatus +done +fi +echo '$*' $configstatus +echo '' $configstatus +chmod a+x $configstatus fi -echo '$*' $configstatus -echo '' $configstatus -chmod a+x $configstatus ## ## parse argument line options
cvs commit: apache-1.3 Makefile.tmpl
rse 98/08/12 04:33:38 Modified:src CHANGES .Makefile.tmpl Log: Fix suexec installation under `make install root=xxx' situation. Revision ChangesPath 1.1022+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1021 retrieving revision 1.1022 diff -u -r1.1021 -r1.1022 --- CHANGES 1998/08/12 10:39:09 1.1021 +++ CHANGES 1998/08/12 11:33:35 1.1022 @@ -1,5 +1,8 @@ Changes with Apache 1.3.2 + *) Fix suexec installation under `make install root=xxx' situation. + [Ralf S. Engelschall] + *) Extend the output of the -V switch to include the paths of all compiled-in configuration files, if they were overridden at compile time, for least astonishment of the user. 1.45 +4 -4 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- Makefile.tmpl 1998/07/25 12:43:20 1.44 +++ Makefile.tmpl 1998/08/12 11:33:37 1.45 @@ -315,10 +315,10 @@ [EMAIL PROTECTED] [ .$(suexec) = .1 ]; then \ echo $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \ $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \ - echo chown root $(sbindir)/suexec; \ - chown root $(sbindir)/suexec; \ - echo chmod 4711 $(sbindir)/suexec; \ - chmod 4711 $(sbindir)/suexec; \ + echo chown root $(root)$(sbindir)/suexec; \ + chown root $(root)$(sbindir)/suexec; \ + echo chmod 4711 $(root)$(sbindir)/suexec; \ + chmod 4711 $(root)$(sbindir)/suexec; \ echo $(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \ $(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \ fi
cvs commit: apache-1.3 STATUS
rse 98/08/04 00:12:57 Modified:.STATUS Log: Ugly wheather here in Munich. Seems like another day for hacking... Revision ChangesPath 1.454 +0 -10 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.453 retrieving revision 1.454 diff -u -r1.453 -r1.454 --- STATUS1998/08/03 08:15:38 1.453 +++ STATUS1998/08/04 07:12:55 1.454 @@ -35,16 +35,6 @@ Message-ID: [EMAIL PROTECTED] Status: Ken +1 (on concept) -* [PATCH] Link DSO modules against possible libraries from $(LIBS) - In the configuration process we already determine the variable LDFLAGS - and LIBS. They hold -L and -l options for linking executables. We parse - these options and separate them into three classes: OBJ, PIC and DSO. - And then we re-assemble a LIBS_SHLIB variable from only the options in - classes PIC and DSO. This variable is then used on the build command for - mod_xxx.so. - Message-ID: [EMAIL PROTECTED] - Status: Ralf +1 - * Filenames containing whitespace characters caused problems for directives Bill Stoddard [EMAIL PROTECTED] Message-ID: [EMAIL PROTECTED]
cvs commit: apache-1.3/conf mime.types
rse 98/08/03 00:18:35 Modified:src CHANGES conf mime.types Log: Add correct `model' MIME types from RFC2077 to mime.types file. PR: 2732 Revision ChangesPath 1.995 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.994 retrieving revision 1.995 diff -u -r1.994 -r1.995 --- CHANGES 1998/08/02 11:18:24 1.994 +++ CHANGES 1998/08/03 07:18:30 1.995 @@ -1,5 +1,8 @@ Changes with Apache 1.3.2 + *) Add correct `model' MIME types from RFC2077 to mime.types file. + [Ralf S. Engelschall] PR#2732 + *) Fixed examples in mod_rewrite.html document. [Youichirou Koga [EMAIL PROTECTED], Ralf S. Engelschall] PR#2756 1.14 +5 -2 apache-1.3/conf/mime.types Index: mime.types === RCS file: /export/home/cvs/apache-1.3/conf/mime.types,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mime.types1998/07/19 07:10:03 1.13 +++ mime.types1998/08/03 07:18:33 1.14 @@ -2,7 +2,8 @@ # given file extensions. Sending the correct MIME type to the client # is important so they know how to handle the content of the file. # Extra types can either be added here or by using an AddType directive -# in your config files. +# in your config files. For more information about MIME types +# please read RFC 2045,2046,2047,2048,2077. # MIME type Extension application/activemessage @@ -85,6 +86,9 @@ message/news message/partial message/rfc822 +model/iges igs iges +model/vrml wrl vrml +model/mesh msh mesh silo multipart/alternative multipart/appledouble multipart/digest @@ -102,4 +106,3 @@ video/x-msvideo avi video/x-sgi-moviemovie x-conference/x-cooltalk ice -x-world/x-vrml wrl vrml
cvs commit: apache-1.3/src/main http_main.c
rse 98/08/03 00:34:04
Modified:src CHANGES
src/main http_main.c
Log:
Fix suEXEC start message: Has to be of `notice' level to really get
printed together with the standard startup message because the `notice'
level is handled special inside ap_log_error() for startup messages.
PR: 2761, 2761, 2765
Revision ChangesPath
1.996 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.995
retrieving revision 1.996
diff -u -r1.995 -r1.996
--- CHANGES 1998/08/03 07:18:30 1.995
+++ CHANGES 1998/08/03 07:34:01 1.996
@@ -1,5 +1,10 @@
Changes with Apache 1.3.2
+ *) Fix suEXEC start message: Has to be of `notice' level to really get
+ printed together with the standard startup message because the `notice'
+ level is handled special inside ap_log_error() for startup messages.
+ [Ralf S. Engelschall] PR#2761 PR#2761 PR#2765
+
*) Add correct `model' MIME types from RFC2077 to mime.types file.
[Ralf S. Engelschall] PR#2732
1.377 +3 -3 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.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- http_main.c 1998/08/02 04:43:17 1.376
+++ http_main.c 1998/08/03 07:34:03 1.377
@@ -4139,12 +4139,12 @@
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
%s configured -- resuming normal operations,
ap_get_server_version());
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf,
- Server built: %s, ap_get_server_built());
if (ap_suexec_enabled) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf,
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
suEXEC mechanism enabled (wrapper: %s), SUEXEC_BIN);
}
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf,
+ Server built: %s, ap_get_server_built());
restart_pending = shutdown_pending = 0;
while (!restart_pending !shutdown_pending) {
cvs commit: apache-1.3 STATUS
rse 98/08/03 01:15:38 Modified:.STATUS Log: The heaven is gray these days in Munich, Germany. Revision ChangesPath 1.453 +0 -10 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.452 retrieving revision 1.453 diff -u -r1.452 -r1.453 --- STATUS1998/08/02 00:10:29 1.452 +++ STATUS1998/08/03 08:15:38 1.453 @@ -49,16 +49,6 @@ Bill Stoddard [EMAIL PROTECTED] Message-ID: [EMAIL PROTECTED] -* PR#2483 reports that RewriteMap program still don't work under Win32 - because of a SIGSEGV. The reporter is right, ap_spawn_child_core() - calls the child function with NULL while in the child function the - file handles have to be available. I've assembled the above patch - from the reporters description/patch for testing by our Win32 folks. - (I cannot test it myself). - Ralf S. Engelschall [EMAIL PROTECTED] - Message-ID: [EMAIL PROTECTED] - Status: Ralf +1 - * Bill Stoddard's patch to make some structural changes to ap_call_exec to make it more readable and friendly to a couple of patches that will follow (capability to query the Win32 registry for interpreter name
cvs commit: apache-1.3/src/support htdigest.c rotatelogs.c
rse 98/08/03 02:15:35 Modified:src CHANGES Configure src/include ap_config.h httpd.h src/main alloc.c http_core.c http_log.c http_main.c http_protocol.c http_request.c util.c util_script.c src/modules/proxy proxy_cache.c src/modules/standard mod_cgi.c mod_include.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_rewrite.c mod_status.c mod_userdir.c src/support htdigest.c rotatelogs.c Removed: src/os/emx .cvsignore Makefile.tmpl os-inline.c os.c os.h util_os2.c Log: Renamed __EMX__ (internal define of the gcc port under OS/2) to OS2 following the same idea as MSVC vs WIN32. Additionally the src/os/emx/ directory was renamed to src/os/os2/ for consistency. Background information: 1. The src/os/os2/ stuff was created by a repository copy so we're both keep the history and sill be able to checkout older Apache releases. 2. The __EMX__ check in ap_config.h was replaced by a OS2 check while src/Configure now sets CFLAGS to -DOS ... Same is done for the Unix platforms, so make no difference here just for OS2. 3. The src/os/os2 is now also references from within src/Configure to reflect the change. Submitted by: Brian Havard Reviewed by: Martin Kraemer, Ralf S. Engelschall Finalized, cleaned up and applied by: Ralf S. Engelschall Revision ChangesPath 1.998 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.997 retrieving revision 1.998 diff -u -r1.997 -r1.998 --- CHANGES 1998/08/03 08:44:03 1.997 +++ CHANGES 1998/08/03 09:14:41 1.998 @@ -1,5 +1,10 @@ Changes with Apache 1.3.2 + *) Renamed __EMX__ (internal define of the gcc port under OS/2) to OS2 + following the same idea as MSVC vs WIN32. Additionally the src/os/emx/ + directory was renamed to src/os/os2/ for consistency. + [Brian Havard, Ralf S. Engelschall] + *) Add new Rule SHARED_CHAIN which can be used to enable linking of DSO files (here modules) against other DSO files (here shared libraries). This is done by determining a subset of LIBS which can be safely used for 1.282 +2 -2 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.281 retrieving revision 1.282 diff -u -r1.281 -r1.282 --- Configure 1998/08/03 08:44:04 1.281 +++ Configure 1998/08/03 09:14:44 1.282 @@ -342,10 +342,10 @@ DEF_WANTHSREGEX=yes ;; *OS/2*) - OSDIR=os/emx + OSDIR=os/os2 DEF_WANTHSREGEX=yes OS='EMX OS/2' - CFLAGS=$CFLAGS -Zbsd-signals -Zbin-files -DTCPIPV4 -g + CFLAGS=$CFLAGS -DOS2 -Zbsd-signals -Zbin-files -DTCPIPV4 -g LDFLAGS=$LDFLAGS -Zexe LIBS=$LIBS -lsocket -lufc -lbsd DBM_LIB=-lgdbm 1.230 +2 -2 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- ap_config.h 1998/07/21 15:03:06 1.229 +++ ap_config.h 1998/08/03 09:14:47 1.230 @@ -655,7 +655,7 @@ #define USE_MMAP_FILES #define HAVE_SYSLOG 1 -#elif defined(__EMX__) +#elif defined(OS2) /* Defines required for EMX OS/2 port. */ #define NO_KILLPG #define NEED_STRCASECMP @@ -907,7 +907,7 @@ #endif #endif #ifdef USE_MMAP_SCOREBOARD -#if !defined(__EMX__) !defined(WIN32) +#if !defined(OS2) !defined(WIN32) /* This file is not needed for OS/2 */ #include sys/mman.h #endif 1.229 +7 -7 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.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- httpd.h 1998/07/18 23:35:40 1.228 +++ httpd.h 1998/08/03 09:14:48 1.229 @@ -79,7 +79,7 @@ * file with a relative pathname will have this added. */ #ifndef HTTPD_ROOT -#ifdef __EMX__ +#ifdef OS2 /* Set default for OS/2 file system */ #define HTTPD_ROOT /os2httpd #elif defined(WIN32) @@ -94,7 +94,7 @@ * directive. */ #ifndef DOCUMENT_LOCATION -#ifdef __EMX__ +#ifdef OS2 /* Set default for OS/2 file system */ #define DOCUMENT_LOCATION HTTPD_ROOT /docs #else @@ -144,7 +144,7 @@ /* The name of the log files */ #ifndef
cvs commit: apache-1.3/src CHANGES
rse 98/08/03 02:36:05 Modified:src CHANGES Log: Ops, forgot this entry when I committed the mod_proxy.c fix Revision ChangesPath 1.999 +2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.998 retrieving revision 1.999 diff -u -r1.998 -r1.999 --- CHANGES 1998/08/03 09:14:41 1.998 +++ CHANGES 1998/08/03 09:36:03 1.999 @@ -1,5 +1,7 @@ Changes with Apache 1.3.2 + *) Clean up a warning in mod_proxy. [Ralf S. Engelschall] + *) Renamed __EMX__ (internal define of the gcc port under OS/2) to OS2 following the same idea as MSVC vs WIN32. Additionally the src/os/emx/ directory was renamed to src/os/os2/ for consistency.
cvs commit: apache-1.3/htdocs/manual/mod mod_rewrite.html
rse 98/08/02 04:18:26
Modified:src CHANGES
htdocs/manual/mod mod_rewrite.html
Log:
Fixed examples in mod_rewrite.html document.
PR: 2756
Revision ChangesPath
1.994 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -r1.993 -r1.994
--- CHANGES 1998/08/02 04:43:15 1.993
+++ CHANGES 1998/08/02 11:18:24 1.994
@@ -1,5 +1,8 @@
Changes with Apache 1.3.2
+ *) Fixed examples in mod_rewrite.html document.
+ [Youichirou Koga [EMAIL PROTECTED], Ralf S. Engelschall] PR#2756
+
*) Allow ap_read_request errors to propagate through the normal request
handling loop so that the connection can be properly closed with
lingering_close, thus avoiding a potential TCP reset that would
1.34 +4 -4 apache-1.3/htdocs/manual/mod/mod_rewrite.html
Index: mod_rewrite.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_rewrite.html 1998/07/25 12:16:37 1.33
+++ mod_rewrite.html 1998/08/02 11:18:26 1.34
@@ -660,7 +660,7 @@
P
TABLE BORDER=0 CELLSPACING=1 CELLPADDING=5 BGCOLOR=#F0F0F0
TRTDPRE
-RewriteMap real-to-host txt:/path/to/file/map.txt
+RewriteMap real-to-user txt:/path/to/file/map.txt
/PRE/TD/TR
/TABLE
@@ -1764,13 +1764,13 @@
/BLOCKQUOTE
P
We take the rewrite mapfile from above and save it under
-CODE/anywhere/map.real-to-user/CODE. Then we only have to add the
+CODE/path/to/file/map.txt/CODE. Then we only have to add the
following lines to the Apache server configuration file:
BLOCKQUOTE
PRE
-RewriteLog /anywhere/rewrite.log
-RewriteMap real-to-user txt:/anywhere/map.real-to-host
+RewriteLog /path/to/file/rewrite.log
+RewriteMap real-to-user txt:/path/to/file/map.txt
RewriteRule ^/([^/]+)/~([^/]+)/(.*)$ /u/${real-to-user:$2|nobody}/$3.$1
/PRE
/BLOCKQUOTE
cvs commit: apache-1.3 configure
rse 98/07/28 10:26:46
Modified:src CHANGES
.configure
Log:
One more portability fix for APACI shadow tree support: Swap order of awk and
sed in top-level configure script to avoid sed fails on some platforms (for
instance SunOS 4.1.3 and NCR SysV) because of the non-newline-termined output
of Awk.
PR: 2729
Revision ChangesPath
1.992 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.991
retrieving revision 1.992
diff -u -r1.991 -r1.992
--- CHANGES 1998/07/28 17:07:07 1.991
+++ CHANGES 1998/07/28 17:26:43 1.992
@@ -1,5 +1,10 @@
Changes with Apache 1.3.2
+ *) One more portability fix for APACI shadow tree support: Swap order of
awk
+ and sed in top-level configure script to avoid sed fails on some
+ platforms (for instance SunOS 4.1.3 and NCR SysV) because of the
+ non-newline-termined output of Awk. [Ralf S. Engelschall] PR#2729
+
*) PORT: NEC EWS4800 support.
[MATSUURA Takanori [EMAIL PROTECTED]]
1.42 +1 -1 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- configure 1998/07/27 14:39:22 1.41
+++ configure 1998/07/28 17:26:45 1.42
@@ -332,7 +332,7 @@
;;
--shadow)
# determine GNU platform triple
-gnutriple=`$aux/GuessOS | $AWK '{ printf(%s,$1); }' | sed -e
's:/:-:g'`
+gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | $AWK '{
printf(%s,$1); }'`
# create Makefile wrapper (the first time only)
if [ .`ls $top/src.* 2/dev/null` = . ]; then
if [ .$quiet = .no ]; then
cvs commit: apache-1.3 configure
rse 98/07/27 07:39:23
Modified:src CHANGES
.configure
Log:
Add workaround to top-level `configure' script for brain dead
`echo' commands which interpet escape sequences per default.
PR: 2654
Revision ChangesPath
1.988 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -r1.987 -r1.988
--- CHANGES 1998/07/25 12:43:18 1.987
+++ CHANGES 1998/07/27 14:39:20 1.988
@@ -1,5 +1,9 @@
Changes with Apache 1.3.2
+ *) Add workaround to top-level `configure' script for brain dead
+ `echo' commands which interpet escape sequences per default.
+ [Ralf S. Engelschall] PR#2654
+
*) Make sure that the path to the Perl interpreter is correctly
adjusted under `make install' also for the printenv CGI script.
[Ralf S. Engelschall] PR#2595
1.41 +32 -9 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- configure 1998/07/25 10:52:50 1.40
+++ configure 1998/07/27 14:39:22 1.41
@@ -124,6 +124,29 @@
fi
##
+## look for deadly broken echo commands which interpret escape
+## sequences `\XX' *per default*. For those we first try the -E option
+## and if it then is still broken we give a warning message.
+## If it works set the `Safe Echo Option' (SEO) variable.
+##
+
+SEO='' # CHANGE THIS VARIABLE HERE IF YOU HAVE PROBLEMS WITH ECHO!
+bytes=`echo $SEO '\1' | wc -c | awk '{ printf(%s, $1); }'`
+if [ .$bytes != .3 ]; then
+bytes=`echo -E '\1' | wc -c | awk '{ printf(%s, $1); }'`
+if [ .$bytes != .3 ]; then
+echo + Warning: Your 'echo' command is slightly broken.
+echo + It interprets escape sequences per default. We already
+echo + tried 'echo -E' but had no real success. If errors occur
+echo + please set the SEO variable in 'configure' manually to
+echo + the required 'echo' options, i.e. those which force your
+echo + 'echo' to not interpret escape sequences per default.
+else
+SEO='-E'
+fi
+fi
+
+##
## look for the best Awk we can find because some
## standard Awks are really braindead and cause
## problems for our scripts under some platforms.
@@ -266,7 +289,7 @@
if [ $# -eq 0 ]; then
echo ./configure $configstatus
else
-echo ./configure \\ $configstatus
+echo $SEO ./configure \\ $configstatus
for arg
do
echo $arg |\
@@ -968,10 +991,10 @@
if [ .$val != . ]; then
case $var in
CFLAGS|LDFLAGS|LIBS|INCLUDES|DEPS)
-echo s%^#*\\(EXTRA_$var=\\).*%\\1$val%g $sedsubst
+echo $SEO s%^#*\\(EXTRA_$var=\\).*%\\1$val%g $sedsubst
;;
*)
-echo s%^#*\\($var=\\).*%\\1$val%g $sedsubst
+echo $SEO s%^#*\\($var=\\).*%\\1$val%g $sedsubst
;;
esac
eval $var=\\; export $var
@@ -984,7 +1007,7 @@
for rule in $rules; do
name=`echo $rule | tr a-z A-Z`
eval val=\$rule_$rule
-echo s%^\\(Rule $name=\\).*%\\1$val%g $sedsubst
+echo $SEO s%^\\(Rule $name=\\).*%\\1$val%g $sedsubst
if [ $verbose = yes ]; then
echo + Rule $name=$val
fi
@@ -1020,17 +1043,17 @@
for module in $modules; do
eval add=\$module_$module
if [ $add = yes ]; then
-echo s%^.*\\(AddModule.*$module\\..*\\)%\\1%g $sedsubst
-echo s%^.*\\(SharedModule.*$module\\..*\\)%\\1%g $sedsubst
+echo $SEO s%^.*\\(AddModule.*$module\\..*\\)%\\1%g $sedsubst
+echo $SEO s%^.*\\(SharedModule.*$module\\..*\\)%\\1%g $sedsubst
m=yes [static]
else
-echo s%^.*\\(AddModule.*$module\\..*\\)%# \\1%g $sedsubst
-echo s%^.*\\(SharedModule.*$module\\..*\\)%# \\1%g $sedsubst
+echo $SEO s%^.*\\(AddModule.*$module\\..*\\)%# \\1%g $sedsubst
+echo $SEO s%^.*\\(SharedModule.*$module\\..*\\)%# \\1%g $sedsubst
m=no
fi
eval share=\$shared_$module
if [ $share = yes ]; then
-echo
s%^\\(.*\\)AddModule\\(.*$module\\.\\)[oa]\\(.*\\)%\\1SharedModule\\2so\\3%g
$sedsubst
+echo $SEO
s%^\\(.*\\)AddModule\\(.*$module\\.\\)[oa]\\(.*\\)%\\1SharedModule\\2so\\3%g
$sedsubst
m=yes [shared]
fi
if [ $verbose = yes ]; then
cvs commit: apache-1.3/src/main alloc.c
rse 98/07/27 07:58:20
Modified:src CHANGES
src/main alloc.c
Log:
Fix Win32 part of ap_spawn_child() by providing a reasonable child_info
structure instead of just NULL. This fixes at least the RewriteMap
programs under Win32.
Submitted by: Marco De Michele [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
PR: 2483
Revision ChangesPath
1.989 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.988
retrieving revision 1.989
diff -u -r1.988 -r1.989
--- CHANGES 1998/07/27 14:39:20 1.988
+++ CHANGES 1998/07/27 14:58:17 1.989
@@ -1,5 +1,9 @@
Changes with Apache 1.3.2
+ *) Fix Win32 part of ap_spawn_child() by providing a reasonable child_info
+ structure instead of just NULL. This fixes at least the RewriteMap
+ programs under Win32. [Marco De Michele [EMAIL PROTECTED]] PR#2483
+
*) Add workaround to top-level `configure' script for brain dead
`echo' commands which interpet escape sequences per default.
[Ralf S. Engelschall] PR#2654
1.97 +6 -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.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- alloc.c 1998/06/13 15:22:52 1.96
+++ alloc.c 1998/07/27 14:58:19 1.97
@@ -1850,6 +1850,7 @@
HANDLE thread_handle;
int hStdIn, hStdOut, hStdErr;
int old_priority;
+ child_info info;
(void) ap_acquire_mutex(spawn_mutex);
thread_handle = GetCurrentThread(); /* doesn't need to be closed */
@@ -1876,7 +1877,11 @@
close(err_fds[1]);
}
- pid = (*func) (data, NULL);
+ info.hPipeInputRead = GetStdHandle(STD_INPUT_HANDLE);
+ info.hPipeOutputWrite = GetStdHandle(STD_OUTPUT_HANDLE);
+ info.hPipeErrorWrite = GetStdHandle(STD_ERROR_HANDLE);
+
+ pid = (*func) (data, info);
if (pid == -1) pid = 0; /* map Win32 error code onto Unix default
*/
if (!pid) {
cvs commit: apache-1.3 STATUS
rse 98/07/25 01:26:15 Modified:.STATUS Log: Sunny Saturday morning... Revision ChangesPath 1.449 +4 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.448 retrieving revision 1.449 diff -u -r1.448 -r1.449 --- STATUS1998/07/22 13:25:53 1.448 +++ STATUS1998/07/25 08:26:14 1.449 @@ -4,7 +4,7 @@ 1.3.2: In development. -1.3.1: Tagged and rolled on July 19. Still not announced and released. +1.3.1: Tagged and rolled on July 19. Announced and released. 1.3.0: Tagged and rolled on June 1. Announced and Released on the 6th. @@ -22,6 +22,9 @@ * Need a document explaining mod_rewrite/UseCanonicalName off based virtualhosting. (If it exists already I can't find it easily.) + = It still doesn't exists but I've already assembled the relevant + information and config snippets. We just have to write a vhost-xxx.html + document out of it. -- rse Available Patches:
cvs commit: apache-1.3/src CHANGES Makefile.tmpl
rse 98/07/25 04:30:19 Modified:src CHANGES Makefile.tmpl Log: Fix `distclean' and `clean' targets in src/Makefile.tmpl to have same behavior and to cleanup correctly even under enabled SHARED_CORE rule. Revision ChangesPath 1.984 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.983 retrieving revision 1.984 diff -u -r1.983 -r1.984 --- CHANGES 1998/07/25 11:25:02 1.983 +++ CHANGES 1998/07/25 11:30:17 1.984 @@ -1,4 +1,8 @@ Changes with Apache 1.3.2 + + *) Fix `distclean' and `clean' targets in src/Makefile.tmpl to have same + behavior and to cleanup correctly even under enabled SHARED_CORE rule. + [Ralf S. Engelschall] *) Use a more straight forward and thus less problematic Sed command in src/helper/mkdir.sh script. [Ralf S. Engelschall] 1.103 +2 -2 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- Makefile.tmpl 1998/07/20 16:27:58 1.102 +++ Makefile.tmpl 1998/07/25 11:30:18 1.103 @@ -66,7 +66,7 @@ echo === $(SDP)support clean: - rm -f $(TARGET) libhttpd.* *.o + -rm -f $(TARGET) libhttpd.* *.o @for i in $(SUBDIRS); do \ echo === $(SDP)$$i; \ ( cd $$i $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' $@ ) || exit 1; \ @@ -74,7 +74,7 @@ done distclean: - -rm -f $(TARGET) *.o + -rm -f $(TARGET) libhttpd.* *.o @for i in $(SUBDIRS); do \ echo === $(SDP)$$i; \ ( cd $$i $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' $@ ) || exit 1; \
cvs commit: apache-1.3 Makefile.tmpl
rse 98/07/25 04:56:31
Modified:src CHANGES
.Makefile.tmpl
Log:
Fix `install-includes' sub-target of `install' target in top-level
Makefile.tmpl: The umask+cp approach didn't work as expected (especially for
users which extracted the distribution under 'umask 077'), so replace it by an
explicit cp+chmod approach.
Submitted by: Richard Lloyd, Curt Sampson
Reviewed and fixed by: Ralf S. Engelschall
PR: 2656, 2626
Revision ChangesPath
1.985 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -r1.984 -r1.985
--- CHANGES 1998/07/25 11:30:17 1.984
+++ CHANGES 1998/07/25 11:56:28 1.985
@@ -1,4 +1,10 @@
Changes with Apache 1.3.2
+
+ *) Fix `install-includes' sub-target of `install' target in top-level
+ Makefile.tmpl: The umask+cp approach didn't work as expected (especially
+ for users which extracted the distribution under 'umask 077'), so
replace
+ it by an explicit cp+chmod approach.
+ [Richard Lloyd, Curt Sampson, Ralf S. Engelschall] PR#2656 PR#2626
*) Fix `distclean' and `clean' targets in src/Makefile.tmpl to have same
behavior and to cleanup correctly even under enabled SHARED_CORE rule.
1.43 +4 -4 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile.tmpl 1998/07/15 17:03:25 1.42
+++ Makefile.tmpl 1998/07/25 11:56:30 1.43
@@ -80,7 +80,6 @@
LN = ln
RM = rm -f
TAR = tar
-UMASK = umask
MKDIR = $(TOP)/$(AUX)/mkdir.sh
INSTALL = $(TOP)/$(AUX)/install.sh -c
INSTALL_PROGRAM = $(INSTALL) -s -m 755
@@ -328,10 +327,11 @@
# install the Apache C header files
install-include:
@echo === [include: Installing Apache C header files]
- $(UMASK) 022; $(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/
+ $(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/
@osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e
's:^OSDIR=.*/os:os:'`; \
- echo $(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h
$(root)$(includedir)/; \
- $(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/
+ echo $(CP) $(TOP)/$(SRC)/$${osdir}/os.h
$(root)$(includedir)/; \
+ $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/
+ chmod 644 $(root)$(includedir)/*.h
@echo === [include]
# create an initial document root containing the Apache manual,
cvs commit: apache-1.3/htdocs/manual/mod mod_rewrite.html
rse 98/07/25 05:16:38 Modified:src CHANGES htdocs/manual/mod mod_rewrite.html Log: Update the mod_rewrite.html document to correctly reflect the situation of the `proxy' (`[P]') feature. PR: 2679 Revision ChangesPath 1.986 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.985 retrieving revision 1.986 diff -u -r1.985 -r1.986 --- CHANGES 1998/07/25 11:56:28 1.985 +++ CHANGES 1998/07/25 12:16:35 1.986 @@ -1,4 +1,7 @@ Changes with Apache 1.3.2 + + *) Update the mod_rewrite.html document to correctly reflect the situation + of the `proxy' (`[P]') feature. [Ralf S. Engelschall] PR#2679 *) Fix `install-includes' sub-target of `install' target in top-level Makefile.tmpl: The umask+cp approach didn't work as expected (especially 1.33 +13 -11apache-1.3/htdocs/manual/mod/mod_rewrite.html Index: mod_rewrite.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- mod_rewrite.html 1998/06/22 09:48:38 1.32 +++ mod_rewrite.html 1998/07/25 12:16:37 1.33 @@ -1493,18 +1493,20 @@ LI'STRONGCODEproxy|P/CODE/STRONG' (force STRONGp/STRONGroxy)BR This flag forces the substitution part to be internally forced as a proxy request and immediately (i.e. rewriting rule processing stops here) put -through the proxy module. You have to make sure that the substitution -string is a valid URI (e.g. typically CODEhttp:///CODE) which can -be handled by the Apache proxy module. If not you get an error from -the proxy module. Use this flag to achieve a more powerful implementation -of the CODEmod_proxy/CODE directive CODEProxyPass/CODE, to map -some remote stuff into the namespace of the local server. +through the A HREF=mod_proxy.htmlproxy module/A. You have to make +sure that the substitution string is a valid URI (e.g. typically starting +with CODEhttp:///CODEEMhostname/EM) which can be handled by the +Apache proxy module. If not you get an error from the proxy module. Use +this flag to achieve a more powerful implementation of the A +HREF=mod_proxy.html#proxypassProxyPass/A directive, to map some +remote stuff into the namespace of the local server. P -Notice: STRONGYou really have to put CODEProxyRequests On/CODE into your -server configuration to prevent proxy requests from leading to core-dumps -inside the Apache kernel. If you have not compiled in the proxy module, -then there is no core-dump problem, because mod_rewrite checks for -existence of the proxy module and if lost forbids proxy URLs. /STRONG +Notice: To use this functionality make sure you have the proxy module +compiled into your Apache server program. If you don't know please check +whether CODEmod_proxy.c/CODE is part of the ``CODEhttpd -l/CODE'' +output. If yes, this functionality is available to mod_rewrite. If not, +then you first have to rebuild the ``CODEhttpd/CODE'' program with +mod_proxy enabled. P LI'STRONGCODElast|L/CODE/STRONG' (STRONGl/STRONGast rule)BR Stop the rewriting process here and
cvs commit: apache-1.3 Makefile.tmpl
rse 98/07/25 05:43:21
Modified:src CHANGES
.Makefile.tmpl
Log:
Make sure that the path to the Perl interpreter is correctly
adjusted under `make install' also for the printenv CGI script.
NOTICE: I still used INSTALL_DATA instead of INSTALL_SCRIPT because some of us
still thing we should install even these trivial shell scripts without execute
permissions. Even when we also have CGI's disabled in the default config.
What's the latest state? Should we change INSTALL_DATA to INSTALL_SCRIPT or is
double-paranoia really necessary?
PR: 2595
Revision ChangesPath
1.987 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -r1.986 -r1.987
--- CHANGES 1998/07/25 12:16:35 1.986
+++ CHANGES 1998/07/25 12:43:18 1.987
@@ -1,4 +1,8 @@
Changes with Apache 1.3.2
+
+ *) Make sure that the path to the Perl interpreter is correctly
+ adjusted under `make install' also for the printenv CGI script.
+ [Ralf S. Engelschall] PR#2595
*) Update the mod_rewrite.html document to correctly reflect the situation
of the `proxy' (`[P]') feature. [Ralf S. Engelschall] PR#2679
1.44 +7 -5 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile.tmpl 1998/07/25 11:56:30 1.43
+++ Makefile.tmpl 1998/07/25 12:43:20 1.44
@@ -350,11 +350,13 @@
[EMAIL PROTECTED] [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
echo [PRESERVING EXISTING DATA SUBDIR:
$(root)$(datadir)/cgi-bin/]; \
else \
- echo Copying tree $(TOP)/cgi-bin/ -
$(root)$(datadir)/cgi-bin/; \
- (cd $(TOP)/cgi-bin/ $(TAR) cf - *) |\
- (cd $(root)$(datadir)/cgi-bin/ $(TAR) xf -); \
- find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
; \
- find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ;
\
+ for script in printenv test-cgi; do \
+ cat $(TOP)/cgi-bin/$${script} |\
+ sed -e 's;^#!/.*perl;#!$(PERL);' \
+ $(TOP)/$(SRC)/.apaci.install.tmp; \
+ echo $(INSTALL_DATA) $(TOP)/conf/$${script}[*]
$(root)$(datadir)/cgi-bin/$${script}; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp
$(root)$(datadir)/cgi-bin/$${script}; \
+ done; \
fi
@echo Copying tree $(TOP)/icons/ - $(root)$(datadir)/icons/; \
(cd $(TOP)/icons/ $(TAR) cf - *) |\
cvs commit: apache-1.3 STATUS
rse 98/07/25 06:33:52 Modified:.STATUS Log: Don't let us forgot a problem with DSO + NetBSD. Revision ChangesPath 1.450 +20 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.449 retrieving revision 1.450 diff -u -r1.449 -r1.450 --- STATUS1998/07/25 08:26:14 1.449 +++ STATUS1998/07/25 13:33:51 1.450 @@ -166,6 +166,26 @@ Open issues: +* Underscores on symbols in DSO situation is broken for NetBSD: + Here is a private conversation between me (rse) and Charles Hannum of + the NetBSD project: + + From: Charles M. Hannum [EMAIL PROTECTED] + We have a bug report at the Apache BugDB (see + http://bugs.apache.org/private/index/full/2462) where a user says + under a particular NetBSD platform (NetBSD/pmax 1.3.2) the symbols on + dlsym() don't need an underscore. In FreeBSD world we always had the + underscore, + [...] + This is less an issue of OS, and more an issue of a.out vs. ELF. The + underscores are always used for a.out, and are never used for ELF. + Therefore, on any platform where we use ELF (that would be Alpha, MIPS, + PowerPC and UltraSPARC currently, although there are plans to eventually + switch on other platforms), the underscores should not be added, and on + all other platforms they should be. + You can differentiate by comparing the output of `uname -m' with any + of: alpha bebox macppc newsmips ofppc pica pmax sparc64. + * How should an Apache binary release tarball look? NOTE: This should be resolved before 1.3.1 !!
cvs commit: apache-1.3/src CHANGES Configuration.tmpl
rse 98/07/23 06:57:52 Modified:src CHANGES Configuration.tmpl Log: Fix document name for dso.html Revision ChangesPath 1.979 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.978 retrieving revision 1.979 diff -u -r1.978 -r1.979 --- CHANGES 1998/07/23 13:45:42 1.978 +++ CHANGES 1998/07/23 13:57:50 1.979 @@ -1,5 +1,8 @@ Changes with Apache 1.3.2 + *) Fix document hyperlink for dso.html in src/Configuration.tmpl + [Ralf S. Engelschall] PR#2674 + *) Modify mod_rewrite to update the Vary response field if it Does Anything based upon request fields. [Ken Coar] PR#1644 1.107 +1 -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.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- Configuration.tmpl1998/07/11 16:44:33 1.106 +++ Configuration.tmpl1998/07/23 13:57:51 1.107 @@ -72,8 +72,7 @@ # knowledge on how to compile these DSO files because this is # heavily platform-dependent. The current state of supported and # explicitly unsupported platforms can be found in the file -# htdocs/manual/sharedobjects.html, under -# Supported Platforms. +# htdocs/manual/dso.html, 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()
cvs commit: apache-1.3/src CHANGES
rse 98/07/23 10:31:27 Modified:src CHANGES Log: Do some litte adjustments to let Marc agree to it ;-) Revision ChangesPath 1.980 +4 -3 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.979 retrieving revision 1.980 diff -u -r1.979 -r1.980 --- CHANGES 1998/07/23 13:57:50 1.979 +++ CHANGES 1998/07/23 17:31:24 1.980 @@ -1,10 +1,11 @@ Changes with Apache 1.3.2 *) Fix document hyperlink for dso.html in src/Configuration.tmpl - [Ralf S. Engelschall] PR#2674 + [Knut A.Syed [EMAIL PROTECTED]] PR#2674 - *) Modify mod_rewrite to update the Vary response field if it Does - Anything based upon request fields. [Ken Coar] PR#1644 + *) Modify mod_rewrite to update the Vary response field if the URL rewriting + engine does any manipulations or decisions based upon request fields. + [Ken Coar] PR#1644 *) Document the special APACI behavior for installation paths where ``/apache'' is appended to paths under some (well defined, of course)
cvs commit: apache-1.3/src CHANGES
rse 98/07/22 06:20:53 Modified:.INSTALL src CHANGES Log: Document the special APACI behavior for installation paths where ``/apache'' is appended to paths under some (well defined, of course) situations to prevent pollution of system locations with Apache files. PR: 2660 Revision ChangesPath 1.37 +17 -0 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- INSTALL 1998/07/08 11:09:34 1.36 +++ INSTALL 1998/07/22 13:20:50 1.37 @@ -196,6 +196,23 @@ localstatedir=PREFIX/var, runtimedir=PREFIX/var/run, logfiledir=PREFIX/var/log and proxycachedir=PREFIX/var/proxy. + Note: To reduce the pollution of shared installation locations + (like /usr/local/ or /etc) with Apache files to a minimum the + string ``/apache'' is automatically appended to 'libexecdir', + 'sysconfdir', 'datadir', 'localstatedir' and 'includedir' if + (and only if) the following points apply for each path + individually: + + 1. the path doesn't already contain the word ``apache'' + 2. the path was not directly customized by the user + + Keep in mind that per default these paths are derived from + 'prefix' and 'exec-prefix', so usually its only a matter + whether these paths contain ``apache'' or not. Although the + defaults were defined with experience in mind you always should + make sure the paths fit your situation by checking the finally + chosen paths via the --layout option. + Use the --compat option to install Apache into a installation tree which has a similar layout than the one used with Apache 1.2. 1.977 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.976 retrieving revision 1.977 diff -u -r1.976 -r1.977 --- CHANGES 1998/07/22 05:48:19 1.976 +++ CHANGES 1998/07/22 13:20:51 1.977 @@ -1,5 +1,10 @@ Changes with Apache 1.3.2 + *) Document the special APACI behavior for installation paths where + ``/apache'' is appended to paths under some (well defined, of course) + situations to prevent pollution of system locations with Apache files. + [Ralf S. Engelschall] PR#2660 + *) Fixed problem with buffered response message not being sent for the read_request error conditions of URI-too-long (414) and malformed header fields (400). [Roy Fielding] PR#2646
cvs commit: apache-1.3 STATUS
rse 98/07/22 06:25:54 Modified:.STATUS Log: update Revision ChangesPath 1.448 +3 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.447 retrieving revision 1.448 diff -u -r1.447 -r1.448 --- STATUS1998/07/22 04:00:46 1.447 +++ STATUS1998/07/22 13:25:53 1.448 @@ -2,9 +2,9 @@ Release: -1.3.1: In development. Hopeful for rolling tarball on Monday - evening, with release a day or two later. This depends on -Win32 working and being ready. +1.3.2: In development. + +1.3.1: Tagged and rolled on July 19. Still not announced and released. 1.3.0: Tagged and rolled on June 1. Announced and Released on the 6th.
cvs commit: apache-1.3/src CHANGES Configure
rse 98/07/21 03:20:27 Modified:src CHANGES Configure Log: Fix SHARED_CORE rule: The CFLAGS_SHLIB variable is no longer doubled (compilers complained) and the .so.V.R.P filename extension was adjusted to correctly reflect the 1.3.2 version. PR: 2644 Revision ChangesPath 1.974 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.973 retrieving revision 1.974 diff -u -r1.973 -r1.974 --- CHANGES 1998/07/20 16:40:37 1.973 +++ CHANGES 1998/07/21 10:20:24 1.974 @@ -1,5 +1,10 @@ Changes with Apache 1.3.2 + *) Fix SHARED_CORE rule: The CFLAGS_SHLIB variable is no longer doubled + (compilers complained) and the .so.V.R.P filename extension was adjusted + to correctly reflect the 1.3.2 version. + [Ralf S. Engelschall] PR#2644 + *) SECURITY: Plug ... and other canonicalization holes under OS/2. [Brian Havard] 1.280 +21 -21apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- Configure 1998/07/18 10:51:52 1.279 +++ Configure 1998/07/21 10:20:25 1.280 @@ -1057,25 +1057,6 @@ fi -## Set the value of the shared libary flags, if they aren't explicitly -## set in the configuration file -## -if [ x$using_shlib = x1 ] ; then -if [ x$TCFLAGS_SHLIB = x ]; then -echo CFLAGS_SHLIB=$CFLAGS_SHLIB -DSHARED_MODULE Makefile.config -fi -if [ x$TLD_SHLIB = x ]; then -echo LD_SHLIB=$LD_SHLIB Makefile.config -fi -if [ x$TLDFLAGS_SHLIB = x ]; then -echo LDFLAGS_SHLIB=$LDFLAGS_SHLIB Makefile.config -fi -if [ x$TLDFLAGS_SHLIB_EXPORT = x ]; then -echo LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT Makefile.config -fi -fi - - ## Now we do some OS specific adjustments... for some OSs, we need ## to adjust CFLAGS and/or OPTIM depending on which compiler we ## are going to use. This is easy, since this can be gleamed from @@ -1401,7 +1382,7 @@ RULE_SHARED_CORE=$DEF_SHARED_CORE fi if [ .$RULE_SHARED_CORE = .yes ]; then -echo + enabling generation of Apache core as DSO +echo + enabling generation of Apache core as DSO #shuffle compiler flags from shlib variant to standard CFLAGS=$CFLAGS $CFLAGS_SHLIB CFLAGS_SHLIB= @@ -1410,7 +1391,7 @@ #select the special subtarget for shared core generation SUBTARGET=target_shared #determine additional suffixes for libhttpd.so -V=1 R=3 P=0 +V=1 R=3 P=2 if [ .$SHLIB_SUFFIX_DEPTH = .0 ]; then SHLIB_SUFFIX_LIST= fi @@ -1426,6 +1407,25 @@ if [ .$SHLIB_SUFFIX_DEPTH = .all ]; then SHLIB_SUFFIX_LIST=$V $V.$R $V.$R.$P fi +fi +fi + + +## Set the value of the shared libary flags, if they aren't explicitly +## set in the configuration file +## +if [ x$using_shlib = x1 ] ; then +if [ x$TCFLAGS_SHLIB = x ]; then +echo CFLAGS_SHLIB=$CFLAGS_SHLIB -DSHARED_MODULE Makefile.config +fi +if [ x$TLD_SHLIB = x ]; then +echo LD_SHLIB=$LD_SHLIB Makefile.config +fi +if [ x$TLDFLAGS_SHLIB = x ]; then +echo LDFLAGS_SHLIB=$LDFLAGS_SHLIB Makefile.config +fi +if [ x$TLDFLAGS_SHLIB_EXPORT = x ]; then +echo LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT Makefile.config fi fi
cvs commit: apache-devsite how-to-release.html
rse 98/07/21 03:28:45 Modified:.how-to-release.html Log: Make sure the V.R.P triple for SHARED_CORE is correct when releasing. Revision ChangesPath 1.42 +7 -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.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- how-to-release.html 1998/06/07 01:49:58 1.41 +++ how-to-release.html 1998/07/21 10:28:43 1.42 @@ -135,9 +135,15 @@ ``CODE1XXYYZZ/CODE'' to ``CODE1XXYYSTRONG99/STRONG/CODE''. The format is something like CODEprintf(%d%02d%02d%02d, major, minor, bugfix, - betaseq)/CODE.BR + betaseq)/CODE. Additionally make sure the Configure scripts version + knowledge for the CODESHARED_CORE/CODE reflects the correct + version.revision.patchlevel triple. Look for the line ``CODEV=1 R=3 + P=2/CODE'' inside CODEsrc/Configure/CODE and adjust it accordingly. + BR CODESTRONG$ vi src/include/httpd.h/STRONG/CODEBR CODESTRONG$ cvs commit src/include/httpd.h/STRONG/CODE + CODESTRONG$ vi src/Configure/STRONG/CODEBR + CODESTRONG$ cvs commit src/Configure/STRONG/CODE P If the release is going from beta to non-beta, or non-beta to a beta, also update the Windows registry key release. See
Re: cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
In article [EMAIL PROTECTED] you wrote: Beachtet dieser Patch die ExecCGI option? Oder kann man die damit unterlaufen? No, ExecCGI is still needed. And BTW, this is not a new feature, the [T=xxx] option exists for years. And it always was used this way. All I changed this time was to remove the inconsistency with the - pseudo-substitution URL (which means no subst). Nothing else. In the past one has to rewrite the URL to whatever and the whatever back to the URL to achieve this effect because - didn't honor the MIME-type stuff. So, no new features or new bugs, just one inconsistency less. Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com
cvs commit: apache-1.3/src/helpers fp2rp
rse 98/03/19 23:23:42 Modified:src/helpers fp2rp Log: Make this script a little bit faster and fix a bug which could cause problems in the future when perhaps deeper subdirs exist. Submitted by: Martin Kraemer Revision ChangesPath 1.3 +2 -2 apache-1.3/src/helpers/fp2rp Index: fp2rp === RCS file: /export/home/cvs/apache-1.3/src/helpers/fp2rp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fp2rp 1998/03/17 16:15:58 1.2 +++ fp2rp 1998/03/20 07:23:42 1.3 @@ -6,8 +6,8 @@ rp=. else rp= -for pe in `echo $1 | sed -e 's:/: :'`; do - rp=../$rp +for pe in `IFS=$IFS/; echo $1`; do +rp=../$rp done fi echo $rp | sed -e 's:/$::'
cvs commit: apache-1.3/src CHANGES
rse 98/03/19 23:29:51 Modified:.STATUS src CHANGES Log: Munich/Germany: snow is falling again... Revision ChangesPath 1.198 +2 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- STATUS1998/03/19 10:05:37 1.197 +++ STATUS1998/03/20 07:29:48 1.198 @@ -97,6 +97,8 @@ * Ken's change HIDE default to yes, always include hide.h * Ralf's major Configure cleanup * Ralf's additional manual pages for the support programs +* Ben Hyde's Configure check for unknown command switch +* Martin's fix for src/helpers/fp2rp Available Patches: 1.724 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.723 retrieving revision 1.724 diff -u -r1.723 -r1.724 --- CHANGES 1998/03/19 20:02:01 1.723 +++ CHANGES 1998/03/20 07:29:49 1.724 @@ -1,4 +1,7 @@ Changes with Apache 1.3b6 + + *) Fix a bug in the src/helpers/fp2rp script and make it a little bit + faster [Martin Kraemer] *) Make Configure die when you give it an unknown command switch. [Ben Hyde]
cvs commit: apache-1.3/src/modules/proxy mod_proxy.c proxy_ftp.c proxy_http.c
rse 98/03/19 23:56:57 Modified:.STATUS htdocs/manual new_features_1_3.html htdocs/manual/mod mod_proxy.html src CHANGES src/modules/proxy mod_proxy.c proxy_ftp.c proxy_http.c Log: Reanimation of an undocumented feature of mod_proxy: ProxyReceiveBufferSize Submitted by: Ralf S. Engelschall PR#: 1348 Revision ChangesPath 1.199 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- STATUS1998/03/20 07:29:48 1.198 +++ STATUS1998/03/20 07:56:47 1.199 @@ -99,6 +99,7 @@ * Ralf's additional manual pages for the support programs * Ben Hyde's Configure check for unknown command switch * Martin's fix for src/helpers/fp2rp +* Ralf's reanimation of an undocumented directive: ProxyReceiveBufferSize Available Patches: 1.50 +2 -2 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.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- new_features_1_3.html 1998/03/10 01:35:52 1.49 +++ new_features_1_3.html 1998/03/20 07:56:48 1.50 @@ -281,8 +281,8 @@ LIThe critical path for static requests has fewer system calls. This generally helps all requests. (45 syscalls for a static request in 1.2 versus 22 in 1.3 in a well tuned configuration). -LIA HREF=mod/mod_proxy.html#receivebuffersize -SAMPReceiveBufferSize/SAMP/A +LIA HREF=mod/mod_proxy.html#proxyreceivebuffersize +SAMPProxyReceiveBufferSize/SAMP/A directive gives CODEmod_proxy/CODE's outgoing connections larger network buffers, for increased throughput. LIThe low level I/O routines use CODEwritev/CODE (where available) 1.37 +46 -0 apache-1.3/htdocs/manual/mod/mod_proxy.html Index: mod_proxy.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_proxy.html,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- mod_proxy.html1998/03/04 08:53:52 1.36 +++ mod_proxy.html1998/03/20 07:56:49 1.37 @@ -45,6 +45,7 @@ LIA HREF=#proxypassProxyPass/A LIA HREF=#proxypassreverseProxyPassReverse/A LIA HREF=#proxyblockProxyBlock/A +LIA HREF=#proxyreceivebuffersizeProxyReceiveBufferSize/A LIA HREF=#noproxyNoProxy/A LIA HREF=#proxydomainProxyDomain/A LIA HREF=#cacherootCacheRoot/A @@ -318,6 +319,51 @@ /PRE blocks connections to all sites. + +HR + +H2A NAME=proxyreceivebuffersizeProxyReceiveBufferSize/A/H2 +A + HREF=directive-dict.html#Syntax + REL=Help +STRONGSyntax:/STRONG/A ProxyReceiveBufferSize EMlt;bytesgt;/EMBR +A + HREF=directive-dict.html#Default + REL=Help +STRONGDefault:/STRONG/A EMNone/EMBR +A + HREF=directive-dict.html#Context + REL=Help +STRONGContext:/STRONG/A server config, virtual hostBR +A + HREF=directive-dict.html#Override + REL=Help +STRONGOverride:/STRONG/A EMNot applicable/EMBR +A + HREF=directive-dict.html#Status + REL=Help +STRONGStatus:/STRONG/A BaseBR +A + HREF=directive-dict.html#Module + REL=Help +STRONGModule:/STRONG/A mod_proxyBR +A + HREF=directive-dict.html#Compatibility + REL=Help +STRONGCompatibility:/STRONG/A ProxyReceiveBufferSize is only available in +Apache 1.3 and later.P + +The ProxyReceiveBufferSize directive specifies an explicit network buffer size +for outgoing HTTP and FTP connections, for increased throughput. It has to be +greater then 512 or set to 0 to indicate that the systems default buffer size +should be used. + +P +Example: + +PRE + ProxyReceiveBufferSize 2048 +/PRE HR 1.725 +6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.724 retrieving revision 1.725 diff -u -r1.724 -r1.725 --- CHANGES 1998/03/20 07:29:49 1.724 +++ CHANGES 1998/03/20 07:56:51 1.725 @@ -1,5 +1,11 @@ Changes with Apache 1.3b6 + *) Reanimated the (still undocumented) proxy receive buffer size directive: + Renamed from ReceiveBufferSize to ProxyReceiveBufferSize because the old + name was really too generic, added documentation for this directive to + the mod_proxy.html and corrected the hyperlink to it in the + new_features_1.3.html document. [Ralf S. Engelschall, PR
cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c
rse 98/03/20 01:11:15
Modified:.STATUS
src CHANGES
src/modules/proxy proxy_ftp.c
Log:
The proxy module now uses the already determined response of
the FTP SITE command to provide a Content-Length header for FTP requests.
Submitted by: Ralf S. Engelschall
PR#: 1183
Revision ChangesPath
1.200 +2 -1 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- STATUS1998/03/20 07:56:47 1.199
+++ STATUS1998/03/20 09:11:06 1.200
@@ -99,7 +99,8 @@
* Ralf's additional manual pages for the support programs
* Ben Hyde's Configure check for unknown command switch
* Martin's fix for src/helpers/fp2rp
-* Ralf's reanimation of an undocumented directive: ProxyReceiveBufferSize
+* Ralf's reanim. of (undocumented) directive: ProxyReceiveBufferSize,
PR#1348
+* Ralf's mod_proxy fix to use FTP SIZE response for Content-Length,
PR#1183
Available Patches:
1.726 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.725
retrieving revision 1.726
diff -u -r1.725 -r1.726
--- CHANGES 1998/03/20 07:56:51 1.725
+++ CHANGES 1998/03/20 09:11:12 1.726
@@ -1,5 +1,9 @@
Changes with Apache 1.3b6
+ *) Now mod_proxy uses the reponse string (in addition to the response
status
+ code) from the already used FTP SIZE command to setup the Content-Length
+ header if available. [Ralf S. Engelschall, PR#1183]
+
*) Reanimated the (still undocumented) proxy receive buffer size directive:
Renamed from ReceiveBufferSize to ProxyReceiveBufferSize because the old
name was really too generic, added documentation for this directive to
1.52 +59 -2 apache-1.3/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- proxy_ftp.c 1998/03/20 07:56:55 1.51
+++ proxy_ftp.c 1998/03/20 09:11:14 1.52
@@ -213,6 +213,47 @@
return status;
}
+/*
+ * Like ftp_getrc but returns both the ftp status code and
+ * remembers the response message in the supplied buffer
+ */
+static int ftp_getrc_msg(BUFF *f, char *msgbuf, int msglen)
+{
+int len, status;
+char linebuff[100], buff[5];
+char *mb = msgbuf;
+int ml = msglen;
+
+len = bgets(linebuff, 100, f);
+if (len == -1)
+ return -1;
+if (len 5 || !isdigit(linebuff[0]) || !isdigit(linebuff[1]) ||
+ !isdigit(linebuff[2]) || (linebuff[3] != ' ' linebuff[3] != '-'))
+ status = 0;
+else
+ status = 100 * linebuff[0] + 10 * linebuff[1] + linebuff[2] - 111 * '0';
+
+mb = ap_cpystrn(mb, linebuff+4, len-4 ml ? len-4 : ml);
+
+if (linebuff[len - 1] != '\n')
+ (void)bskiplf(f);
+
+if (linebuff[3] == '-') {
+ memcpy(buff, linebuff, 3);
+ buff[3] = ' ';
+ do {
+ len = bgets(linebuff, 100, f);
+ if (len == -1)
+ return -1;
+ if (linebuff[len - 1] != '\n') {
+ (void)bskiplf(f);
+ }
+mb = ap_cpystrn(mb, linebuff+4, len-4 ml ? len-4 : ml);
+ } while (memcmp(linebuff, buff, 4) != 0);
+}
+return status;
+}
+
static long int send_dir(BUFF *f, request_rec *r, BUFF *f2, struct cache_req
*c, char *url)
{
char buf[IOBUFSIZE];
@@ -441,11 +482,20 @@
char pasv[64];
char *pstr;
+/* stuff for responses */
+char *resp;
+int resplen;
+char *size = NULL;
+
/* we only support GET and HEAD */
if (r-method_number != M_GET)
return NOT_IMPLEMENTED;
+/* allocate a buffer for the response message */
+ resplen = MAX_STRING_LEN;
+ resp = (char *)palloc(r-pool, resplen);
+
/* We break the URL into host, port, path-search */
host = pstrdup(p, url + 6);
@@ -833,8 +883,8 @@
bputs(CRLF, f);
bflush(f);
Explain1(FTP: SIZE %s, path);
- i = ftp_getrc(f);
- Explain1(FTP: returned status %d, i);
+ i = ftp_getrc_msg(f, resp, resplen);
+ Explain2(FTP: returned status %d with response %s, i, resp);
if (i != 500) { /* Size command not recognized */
if (i == 550) { /* Not a regular file */
Explain0(FTP: SIZE shows this is a directory);
@@ -861,6 +911,9 @@
path
cvs commit: apache-1.3/src CHANGES
rse 98/03/20 01:27:41 Modified:src CHANGES Log: typo Revision ChangesPath 1.727 +1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.726 retrieving revision 1.727 diff -u -r1.726 -r1.727 --- CHANGES 1998/03/20 09:11:12 1.726 +++ CHANGES 1998/03/20 09:27:39 1.727 @@ -1,6 +1,6 @@ Changes with Apache 1.3b6 - *) Now mod_proxy uses the reponse string (in addition to the response status + *) Now mod_proxy uses the response string (in addition to the response status code) from the already used FTP SIZE command to setup the Content-Length header if available. [Ralf S. Engelschall, PR#1183]
cvs commit: apache-1.3/src/modules/standard mod_auth_db.c
rse 98/03/20 01:42:46 Modified:htdocs/manual/mod mod_auth_db.html src/modules/standard mod_auth_db.c Log: Added hints to the source and documentation what version is needed and where to find that version on the net. PR#: 1423 Revision ChangesPath 1.14 +10 -0 apache-1.3/htdocs/manual/mod/mod_auth_db.html Index: mod_auth_db.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_auth_db.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mod_auth_db.html 1998/02/05 22:33:55 1.13 +++ mod_auth_db.html 1998/03/20 09:42:44 1.14 @@ -21,6 +21,16 @@ files for those systems which support DB and not DBM. It is only available in Apache 1.1 and later. +P +On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically mapped to +Berkeley DB. You can use either A HREF=mod_auth_dbm.htmlmod_auth_dbm/A +or mod_auth_db. The latter makes it more obvious that it's Berkeley DB. On +other platforms where you want to use the DB library you usually have to +install it first. See A +HREF=http://www.sleepycat.com/;http://www.sleepycat.com//A for the +distribution. The interface this module uses is the one from DB version 1.85 +and 1.86, but DB version 2.x can also be used when compatibility mode is +enabled. MENU LIA HREF=#authdbgroupfileAuthDBGroupFile/A 1.28 +5 -0 apache-1.3/src/modules/standard/mod_auth_db.c Index: mod_auth_db.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- mod_auth_db.c 1998/03/13 19:20:30 1.27 +++ mod_auth_db.c 1998/03/20 09:42:46 1.28 @@ -73,6 +73,11 @@ * On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically * mapped to Berkeley DB. You can use either mod_auth_dbm or * mod_auth_db. The latter makes it more obvious that it's Berkeley. + * On other platforms where you want to use the DB library you + * usually have to install it first. See http://www.sleepycat.com/ + * for the distribution. The interface this module uses is the + * one from DB version 1.85 and 1.86, but DB version 2.x + * can also be used when compatibility mode is enabled. * * dirkx - Added Authoritative control to allow passing on to lower * modules if and only if the user-id is not known to this
cvs commit: apache-1.3/htdocs/manual/mod directives.html
rse 98/03/20 02:35:27 Modified:htdocs/manual/mod directives.html Log: Add missing hyperlinks. PR#: 1963 Revision ChangesPath 1.40 +4 -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.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- directives.html 1998/02/04 21:40:04 1.39 +++ directives.html 1998/03/20 10:35:27 1.40 @@ -128,6 +128,7 @@ LIA HREF=core.html#locationmatchlt;LocationMatchgt;/A LIA HREF=core.html#lockfileLockFile/A LIA HREF=mod_log_config.html#logformatLogFormat/A +LIA HREF=core.html#loglevelLogLevel/A LIA HREF=core.html#maxclientsMaxClients/A LIA HREF=core.html#maxkeepaliverequestsMaxKeepAliveRequests/A LIA HREF=core.html#maxrequestsperchildMaxRequestsPerChild/A @@ -145,6 +146,8 @@ LIA HREF=core.html#portPort/A LIA HREF=mod_proxy.html#proxyblockProxyBlock/A LIA HREF=mod_proxy.html#proxypassProxyPass/A +LIA HREF=mod_proxy.html#proxypassreverseProxyPassReverse/A +LIA HREF=mod_proxy.html#proxyreceivebuffersizeProxyReceiveBufferSize/A LIA HREF=mod_proxy.html#proxyremoteProxyRemote/A LIA HREF=mod_proxy.html#proxyrequestsProxyRequests/A LIA HREF=mod_autoindex.html#readmenameReadmeName/A @@ -159,6 +162,7 @@ LIA HREF=mod_rewrite.html#RewriteBaseRewriteBase/A LIA HREF=mod_rewrite.html#RewriteCondRewriteCond/A LIA HREF=mod_rewrite.html#RewriteEngineRewriteEngine/A +LIA HREF=mod_rewrite.html#RewriteLockRewriteLock/A LIA HREF=mod_rewrite.html#RewriteLogRewriteLog/A LIA HREF=mod_rewrite.html#RewriteLogLevelRewriteLogLevel/A LIA HREF=mod_rewrite.html#RewriteMapRewriteMap/A
cvs commit: apache-1.3/htdocs/manual/mod directives.html
rse 98/03/20 03:08:27 Modified:htdocs/manual/mod directives.html Log: One more missing hyperlink. Revision ChangesPath 1.41 +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.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- directives.html 1998/03/20 10:35:27 1.40 +++ directives.html 1998/03/20 11:08:26 1.41 @@ -134,6 +134,7 @@ LIA HREF=core.html#maxrequestsperchildMaxRequestsPerChild/A LIA HREF=core.html#maxspareserversMaxSpareServers/A LIA HREF=mod_cern_meta.html#metadirMetaDir/A +LIA HREF=mod_cern_meta.html#metafilesMetaFiles/A LIA HREF=mod_cern_meta.html#metasuffixMetaSuffix/A LIA HREF=mod_mime_magic.html#mimemagicfileMimeMagicFile/A LIA HREF=core.html#minspareserversMinSpareServers/A
cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c
rse 98/03/20 03:17:14
Modified:src/modules/proxy proxy_ftp.c
Log:
As per request from Martin we should not create the Content-Length in the
situation where one uses the ;type=a feature (forced ASCII mode) because of
newline translations.
Revision ChangesPath
1.53 +1 -1 apache-1.3/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- proxy_ftp.c 1998/03/20 09:11:14 1.52
+++ proxy_ftp.c 1998/03/20 11:17:14 1.53
@@ -989,7 +989,7 @@
else {
proxy_add_header(resp_hdrs, Content-Type, text/plain, HDR_REP);
}
- if (size != NULL) {
+ if (parms[0] != 'a' size != NULL) {
proxy_add_header(resp_hdrs, Content-Length, size, HDR_REP);
Explain1(FTP: Content-Length set to %s, size);
}
cvs commit: apache-1.3/src/support ab.c htpasswd.c htdigest.c suexec.c
rse 98/03/19 01:56:45
Modified:src/support ab.c htpasswd.c htdigest.c suexec.c
Log:
Also static stuff for the support files to make
`gcc -Wall -Wshadow -Wmissing-prototypes -Wmissing-declarations'
also happy for those sources.
Revision ChangesPath
1.2 +11 -12apache-1.3/src/support/ab.c
Index: ab.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ab.c 1998/03/17 12:46:41 1.1
+++ ab.c 1998/03/19 09:56:41 1.2
@@ -183,7 +183,7 @@
/* write out request to a connection - assumes we can write
(small) request out in one go into our new socket buffer */
-void write_request(struct connection *c)
+static void write_request(struct connection *c)
{
gettimeofday(c-connect, 0);
write(c-fd, request, reqlen);
@@ -196,7 +196,7 @@
/* make an fd non blocking */
-void nonblock(int fd)
+static void nonblock(int fd)
{
int i = 1;
ioctl(fd, FIONBIO, i);
@@ -206,7 +206,7 @@
/* returns the time in ms between two timevals */
-int timedif(struct timeval a, struct timeval b)
+static int timedif(struct timeval a, struct timeval b)
{
register int us, s;
@@ -221,7 +221,7 @@
/* calculate and output results and exit */
-void output_results()
+static void output_results(void)
{
int timetaken;
@@ -285,7 +285,7 @@
/* start asnchronous non-blocking connection */
-void start_connect(struct connection *c)
+static void start_connect(struct connection *c)
{
c-read = 0;
c-bread = 0;
@@ -325,7 +325,7 @@
/* close down connection and save stats */
-void close_connection(struct connection *c)
+static void close_connection(struct connection *c)
{
if (c-read == 0 c-keepalive) {
/* server has legitiamately shut down an idle keep alive request */
@@ -365,7 +365,7 @@
/* read data from connection */
-void read_connection(struct connection *c)
+static void read_connection(struct connection *c)
{
int r;
@@ -490,7 +490,7 @@
/* run the tests */
-int test()
+static void test(void)
{
struct timeval timeout, now;
fd_set sel_read, sel_except, sel_write;
@@ -580,13 +580,12 @@
if (done = requests)
output_results();
}
-return 0;
}
/* --- */
/* display copyright information */
-void copyright(void)
+static void copyright(void)
{
printf(This is ApacheBench, Version %s\n, VERSION);
printf(Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/\n;);
@@ -595,7 +594,7 @@
}
/* display usage information */
-void usage(char *progname)
+static void usage(char *progname)
{
fprintf(stderr, Usage: %s [options] [http://]hostname[:port]/path\n;,
progname);
fprintf(stderr, Options are:\n);
@@ -612,7 +611,7 @@
/* split URL into parts */
-int parse_url(char *url)
+static int parse_url(char *url)
{
char *cp;
char *h;
1.14 +9 -9 apache-1.3/src/support/htpasswd.c
Index: htpasswd.c
===
RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- htpasswd.c1998/03/18 00:58:34 1.13
+++ htpasswd.c1998/03/19 09:56:42 1.14
@@ -30,7 +30,7 @@
char *tn;
-char *strd(char *s)
+static char *strd(char *s)
{
char *d;
@@ -39,7 +39,7 @@
return (d);
}
-void getword(char *word, char *line, char stop)
+static void getword(char *word, char *line, char stop)
{
int x = 0, y;
@@ -54,7 +54,7 @@
while ((line[y++] = line[x++]));
}
-int getline(char *s, int n, FILE *f)
+static int getline(char *s, int n, FILE *f)
{
register int i = 0;
@@ -72,7 +72,7 @@
}
}
-void putline(FILE *f, char *l)
+static void putline(FILE *f, char *l)
{
int x;
@@ -86,7 +86,7 @@
static unsigned char itoa64[] = /* 0 ... 63 = ascii - 64 */
./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz;
-void to64(register char *s, register long v, register int n)
+static void to64(register char *s, register long v, register int n)
{
while (--n = 0) {
*s++ = itoa64[v 0x3f];
@@ -99,7 +99,7 @@
* issue the prompt and read the results with echo. (Ugh).
*/
-char *getpass(const char *prompt)
+static char *getpass(const char *prompt)
{
static char password[81];
@@ -116,7 +116,7 @@
#endif
-void add_password(char *user,
cvs commit: apache-1.3/src/support dbmmanage.1 suexec.8 htdigest.1 rotatelogs.8 logresolve.8 htpasswd.1
rse 98/03/19 02:05:51 Modified:.STATUS src CHANGES src/support htpasswd.1 Added: src/support dbmmanage.1 suexec.8 htdigest.1 rotatelogs.8 logresolve.8 Log: Here they come, fresh out of my fingers: Manual pages for support programs which still don't have one. Revision ChangesPath 1.197 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- STATUS1998/03/17 15:47:30 1.196 +++ STATUS1998/03/19 10:05:37 1.197 @@ -96,6 +96,7 @@ * Ralf's new ApacheBench support program (src/support/ab.c) * Ken's change HIDE default to yes, always include hide.h * Ralf's major Configure cleanup +* Ralf's additional manual pages for the support programs Available Patches: 1.722 +6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.721 retrieving revision 1.722 diff -u -r1.721 -r1.722 --- CHANGES 1998/03/17 15:42:22 1.721 +++ CHANGES 1998/03/19 10:05:40 1.722 @@ -1,5 +1,11 @@ Changes with Apache 1.3b6 + *) Add five new and fresh manpages for the support programs: dbmmanage.1, + suexec.8, htdigest.1, rotatelogs.8 and logresolve.8. Now all up-to-date + and per default compiled support programs have manual pages - just to + document our stuff a little bit more and to be able to do really + Unix-like installations ;-) [Ralf S. Engelschall] + *) Major cleanups to the Configure script to make it and its generated Makefiles again readable and maintainable: add SRCDIR option, removed INCLUDES_DEPTH[0-2] kludge, cleanup of TARGET option, cleanup of 1.5 +2 -1 apache-1.3/src/support/htpasswd.1 Index: htpasswd.1 === RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.1,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- htpasswd.11998/03/16 16:04:22 1.4 +++ htpasswd.11998/03/19 10:05:45 1.5 @@ -90,4 +90,5 @@ \fIusername\fP does not exist is this file, an entry is added. If it does exist, the password is changed. .SH SEE ALSO -httpd(8) +.BR httpd(8) +. 1.1 apache-1.3/src/support/dbmmanage.1 Index: dbmmanage.1 === .TH dbmmanage 1 March 1998 .\ Copyright (c) 1998 The Apache Group. All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without .\ modification, are permitted provided that the following conditions .\ are met: .\ .\ 1. Redistributions of source code must retain the above copyright .\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 .\the documentation and/or other materials provided with the .\distribution. .\ .\ 3. All advertising materials mentioning features or use of this .\software must display the following acknowledgment: .\This product includes software developed by the Apache Group .\for use in the Apache HTTP server project (http://www.apache.org/). .\ .\ 4. The names Apache Server and Apache Group must not be used to .\endorse or promote products derived from this software without .\prior written permission. .\ .\ 5. Redistributions of any form whatsoever must retain the following .\acknowledgment: .\This product includes software developed by the Apache Group .\for use in the Apache HTTP server project (http://www.apache.org/). .\ .\ THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY .\ EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR .\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR .\ ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, .\ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT .\ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; .\ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, .\ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\ OF THE POSSIBILITY OF SUCH DAMAGE
cvs commit: apache-1.3 STATUS
rse 98/03/17 01:59:31 Modified:.STATUS Log: update for our lazy guys ;-) Revision ChangesPath 1.193 +2 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- STATUS1998/03/17 09:02:01 1.192 +++ STATUS1998/03/17 09:59:30 1.193 @@ -91,6 +91,8 @@ * Performance tweak to mod_log_config * Marc's cfg_getline() fix for lines without the termination char * Ralf's Various cleanups to the command line interface and manual pages +* Marc's mod_proxy was not clearing the Proxy-Connection header +* Dean's API_EXPORT and CORE_EXPORT cleanup for core functions Available Patches:
cvs commit: apache-1.3/src/support ab.c ab.1 Makefile.tmpl
rse 98/03/17 04:46:42 Modified:.STATUS src CHANGES src/support Makefile.tmpl Added: src/support ab.c ab.1 Log: Include of the new ApacheBench support program: o base is ZeusBench 1.0 from Adam Twiss, Zeus Technology Ltd. o includes enhancements by Dean from November 1997 for keepalive, SunOS4, etc. pp. which were already committed to src/test/zb.c o cleanups and enhancements by Ralf from March 1998: command line parsing, new options, URL-like target specification, manual page, Apache-style code indentation, etc. o !!IMPORTANT!! personal license agreement from March 1998 with Adam Twiss from Zeus Technology (see message [EMAIL PROTECTED] in apache-core mailing list for reference) to include this version into the Apache distribution the way it currently is. So, don't change copyright messages or other license stuff there, please. The program itself can now be enhanced or changed in any way. Revision ChangesPath 1.194 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- STATUS1998/03/17 09:59:30 1.193 +++ STATUS1998/03/17 12:46:36 1.194 @@ -93,6 +93,7 @@ * Ralf's Various cleanups to the command line interface and manual pages * 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) Available Patches: 1.719 +7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.718 retrieving revision 1.719 diff -u -r1.718 -r1.719 --- CHANGES 1998/03/17 08:31:00 1.718 +++ CHANGES 1998/03/17 12:46:38 1.719 @@ -1,5 +1,12 @@ Changes with Apache 1.3b6 + *) Add the new ApacheBench program ab to src/support/: This is derived + from the ZeusBench benchmarking program and can be used to determine the + response performance of an Apache installation. This version is + officially licensed with Zeus Technology, Ltd. See the license agreement + statements in [EMAIL PROTECTED] in apache-core. + [Ralf S. Engelschall] + *) API: Various core functions that are definately not part of the API have been made static, and a few have been marked API_EXPORT. Still more have been marked CORE_EXPORT and are not intended for general 1.11 +5 -2 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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile.tmpl 1998/03/13 08:15:26 1.10 +++ Makefile.tmpl 1998/03/17 12:46:41 1.11 @@ -9,9 +9,9 @@ LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L../ap INCDIR=../include -TARGETS=htpasswd htdigest rotatelogs logresolve +TARGETS=htpasswd htdigest rotatelogs logresolve ab -OBJS=htpasswd.o htdigest.o rotatelogs.o logresolve.o +OBJS=htpasswd.o htdigest.o rotatelogs.o logresolve.o ab.o .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $ @@ -29,6 +29,9 @@ logresolve: logresolve.o $(CC) $(INCLUDES) $(CFLAGS) logresolve.o -o logresolve $(LDFLAGS) $(LIBS) + +ab: ab.o + $(CC) $(INCLUDES) $(CFLAGS) ab.o -o ab $(LDFLAGS) $(LIBS) clean: rm -f $(TARGETS) *.o 1.1 apache-1.3/src/support/ab.c Index: ab.c === /* * Copyright (c) 1998 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *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 *the documentation and/or other materials provided with the *distribution. * * 3. All advertising materials mentioning features or use of this *software must display the following acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org
cvs commit: apache-1.3/src/test zb.c
rse 98/03/17 04:53:32
Modified:src/test zb.c
Log:
Backout my recent changes, because we now have src/support/ab.[c1] which
already contains these changes together with a lot of other cleanups. Better
to leave the original zb.c as original as it can be... (BTW: This zb.c is
already not really original, because there were already two commits from Dean
in the past)
Revision ChangesPath
1.4 +16 -23apache-1.3/src/test/zb.c
Index: zb.c
===
RCS file: /export/home/cvs/apache-1.3/src/test/zb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zb.c 1998/03/16 15:23:24 1.3
+++ zb.c 1998/03/17 12:53:31 1.4
@@ -191,10 +191,9 @@
gettimeofday(endtime,0);
timetaken = timedif(endtime, start);
- printf(Server Hostname:%s\n, machine);
- printf(Server Software:%s\n, server_name);
- printf(Document Path: %s\n, file);
- printf(Document Length:%d bytes\n, doclen);
+ printf(\n---\n);
+ printf(Server: %s\n, server_name);
+ printf(Document Length:%d\n, doclen);
printf(Concurency Level: %d\n, concurrency);
printf(Time taken for tests: %d.%03d seconds\n,
timetaken/1000, timetaken%1000);
@@ -203,8 +202,8 @@
if(bad) printf( (Connect: %d, Length: %d, Exceptions: %d)\n,
err_conn, err_length, err_except);
if(keepalive) printf(Keep-Alive requests:%d\n, doneka);
- printf(Total transfered: %d bytes\n, totalread);
- printf(HTML transfered:%d bytes\n, totalbread);
+ printf(Bytes transfered: %d\n, totalread);
+ printf(HTML transfered:%d\n, totalbread);
/* avoid divide by zero */
if(timetaken) {
@@ -233,6 +232,7 @@
printf( min avg max\n);
printf(Connect: %5d %5d %5d\n,mincon, totalcon/requests, maxcon );
printf(Total: %5d %5d %5d\n, mintot, total/requests, maxtot);
+printf(---\n\n);
}
exit(0);
@@ -453,7 +453,7 @@
FD_ZERO(writebits);
/* setup request */
- sprintf(request,GET %s HTTP/1.0\r\nUser-Agent: ZeusBench/1.01\r\n
+ sprintf(request,GET %s HTTP/1.0\r\nUser-Agent: ZeusBench/1.0\r\n
%sHost: %s\r\nAccept: */*\r\n\r\n, file,
keepalive?Connection: Keep-Alive\r\n:, machine );
@@ -509,16 +509,10 @@
/* display usage information */
void usage(char *progname) {
- printf(This is ZeusBench, Version v1.01\n);
- printf(\n);
- printf(Usage: %s [options] machine path\n, progname);
- printf(-k KeepAlive\n);
- printf(-n requests Number of requests to peforms\n);
- printf(-t timelimitSeconds to max. wait for responses\n);
- printf(-c concurrency Number of multiple requests to make\n);
- printf(-p port Port number to use\n);
- printf(\n);
- printf(Path should start with a '/' e.g. /index.html\n\n);
+ printf(\nZeusBench v1.0\n\n);
+ printf(Usage: %s machine file [-k] [-n requests | -t timelimit (sec)]
+ \n\t\t[-c concurrency] [-p port] \n,progname);
+ printf(Filename should start with a '/' e.g. /index.html\n\n);
exit(EINVAL);
}
@@ -528,7 +522,11 @@
int main(int argc, char **argv) {
int c;
- optind = 1;
+ if (argc 3) usage(argv[0]);
+
+ machine = argv[1];
+ file = argv[2];
+ optind = 3;
while ((c = getopt(argc,argv,p:n:c:d:t:d:k))0) {
switch(c) {
case 'd':
@@ -558,11 +556,6 @@
break;
}
}
- if (optind != argc-2)
- usage(argv[0]);
-
- machine = argv[optind++];
- file = argv[optind++];
test();
return 0;
}
cvs commit: apache-1.3/src/support .cvsignore
rse 98/03/17 05:59:02 Modified:src/support .cvsignore Log: Add ab. Revision ChangesPath 1.5 +1 -0 apache-1.3/src/support/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apache-1.3/src/support/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore1997/02/19 23:35:10 1.4 +++ .cvsignore1998/03/17 13:59:01 1.5 @@ -7,3 +7,4 @@ httpd_monitor suexec logresolve +ab
cvs commit: apache-1.3/src/support Makefile.tmpl
rse 98/03/17 07:42:43 Modified:src CHANGES Configure Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/example Makefile.tmpl src/modules/experimental Makefile.tmpl src/modules/extra Makefile.tmpl src/modules/proxy Makefile.tmpl src/modules/standard Makefile.tmpl src/modules/test 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: Major Configure Cleanup === 1. Now every Makefile receives a SRCDIR option which is set to ., ... ../.. etc. for the various subdirs and thus shows the individual path to the root of our src/ directory. [MAJOR CHANGE] 2. Replaced ugly INCLUDES_DEPTH[0-2] kludge with a SRCDIR based INCLUDES0 option which now reads ``INCLUDES0=-I$(SRCDIR)/os/unix -I$(SRCDIR)/include'' [MAJOR CHANGE] 3. Now replaced all locally defined INCDIR's with a globally defined INCDIR=$(SRCDIR)/include 4. Removed the TARGET option from all Makefiles (because it is not needed there) except for the top-level one (where it is needed) 5. Stripped confusing comments (##RULE..., etc.) and consequently add Begin/End comments for the generated sections 6. All Makefiles now contain a header with inheritance information, i.e. from which files it was derived 7. Subdirectory movement messages is now built-in for easier following where the build process currently stays. 8. All comments now have the same style in the Configure script. 9. The Apache license header was added to the Configure script 10. Fixed a few bugs in Configure ([spacetab] vs. [spacespace], etc.) 11. Tested under FreeBSD, Linux, Solaris and SunOS to make sure no new bugs were introduced. Hmmm [Re-run the Configure script!] Revision ChangesPath 1.721 +9 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.720 retrieving revision 1.721 diff -u -r1.720 -r1.721 --- CHANGES 1998/03/17 13:08:50 1.720 +++ CHANGES 1998/03/17 15:42:22 1.721 @@ -1,5 +1,14 @@ Changes with Apache 1.3b6 + *) Major cleanups to the Configure script to make it and its generated + Makefiles again readable and maintainable: add SRCDIR option, removed + INCLUDES_DEPTH[0-2] kludge, cleanup of TARGET option, cleanup of + generated sections, consequently added Makefile headers with inheritance + information, added subdir movement messages for easier following where + the build process currently stays (more verbose then standard Make, less + verbose than GNU make), same style to comments in the Configure script, + added Apache license header, fixed a few bugs, etc. [Ralf S. Engelschall] + *) The default for the HIDE rule is now yes to aid portability, and include/hide.h is always included. It doesn't do anything if the rule is no but the dependencies don't change now regardless. 1.211 +335 -254 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- Configure 1998/03/16 18:36:17 1.210 +++ Configure 1998/03/17 15:42:23 1.211 @@ -1,23 +1,80 @@ #!/bin/sh -exitcode=0 -trap 'rm -f $tmpfile $tmpfile2 $tmpfile3 $tmpconfig $awkfile; exit $exitcode' 0 1 2 3 15 +## +## Copyright (c) 1995-1998 The Apache Group. All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted provided that the following conditions +## are met: +## +## 1. Redistributions of source code must retain the above copyright +##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 +##the documentation and/or other materials provided with the +##distribution. +## +## 3. All advertising materials mentioning features or use of this +##software must display the following acknowledgment: +##This product includes software developed by the Apache Group +##for use in the Apache HTTP server project (http://www.apache.org/). +## +## 4. The names Apache Server and Apache Group must not be used
cvs commit: apache-1.3 STATUS
rse 98/03/17 07:47:31 Modified:.STATUS Log: The same weather as always in germany these days: gray in gray... Revision ChangesPath 1.196 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- STATUS1998/03/17 13:08:49 1.195 +++ STATUS1998/03/17 15:47:30 1.196 @@ -95,6 +95,7 @@ * 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 +* Ralf's major Configure cleanup Available Patches:
cvs commit: apache-1.3/src/main http_config.c http_main.c
rse 98/03/16 04:09:56
Modified:src/main http_config.c http_main.c
Log:
More cosmetics:
- make -v and -V messages equal in style
- make usage message readable and avoid line wrapping
- compress the ``httpd -h'' output a little bit for easier reading
Revision ChangesPath
1.106 +1 -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.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- http_config.c 1998/03/13 19:20:13 1.105
+++ http_config.c 1998/03/16 12:09:52 1.106
@@ -1520,10 +1520,9 @@
for (n = 0; preloaded_modules[n]; ++n)
for (pc = preloaded_modules[n]-cmds; pc pc-name; ++pc) {
- printf(%s\n, pc-name);
+ printf(%s (%s)\n, pc-name, preloaded_modules[n]-name);
if (pc-errmsg)
printf(\t%s\n, pc-errmsg);
- printf(\t%s\n, preloaded_modules[n]-name);
show_overrides(pc, preloaded_modules[n]);
}
}
1.304 +27 -18apache-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.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- http_main.c 1998/03/14 02:43:45 1.303
+++ http_main.c 1998/03/16 12:09:54 1.304
@@ -777,15 +777,24 @@
void usage(char *bin)
{
-fprintf(stderr, Usage: %s [-d directory] [-f file] [-C \directive\]
[-c \directive\] [-v] [-h] [-l]\n, bin);
-fprintf(stderr, -d directory : specify an alternate initial
ServerRoot\n);
-fprintf(stderr, -f file : specify an alternate ServerConfigFile\n);
-fprintf(stderr, -C \directive\ : process directive before reading
config files\n);
-fprintf(stderr, -c \directive\ : process directive after reading
config files\n);
-fprintf(stderr, -v : show version number\n);
-fprintf(stderr, -V : show compile settings\n);
-fprintf(stderr, -h : list directives\n);
-fprintf(stderr, -l : list modules\n);
+char pad[MAX_STRING_LEN];
+int i;
+
+for (i = 0; i strlen(bin); i++)
+ pad[i] = ' ';
+pad[i] = '\0';
+fprintf(stderr, Usage: %s [-d directory] [-f file]\n, bin);
+fprintf(stderr,%s [-C \directive\] [-c \directive\]\n,
pad);
+fprintf(stderr,%s [-v] [-V] [-h] [-l]\n, pad);
+fprintf(stderr, Options:\n);
+fprintf(stderr, -d directory : specify an alternate initial
ServerRoot\n);
+fprintf(stderr, -f file : specify an alternate
ServerConfigFile\n);
+fprintf(stderr, -C \directive\ : process directive before reading
config files\n);
+fprintf(stderr, -c \directive\ : process directive after reading
config files\n);
+fprintf(stderr, -v : show version number\n);
+fprintf(stderr, -V : show compile settings\n);
+fprintf(stderr, -h : list available configuration
directives\n);
+fprintf(stderr, -l : list compiled-in modules\n);
exit(1);
}
@@ -2867,12 +2876,13 @@
static void show_compile_settings(void)
{
#ifdef SERVER_SUBVERSION
-printf(Server base version: \%s\\n, SERVER_BASEVERSION);
-printf(Server sub-version: \%s\\n, SERVER_SUBVERSION);
+printf(Server base version: %s\n, SERVER_BASEVERSION);
+printf(Server sub-version: %s\n, SERVER_SUBVERSION);
+printf(Server built:%s\n, apapi_get_server_built());
#else
-printf(Server version \%s\\n, apapi_get_server_version());
+printf(Server version: %s\n, apapi_get_server_version());
+printf(Server built: %s\n, apapi_get_server_built());
#endif
-printf(Server built: %s\n, apapi_get_server_built());
printf(Server's Module Magic Number: %u\n, MODULE_MAGIC_NUMBER);
printf(Server compiled with\n);
#ifdef BIG_SECURITY_HOLE
@@ -2953,7 +2963,6 @@
#ifdef NEED_HASHBANG_EMUL
printf( -D NEED_HASHBANG_EMUL\n);
#endif
-printf(\n);
}
@@ -3882,8 +3891,8 @@
ap_cpystrn(server_confname, optarg, sizeof(server_confname));
break;
case 'v':
- printf(Server version %s.\n, apapi_get_server_version());
- printf(Server built: %s\n, apapi_get_server_built());
+ printf(Server version: %s\n, apapi_get_server_version());
+ printf(Server built: %s\n, apapi_get_server_built());
exit(0);
case 'V':
show_compile_settings();
@@ -4979,8 +4988,8 @@
ap_cpystrn(server_confname, optarg, sizeof(server_confname));
break;
case 'v':
- printf(Server version %s.\n,
cvs commit: apache-1.3/src/test zb.c
rse 98/03/16 07:23:25
Modified:src/test zb.c
Log:
Argl, ZeusBench is such a useful utility, but the author seems to come from
VMS or DOS land: Options after arguments :-( We are in Unix land, so make
ZeusBench interface Unix-like as anyone would expect: options first, then
remaining non-option arguments...
Revision ChangesPath
1.3 +23 -16apache-1.3/src/test/zb.c
Index: zb.c
===
RCS file: /export/home/cvs/apache-1.3/src/test/zb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zb.c 1997/11/10 02:06:02 1.2
+++ zb.c 1998/03/16 15:23:24 1.3
@@ -191,9 +191,10 @@
gettimeofday(endtime,0);
timetaken = timedif(endtime, start);
- printf(\n---\n);
- printf(Server: %s\n, server_name);
- printf(Document Length:%d\n, doclen);
+ printf(Server Hostname:%s\n, machine);
+ printf(Server Software:%s\n, server_name);
+ printf(Document Path: %s\n, file);
+ printf(Document Length:%d bytes\n, doclen);
printf(Concurency Level: %d\n, concurrency);
printf(Time taken for tests: %d.%03d seconds\n,
timetaken/1000, timetaken%1000);
@@ -202,8 +203,8 @@
if(bad) printf( (Connect: %d, Length: %d, Exceptions: %d)\n,
err_conn, err_length, err_except);
if(keepalive) printf(Keep-Alive requests:%d\n, doneka);
- printf(Bytes transfered: %d\n, totalread);
- printf(HTML transfered:%d\n, totalbread);
+ printf(Total transfered: %d bytes\n, totalread);
+ printf(HTML transfered:%d bytes\n, totalbread);
/* avoid divide by zero */
if(timetaken) {
@@ -232,7 +233,6 @@
printf( min avg max\n);
printf(Connect: %5d %5d %5d\n,mincon, totalcon/requests, maxcon );
printf(Total: %5d %5d %5d\n, mintot, total/requests, maxtot);
-printf(---\n\n);
}
exit(0);
@@ -453,7 +453,7 @@
FD_ZERO(writebits);
/* setup request */
- sprintf(request,GET %s HTTP/1.0\r\nUser-Agent: ZeusBench/1.0\r\n
+ sprintf(request,GET %s HTTP/1.0\r\nUser-Agent: ZeusBench/1.01\r\n
%sHost: %s\r\nAccept: */*\r\n\r\n, file,
keepalive?Connection: Keep-Alive\r\n:, machine );
@@ -509,10 +509,16 @@
/* display usage information */
void usage(char *progname) {
- printf(\nZeusBench v1.0\n\n);
- printf(Usage: %s machine file [-k] [-n requests | -t timelimit (sec)]
- \n\t\t[-c concurrency] [-p port] \n,progname);
- printf(Filename should start with a '/' e.g. /index.html\n\n);
+ printf(This is ZeusBench, Version v1.01\n);
+ printf(\n);
+ printf(Usage: %s [options] machine path\n, progname);
+ printf(-k KeepAlive\n);
+ printf(-n requests Number of requests to peforms\n);
+ printf(-t timelimitSeconds to max. wait for responses\n);
+ printf(-c concurrency Number of multiple requests to make\n);
+ printf(-p port Port number to use\n);
+ printf(\n);
+ printf(Path should start with a '/' e.g. /index.html\n\n);
exit(EINVAL);
}
@@ -522,11 +528,7 @@
int main(int argc, char **argv) {
int c;
- if (argc 3) usage(argv[0]);
-
- machine = argv[1];
- file = argv[2];
- optind = 3;
+ optind = 1;
while ((c = getopt(argc,argv,p:n:c:d:t:d:k))0) {
switch(c) {
case 'd':
@@ -556,6 +558,11 @@
break;
}
}
+ if (optind != argc-2)
+ usage(argv[0]);
+
+ machine = argv[optind++];
+ file = argv[optind++];
test();
return 0;
}
cvs commit: apache-1.3/src/support apachectl.1 httpd.8
rse 98/03/16 07:58:53
Modified:src/main http_main.c
src/support apachectl.1 httpd.8
Log:
Even more cleanups for command line interface
and corresponding manual pages
Revision ChangesPath
1.305 +4 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- http_main.c 1998/03/16 12:09:54 1.304
+++ http_main.c 1998/03/16 15:58:48 1.305
@@ -3873,7 +3873,11 @@
setup_prelinked_modules();
+#ifdef DEBUG_SIGSTOP
while ((c = getopt(argc, argv, C:c:Xd:f:vVhlZ:)) != -1) {
+#else
+while ((c = getopt(argc, argv, C:c:Xd:f:vVhl)) != -1) {
+#endif
char **new;
switch (c) {
case 'c':
1.3 +4 -4 apache-1.3/src/support/apachectl.1
Index: apachectl.1
===
RCS file: /export/home/cvs/apache-1.3/src/support/apachectl.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apachectl.1 1998/01/07 16:47:10 1.2
+++ apachectl.1 1998/03/16 15:58:52 1.3
@@ -51,13 +51,13 @@
apachectl \- Apache HTTP server control interface
.SH SYNOPSIS
.B apachectl
-command [...]
+\fIcommand\fP [...]
.SH DESCRIPTION
.B apachectl
is a front end to the Apache HyperText Transfer Protocol (HTTP)
server. It is designed to help the administrator control the
functioning of the Apache
-.B httpd(8)
+.B httpd
daemon.
.PP
.B NOTE:
@@ -77,7 +77,7 @@
.B http://www.apache.org/
.
.SH OPTIONS
-The command can be any one or more of the following options:
+The \fIcommand\fP can be any one or more of the following options:
.TP 12
.BI start
Start the Apache daemon. Gives an error if it is already running.
@@ -93,7 +93,7 @@
Displays a full status report from
.B mod_status.
For this to work, you need to have mod_status enabled on your server
-and a text-based browser such as lynx available on your system. The
+and a text-based browser such as \fIlynx\fP available on your system. The
URL used to access the status report can be set by editing the
.B STATUSURL
variable in the script.
1.5 +47 -5 apache-1.3/src/support/httpd.8
Index: httpd.8
===
RCS file: /export/home/cvs/apache-1.3/src/support/httpd.8,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd.8 1998/01/07 16:47:13 1.4
+++ httpd.8 1998/03/16 15:58:52 1.5
@@ -54,12 +54,34 @@
.SH SYNOPSIS
.B httpd
[
-.B \-hlvX?
+.B \-X
] [
.BI \-d serverroot
] [
.BI \-f config
+] [
+.BI \-C directive
+] [
+.BI \-c directive
]
+
+.B httpd
+[
+.B \-h
+]
+[
+.B \-l
+]
+[
+.B \-v
+]
+[
+.B \-V
+]
+[
+.B \-?
+]
+
.SH DESCRIPTION
.B httpd
is the Apache HyperText Transfer Protocol (HTTP) server program. It is
@@ -73,10 +95,13 @@
time a connection to the HTTP service is made.
.PP
This manual page only lists the command line arguments. For details
-of the directives necessary to configure httpd see the Apache manual,
+of the directives necessary to configure
+.B httpd
+see the Apache manual,
which is part of the Apache distribution or can be found at
http://www.apache.org/. Paths in this manual may not reflect those
-compiled into httpd.
+compiled into
+.B httpd.
.SH OPTIONS
.TP 12
.BI \-d serverroot
@@ -89,6 +114,12 @@
does not begin with a /, then it is taken to be a path relative to
the ServerRoot. The default is \fBconf/httpd.conf\fP.
.TP
+.BI \-C directive
+Process the configuration \fIdirective\fP before reading config files.
+.TP
+.BI \-c directive
+Process the configuration \fIdirective\fP after reading config files.
+.TP
.B \-h
Output a list of directives together with expected arguments and
places where the directive is valid.
@@ -102,10 +133,19 @@
to provide ordinary web service.
.TP
.B \-v
-Print the version of httpd, and then exit.
+Print the version of
+.B httpd
+, and then exit.
+.TP
+.B \-V
+Print the version and build parameters of
+.B httpd
+, and then exit.
.TP
.B \-?
-Print a list of the httpd options, and then exit.
+Print a list of the
+.B httpd
+options, and then exit.
.SH FILES
.PD 0
.B /usr/local/apache/conf/httpd.conf
@@ -115,6 +155,8 @@
.B /usr/local/apache/conf/access.conf
.br
.B /usr/local/apache/conf/mime.types
+.br
+.B /usr/local/apache/conf/magic
.br
.B /usr/local/apache/logs/error_log
.br
cvs commit: apache-1.3/src/support htpasswd.1
rse 98/03/16 08:04:23 Modified:src/support htpasswd.1 Log: And even more cleanups Revision ChangesPath 1.4 +7 -3 apache-1.3/src/support/htpasswd.1 Index: htpasswd.1 === RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.1,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- htpasswd.11998/01/07 16:47:11 1.3 +++ htpasswd.11998/03/16 16:04:22 1.4 @@ -64,13 +64,17 @@ Resources available from the .B httpd Apache web server can be restricted to just the users listed -in the files created by htpasswd. This program can only be used +in the files created by +.B htpasswd. +This program can only be used when the usernames are stored in a flat-file. To use a DBM database see -\fBdbmmanage\fP and \fBdbmmanage.new\fP. +\fBdbmmanage\fP. .PP This manual page only lists the command line arguments. For details of -the directives necessary to configure user authentication in httpd see +the directives necessary to configure user authentication in +.B httpd +see the Apache manual, which is part of the Apache distribution or can be found at http://www.apache.org/. .SH OPTIONS
cvs commit: apache-1.3/src CHANGES
rse 98/03/16 08:18:53 Modified:.STATUS src CHANGES Log: Weather in germany: gray in gray and sometimes raining... Revision ChangesPath 1.191 +6 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- STATUS1998/03/15 07:02:55 1.190 +++ STATUS1998/03/16 16:18:49 1.191 @@ -85,6 +85,12 @@ * Performance improvements to invoke_handler(). * Ben Hyde's check to make sure the Port range is valid * Ralf's Unbundling mod_proxy and mod_mime (making mime_find_ct obsolete) +* Jim's change of -DAUX to -DAUX3 for A/UX +* Jim's src/include/ap_config.h wraps it's #define's with #ifndef/#endif's +* Dean's Clean up of some undocumented behavior of mod_setenvif +* Performance tweak to mod_log_config +* Marc's cfg_getline() fix for lines without the termination char +* Ralf's Various cleanups to the command line interface and manual pages Available Patches: 1.716 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.715 retrieving revision 1.716 diff -u -r1.715 -r1.716 --- CHANGES 1998/03/16 00:24:11 1.715 +++ CHANGES 1998/03/16 16:18:50 1.716 @@ -1,5 +1,8 @@ Changes with Apache 1.3b6 + *) Various cleanups to the command line interface and manual pages + [Ralf S. Engelschall] + *) cfg_getline() was not properly handling lines that did not end with a line termination character. [Marc Slemko] PR#1869, 1909
cvs commit: apache-1.3/src Configure
rse 98/03/16 10:36:18 Modified:src Configure Log: Shared object support for UnixWare 2.1.x (still not tested but according to the manpages of 2.1.2 this should be correct) Revision ChangesPath 1.210 +8 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- Configure 1998/03/15 17:03:53 1.209 +++ Configure 1998/03/16 18:36:17 1.210 @@ -741,6 +741,14 @@ LDFLAGS_SHLIB=-shared -expect_unresolved '*' -msym -s LDFLAGS_SHLIB_EXPORT= ;; +*-unixware21*) +case $CC in +*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;; +*/cc|cc ) CFLAGS_SHLIB=-KPIC ;; +esac +LDFLAGS_SHLIB=-Bdynamic -G +LDFLAGS_SHLIB_EXPORT= +;; esac fi
cvs commit: apache-1.3/src/modules/proxy Makefile.tmpl
rse 98/03/12 23:27:58
Modified:.STATUS
src CHANGES Configure
src/modules/proxy Makefile.tmpl
Log:
Support for building library-based modules (mod_proxy) as shared objects and
support for the situation where all modules of a modules/ subdir are build as
shared objects (mod_example).
Revision ChangesPath
1.185 +1 -0 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- STATUS1998/03/12 11:30:07 1.184
+++ STATUS1998/03/13 07:27:51 1.185
@@ -79,6 +79,7 @@
* Fix for rputs() which did not calculate r-sent_bodyct properly.
PR#1900
* Don't tweak TZ envvar if the user has specified an explicit one.
PR#1888
* Ralf's mod_so changes to keep track of loaded modules ourself.
+* Ralf's support for building shared objects even for library-style
modules
Available Patches:
1.702 +7 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -r1.701 -r1.702
--- CHANGES 1998/03/12 10:28:52 1.701
+++ CHANGES 1998/03/13 07:27:53 1.702
@@ -1,5 +1,12 @@
Changes with Apache 1.3b6
+ *) Added support for building shared objects even for library-style modules
+ (which are build from more than one object file). This now provides the
+ ability to build mod_proxy as a shared object module. Additionally
+ modules like mod_example are now also supported for shared object
+ building because the generated Makefiles now no longer assume there is
at
+ least one statically linked module. [Ralf S. Engelschall]
+
*) API: Clarify usage of content_type, handler, content_encoding,
content_language and content_languages fields in request_rec. They
must always be lowercased; and the strings pointed to shouldn't
1.205 +41 -15apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- Configure 1998/03/11 23:58:03 1.204
+++ Configure 1998/03/13 07:27:54 1.205
@@ -926,6 +926,21 @@
SEEN[pp[2]] = 1
}
}'`
+MODDIRS_NO_SO=`awk $tmpfile '
+ ($1 == Module $3 ~ /^modules\//) {
+ split ($3, pp, /)
+ if (! SEEN[pp[2]]) {
+ printf %s , pp[2]
+ SEEN[pp[2]] = 1
+ }
+ }
+ (($1 == AddModule) $2 ~ /^modules\//) {
+ split ($2, pp, /)
+ if (! SEEN[pp[2]]) {
+ printf %s , pp[2]
+ SEEN[pp[2]] = 1
+ }
+ }'`
#
# Now autoconfigure each of the modules specified by AddModule.
@@ -1061,6 +1076,11 @@
do
if [ -f modules/$moddir/Makefile.tmpl ] ; then
AUTODIRS=$AUTODIRS modules/$moddir
+ fi
+done
+for moddir in $MODDIRS_NO_SO
+do
+ if [ -f modules/$moddir/Makefile.tmpl ] ; then
AUTOLIBS=$AUTOLIBS modules/$moddir/lib$moddir.a
fi
done
@@ -1237,28 +1257,32 @@
INCDIR=../../include
EOF
if [ -f $moddir/Makefile.libdir ]; then
- # it's responsible for the rest of its Makefile
- :
- else
basedir=`echo $moddir | sed '[EMAIL PROTECTED]/]*/@@g'`
awk $moddir/Makefile $tmpfile '
- BEGIN {
- printf OBJS=
+ ($2 ~ /^modules\/'$basedir'\//) {
+ split($2, pp, /);
+ split(pp[3], parts, .);
+ libext=parts[2];
}
+ END {
+ printf LIBEXT=%s\n, libext;
+ }'
+ # it's responsible for the rest of its Makefile...
+ else
+ basedir=`echo $moddir | sed '[EMAIL PROTECTED]/]*/@@g'`
+ OBJS=`awk $tmpfile '
($1 == Module $3 ~ /^modules\/'$basedir'\//) {
split ($3, pp, /)
printf %s , pp[3]
}
- END {
- printf \n
- }'
-
- $CAT 'EOF' $moddir/Makefile
-
-all: lib shlib
-
-EOF
- echo LIB=lib$basedir.a $moddir/Makefile
+ '`
+ echo OBJS=$OBJS $moddir/Makefile
+ if [ .$OBJS != . ]; then
+ echo LIB=lib$basedir.a $moddir/Makefile
+ else
+ # essential!
+ echo LIB= $moddir/Makefile
+ fi
awk $moddir/Makefile
cvs commit: apache-1.3/src/support Makefile.tmpl
rse 98/03/13 00:15:27 Modified:src/support Makefile.tmpl Log: Fix support Makefile: - OBJS needs to be declared manually here, because Configure does not set it but our `$(OBJS): Makefile' dependency line needs OBJS to be defined. If not at least HP/UX make complains. - consistently use $(LDFLAGS) and $(LIBS) even if not really needed for rotatelogs - move TARGETS define in front of the targets itsself because some Make variants don't like defines in the middle of the targets section Revision ChangesPath 1.10 +5 -3 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.tmpl 1998/02/22 04:37:20 1.9 +++ Makefile.tmpl 1998/03/13 08:15:26 1.10 @@ -9,11 +9,13 @@ LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L../ap INCDIR=../include +TARGETS=htpasswd htdigest rotatelogs logresolve + +OBJS=htpasswd.o htdigest.o rotatelogs.o logresolve.o + .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $ -TARGETS=htpasswd htdigest rotatelogs logresolve - all: $(TARGETS) htpasswd: htpasswd.o @@ -23,7 +25,7 @@ $(CC) $(CFLAGS) htdigest.o -o htdigest $(LDFLAGS) $(LIBS) rotatelogs: rotatelogs.o - $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.o -o rotatelogs + $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.o -o rotatelogs $(LDFLAGS) $(LIBS) logresolve: logresolve.o $(CC) $(INCLUDES) $(CFLAGS) logresolve.o -o logresolve $(LDFLAGS) $(LIBS)
cvs commit: apache-1.3/src Configuration.tmpl
rse 98/03/13 01:57:15 Modified:src Configuration.tmpl Log: More detailed documentation to make sure the user knows how to enable shared object support and to avoid PR's because they had used SharedModule but not included mod_so itself :-( Revision ChangesPath 1.86 +8 -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.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- Configuration.tmpl1998/03/12 18:17:14 1.85 +++ Configuration.tmpl1998/03/13 09:57:14 1.86 @@ -54,17 +54,22 @@ # Makefile configuration (Shared Object support) # # There is experimental support for compiling Apache Modules as -# shared objects. This feature can be enabled for each module +# shared objects and loading them under runtime without +# recompilation when the module mod_so is enabled (see below). +# The shared object feature then can be enabled for each module # individually by replacing the `AddModule' command of the # corresponding module line below with `SharedModule' and -# changing the filename extension from `.o' to `.so'. +# changing the filename extension from `.o' to `.so'. # # The Configure script currently has only limited built-in # knowledge on how to compile shared objects because this is # heavily platform-dependend. Currently only Linux, FreeBSD, # Solaris, SunOS and IRIX are supported out-of-the-box. For other # platforms where you want to use the `SharedModule' directive -# you have to provide the appropriate flags here. +# you first have to make sure it supports the dlopen() system +# call and then you have to provide the appropriate compiler and +# linker flags here to create the shared object files on your +# particular platform. # #CFLAGS_SHLIB= #LDFLAGS_SHLIB=
cvs commit: apache-1.3/src/modules/example mod_example.c
rse 98/03/13 04:07:00
Modified:src/include hide.h
src/modules/example mod_example.c
Log:
mod_example unnecessarily exports its command and handler structures
Revision ChangesPath
1.8 +0 -2 apache-1.3/src/include/hide.h
Index: hide.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hide.h1998/03/12 13:52:06 1.7
+++ hide.h1998/03/13 12:06:58 1.8
@@ -129,8 +129,6 @@
#define dir_module AP_dir_module
#define dummy_mutexAP_dummy_mutex
#define env_module AP_env_module
-#define example_cmds AP_example_cmds
-#define example_handlers AP_example_handlers
#define example_module AP_example_module
#define expires_module AP_expires_module
#define headers_module AP_headers_module
1.26 +2 -2 apache-1.3/src/modules/example/mod_example.c
Index: mod_example.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/example/mod_example.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_example.c 1998/03/12 10:29:00 1.25
+++ mod_example.c 1998/03/13 12:06:59 1.26
@@ -1055,7 +1055,7 @@
/*
* List of directives specific to our module.
*/
-command_rec example_cmds[] =
+static command_rec example_cmds[] =
{
{
Example, /* directive name */
@@ -1086,7 +1086,7 @@
* if a content-handler returns anything except DECLINED, no other
* content-handlers will be called.
*/
-handler_rec example_handlers[] =
+static handler_rec example_handlers[] =
{
{example-handler, example_handler},
{NULL}
cvs commit: apache-1.3/src/ap Makefile.tmpl
rse 98/03/13 04:44:47 Modified:src/main Makefile.tmpl src/ap Makefile.tmpl Log: Make sure definitions are not in the middle of the target section (which confuses some Make variants) and slightly sort the objects file list for cosmetic issues. Revision ChangesPath 1.17 +7 -6 apache-1.3/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile.tmpl 1998/03/02 07:05:55 1.16 +++ Makefile.tmpl 1998/03/13 12:44:46 1.17 @@ -9,15 +9,16 @@ LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) INCDIR=../include -OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \ - http_log.o http_protocol.o rfc1413.o util.o util_script.o buff.o \ - md5c.o util_md5.o http_bprintf.o util_date.o util_uri.o \ - fnmatch.o http_vhost.o +LIB= libmain.a + +OBJS= alloc.o buff.o \ + http_bprintf.o http_config.o http_core.o http_log.o \ + http_main.o http_protocol.o http_request.o http_vhost.o \ + util.o util_date.o util_script.o util_uri.o util_md5.o \ + md5c.o rfc1413.o fnmatch.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $ - -LIB= libmain.a all: $(LIB) 1.15 +2 -2 apache-1.3/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.tmpl 1998/02/28 10:31:54 1.14 +++ Makefile.tmpl 1998/03/13 12:44:47 1.15 @@ -6,8 +6,8 @@ LIB=libap.a -OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o ap_cpystrn.o \ - ap_execve.o +OBJS=ap_execve.o ap_cpystrn.o ap_signal.o \ + ap_slack.o ap_snprintf.o ap_strings.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $
cvs commit: apache-1.3/src/modules/standard mod_so.c
rse 98/03/13 05:28:21
Modified:src/include hide.h
src/main alloc.c http_core.c http_main.c http_config.c
src/modules/standard mod_so.c
Log:
Shrink list of global symbols by making more stuff static
which currently is global without need.
Revision ChangesPath
1.9 +0 -8 apache-1.3/src/include/hide.h
Index: hide.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hide.h1998/03/13 12:06:58 1.8
+++ hide.h1998/03/13 13:28:13 1.9
@@ -109,22 +109,17 @@
#define action_module AP_action_module
#define agent_log_module AP_agent_log_module
#define alias_module AP_alias_module
-#define alloc_mutexAP_alloc_mutex
#define anon_auth_module AP_anon_auth_module
#define asis_moduleAP_asis_module
#define auth_moduleAP_auth_module
#define autoindex_module AP_autoindex_module
-#define block_freelist AP_block_freelist
#define cern_meta_module AP_cern_meta_module
#define cgi_module AP_cgi_module
#define config_log_module AP_config_log_module
-#define core_cmds AP_core_cmds
-#define core_handlers AP_core_handlers
#define core_moduleAP_core_module
#define day_snames AP_day_snames
#define db_auth_module AP_db_auth_module
#define dbm_auth_moduleAP_dbm_auth_module
-#define default_parms AP_default_parms
#define digest_module AP_digest_module
#define dir_module AP_dir_module
#define dummy_mutexAP_dummy_mutex
@@ -139,7 +134,6 @@
#define mime_moduleAP_mime_module
#define month_snames AP_month_snames
#define negotiation_module AP_negotiation_module
-#define one_processAP_one_process
#define prelinked_modules AP_prelinked_modules
#define preloaded_modules AP_preloaded_modules
#define proxy_module AP_proxy_module
@@ -148,9 +142,7 @@
#define rfc1413_timeoutAP_rfc1413_timeout
#define scoreboard_image AP_scoreboard_image
#define setenvif_moduleAP_setenvif_module
-#define so_cmdsAP_so_cmds
#define so_module AP_so_module
-#define spawn_mutexAP_spawn_mutex
#define speling_module AP_speling_module
#define status_module AP_status_module
#define suexec_enabled AP_suexec_enabled
1.76 +3 -3 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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- alloc.c 1998/03/09 22:42:58 1.75
+++ alloc.c 1998/03/13 13:28:15 1.76
@@ -159,9 +159,9 @@
} h;
};
-union block_hdr *block_freelist = NULL;
-mutex *alloc_mutex = NULL;
-mutex *spawn_mutex = NULL;
+static union block_hdr *block_freelist = NULL;
+static mutex *alloc_mutex = NULL;
+static mutex *spawn_mutex = NULL;
#ifdef POOL_DEBUG
static char *known_stack_point;
static int stack_direction;
1.166 +2 -2 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.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- http_core.c 1998/03/02 06:51:07 1.165
+++ http_core.c 1998/03/13 13:28:16 1.166
@@ -1815,7 +1815,7 @@
* The AllowOverride of Fileinfo allows webmasters to turn it off
*/
-command_rec core_cmds[] = {
+static command_rec core_cmds[] = {
/* Old access config file commands */
@@ -2144,7 +2144,7 @@
return OK;
}
-handler_rec core_handlers[] = {
+static handler_rec core_handlers[] = {
{ */*, default_handler },
{ NULL }
};
1.301 +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.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- http_main.c 1998/03/08 04:25:57 1.300
+++ http_main.c 1998/03/13 13:28:17 1.301
@@ -284,7 +284,7 @@
* Continue through and
cvs commit: apache-1.3/src/os/unix os.h
rse 98/03/13 08:15:42 Modified:src Configure Configuration.tmpl src/os/unix os.h Log: And another nice platform where we support shared objects: OSF1 (BTW: compares to the linker nightmare I had under AIX today the OSF1 platform is really a pleasure) Revision ChangesPath 1.206 +8 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- Configure 1998/03/13 07:27:54 1.205 +++ Configure 1998/03/13 16:15:39 1.206 @@ -733,6 +733,14 @@ LDFLAGS_SHLIB=-shared LDFLAGS_SHLIB_EXPORT= ;; +*-dec-osf*) +case $CC in +*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;; +*/cc|cc ) CFLAGS_SHLIB= ;; +esac +LDFLAGS_SHLIB=-shared -expect_unresolved '*' -msym -s +LDFLAGS_SHLIB_EXPORT= +;; esac fi 1.87 +14 -7 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- Configuration.tmpl1998/03/13 09:57:14 1.86 +++ Configuration.tmpl1998/03/13 16:15:40 1.87 @@ -63,13 +63,20 @@ # # The Configure script currently has only limited built-in # knowledge on how to compile shared objects because this is -# heavily platform-dependend. Currently only Linux, FreeBSD, -# Solaris, SunOS and IRIX are supported out-of-the-box. For other -# platforms where you want to use the `SharedModule' directive -# you first have to make sure it supports the dlopen() system -# call and then you have to provide the appropriate compiler and -# linker flags here to create the shared object files on your -# particular platform. +# heavily platform-dependend. The current state is this: +# +# Out-of-the-box supported platforms: +# Linux, FreeBSD, Solaris, SunOS, IRIX, OSF1 +# +# Entirely unsupported platforms (no dlopen-style API): +# HP-UX, UnixWare, Ultrix +# +# For other platforms where you want to use the `SharedModule' +# directive you first have to make sure it supports the dlopen() +# system call and then you have to provide the appropriate +# compiler and linker flags here to create the shared object +# files on your particular platform. +# # #CFLAGS_SHLIB= #LDFLAGS_SHLIB= 1.14 +2 -2 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- os.h 1998/03/06 13:18:44 1.13 +++ os.h 1998/03/13 16:15:41 1.14 @@ -88,7 +88,7 @@ */ #if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \ -defined(__bsdi__) || defined(IRIX) || defined(SVR4) +defined(__bsdi__) || defined(IRIX) || defined(SVR4) || defined(OSF1) # define HAVE_DLFCN_H 1 #endif @@ -97,7 +97,7 @@ #endif /* OSes that don't support dlopen */ -#if defined(UW) || defined(ULTRIX) +#if defined(UW) || defined(ULTRIX) || defined(HPUX) || defined(HPUX10) # define NO_DL #endif
cvs commit: apache-1.3/src CHANGES
rse 98/03/13 08:21:29 Modified:src CHANGES Log: OK, FINISHED! Now we support building modules as shared objects on all major platforms. Puhhh Revision ChangesPath 1.704 +5 -4 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.703 retrieving revision 1.704 diff -u -r1.703 -r1.704 --- CHANGES 1998/03/13 07:49:19 1.703 +++ CHANGES 1998/03/13 16:21:27 1.704 @@ -39,10 +39,11 @@ [Tony Fincg [EMAIL PROTECTED]] PR#1925 *) Various improvements to the configuration and build support for compiling - modules as shared objects. Especially Solaris 2.x, SunOS 4.1 and IRIX - support with GCC and vendor compilers was added. This way shared object - support is now provided out-of-the-box for FreeBSD, Linux, Solaris, SunOS - and IRIX. [Ralf S. Engelschall] + modules as shared objects. Especially Solaris 2.x, SunOS 4.1, IRIX and + OSF1 support with GCC and vendor compilers was added. This way shared + object support is now provided out-of-the-box for FreeBSD, Linux, + Solaris, SunOS, IRIX and OSF1. In short: On all major platforms! + [Ralf S. Engelschall] *) Minor cleanup in http_main -- split QNX and OS2 specific mmap scoreboard code into separate #defines -- USE_POSIX_SCOREBOARD
cvs commit: apache-1.3/src/include hide.h
rse 98/03/13 08:49:45
Modified:src/main http_core.c
src/include hide.h
Log:
More statics which reduce the global exported symbol table.
Submitted by: Ben Hyde
Revision ChangesPath
1.167 +82 -52apache-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.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- http_core.c 1998/03/13 13:28:16 1.166
+++ http_core.c 1998/03/13 16:49:41 1.167
@@ -683,7 +683,7 @@
return NULL;
}
-const char *set_access_name (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_access_name (cmd_parms *cmd, void *dummy, char *arg)
{
void *sconf = cmd-server-module_config;
core_server_config *conf = get_module_config (sconf, core_module);
@@ -695,7 +695,7 @@
return NULL;
}
-const char *set_document_root (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_document_root (cmd_parms *cmd, void *dummy, char *arg)
{
void *sconf = cmd-server-module_config;
core_server_config *conf = get_module_config (sconf, core_module);
@@ -716,7 +716,7 @@
return NULL;
}
-const char *set_error_document (cmd_parms *cmd, core_dir_config *conf,
+static const char *set_error_document (cmd_parms *cmd, core_dir_config *conf,
char *line)
{
int error_number, index_number, idx500;
@@ -759,7 +759,7 @@
* discards as harmless. Cheesy, but it works.
*/
-const char *set_override (cmd_parms *cmd, core_dir_config *d, const char *l)
+static const char *set_override (cmd_parms *cmd, core_dir_config *d, const
char *l)
{
char *w;
@@ -793,7 +793,7 @@
return NULL;
}
-const char *set_options (cmd_parms *cmd, core_dir_config *d, const char *l)
+static const char *set_options (cmd_parms *cmd, core_dir_config *d, const
char *l)
{
allow_options_t opt;
int first = 1;
@@ -876,7 +876,7 @@
return NULL;
}
-const char *limit_section (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *limit_section (cmd_parms *cmd, void *dummy, const char
*arg)
{
const char *limited_methods = getword(cmd-pool,arg,'');
int limited = 0;
@@ -904,7 +904,7 @@
return NULL;
}
-const char *endlimit_section (cmd_parms *cmd, void *dummy, void *dummy2)
+static const char *endlimit_section (cmd_parms *cmd, void *dummy, void
*dummy2)
{
if (cmd-limited == -1) return /Limit unexpected;
@@ -953,7 +953,7 @@
return cmd-end_token;
}
-const char *dirsection (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *dirsection (cmd_parms *cmd, void *dummy, const char *arg)
{
const char *errmsg;
char *endp = strrchr (arg, '');
@@ -1014,7 +1014,7 @@
return NULL;
}
-const char *urlsection (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *urlsection (cmd_parms *cmd, void *dummy, const char *arg)
{
const char *errmsg;
char *endp = strrchr (arg, '');
@@ -1070,7 +1070,7 @@
return NULL;
}
-const char *filesection (cmd_parms *cmd, core_dir_config *c, const char *arg)
+static const char *filesection (cmd_parms *cmd, core_dir_config *c, const
char *arg)
{
const char *errmsg;
char *endp = strrchr (arg, '');
@@ -1137,11 +1137,11 @@
* Extra (redundant, unpaired) /IfModule directives are
* simply silently ignored.
*/
-const char *end_ifmod (cmd_parms *cmd, void *dummy) {
+static const char *end_ifmod (cmd_parms *cmd, void *dummy) {
return NULL;
}
-const char *start_ifmod (cmd_parms *cmd, void *dummy, char *arg)
+static const char *start_ifmod (cmd_parms *cmd, void *dummy, char *arg)
{
char *endp = strrchr (arg, '');
char l[MAX_STRING_LEN];
@@ -1173,7 +1173,7 @@
/* httpd.conf commands... beginning with the VirtualHost business */
-const char *virtualhost_section (cmd_parms *cmd, void *dummy, char *arg)
+static const char *virtualhost_section (cmd_parms *cmd, void *dummy, char
*arg)
{
server_rec *main_server = cmd-server, *s;
const char *errmsg;
@@ -1222,7 +1222,7 @@
return errmsg;
}
-const char *set_server_alias(cmd_parms *cmd, void *dummy, const char *arg)
+static const char *set_server_alias(cmd_parms *cmd, void *dummy, const char
*arg)
{
if (!cmd-server-names)
return ServerAlias only used in VirtualHost;
@@ -1237,7 +1237,7 @@
return NULL;
}
-const char *add_module_command (cmd_parms *cmd, void *dummy, char *arg)
+static const char *add_module_command (cmd_parms *cmd, void *dummy, char
*arg)
{
const char *err = check_cmd_context(cmd,
cvs commit: apache-1.3/src/main http_core.c
rse 98/03/13 08:54:21
Modified:src/main http_core.c
Log:
Make sure the given argument to Port is in the appropriate range.
Submitted by: Ben Hyde
Reviewed by: Ralf S. Engelschall
Revision ChangesPath
1.168 +9 -2 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.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- http_core.c 1998/03/13 16:49:41 1.167
+++ http_core.c 1998/03/13 16:54:15 1.168
@@ -1286,9 +1286,16 @@
static const char *server_port (cmd_parms *cmd, void *dummy, char *arg)
{
const char *err = check_cmd_context(cmd,
NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
-if (err != NULL) return err;
+int port;
-cmd-server-port = atoi (arg);
+if (err != NULL)
+ return err;
+port = atoi(arg);
+if (port = 0 || port = 65536) /* 65536 == 116 */
+ return pstrcat(cmd-temp_pool, The port number \, arg,
+\ is outside the appropriate range (i.e. 1..65535).,
+NULL);
+cmd-server-port = port;
return NULL;
}
cvs commit: apache-1.3/src CHANGES
rse 98/03/13 09:03:19 Modified:.STATUS src CHANGES Log: The corresponding changelog entries for the added Port check. Revision ChangesPath 1.187 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- STATUS1998/03/13 07:52:22 1.186 +++ STATUS1998/03/13 17:03:15 1.187 @@ -83,6 +83,7 @@ * Ralf's mod_so changes to keep track of loaded modules ourself. * Ralf's support for building shared objects even for library-style modules * Performance improvements to invoke_handler(). +* Ben Hyde's check to make sure the Port range is valid Available Patches: 1.705 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.704 retrieving revision 1.705 diff -u -r1.704 -r1.705 --- CHANGES 1998/03/13 16:21:27 1.704 +++ CHANGES 1998/03/13 17:03:17 1.705 @@ -1,5 +1,8 @@ Changes with Apache 1.3b6 + *) Add check to the Port directive to make sure the specified + port is in the appropriate range. [Ben Hyde] + *) Performance improvements to invoke_handler(). [Dmitry Khrustalev [EMAIL PROTECTED]]
cvs commit: apache-1.3/src/include hide.h
rse 98/03/12 05:52:06
Modified:src/helpers UpdateHide
src/include hide.h
Log:
Fix UpdateHide: the log_error matches aplog_error in our
exclusion list because we have forgotten to bind the regex
to its boundaries.
Revision ChangesPath
1.7 +1 -1 apache-1.3/src/helpers/UpdateHide
Index: UpdateHide
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/UpdateHide,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UpdateHide1998/03/04 12:48:12 1.6
+++ UpdateHide1998/03/12 13:52:05 1.7
@@ -141,7 +141,7 @@
# skip any compiler- or system-private symbols
next if ($name !~ m|^[a-zA-Z]+|);
# skip any symbols in our exclusion list
-next if (grep(/$name/, @excluded));
+next if (grep(/^$name$/, @excluded));
# insert the symbol into our lists
$SB{$name}++ if $type eq 'B';
1.7 +1 -0 apache-1.3/src/include/hide.h
Index: hide.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hide.h1998/03/12 10:35:05 1.6
+++ hide.h1998/03/12 13:52:06 1.7
@@ -347,6 +347,7 @@
#define limit_section AP_limit_section
#define location_walk AP_location_walk
#define log_assert AP_log_assert
+#define log_error AP_log_error
#define log_pidAP_log_pid
#define log_printf AP_log_printf
#define log_reason AP_log_reason
cvs commit: apache-1.3/src/modules/standard mod_speling.c
rse 98/03/12 10:17:16 Modified:src Configuration.tmpl src/modules/standard mod_speling.c Log: Fix typos and some cosmetics Revision ChangesPath 1.85 +10 -7 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- Configuration.tmpl1998/03/11 09:57:25 1.84 +++ Configuration.tmpl1998/03/12 18:17:14 1.85 @@ -14,7 +14,7 @@ # # Makefile options, such as CC=gcc, etc... # -# Rules, distinquished by having Rule at the front. These are used to +# Rules, distinguished by having Rule at the front. These are used to # control Configure's behavior as far as how to create Makefile. # # Module selection lines, distinguished by having 'AddModule' at the front. @@ -207,7 +207,7 @@ ## The Info module displays configuration information for the server and ## all included modules. It's very useful for debugging. -# AddModule modules/standard/mod_info.o +# AddModule modules/standard/mod_info.o ## mod_include translates server-side include (SSI) statements in text files. ## mod_autoindex handles requests for directories which have no index file @@ -219,7 +219,7 @@ AddModule modules/standard/mod_dir.o AddModule modules/standard/mod_cgi.o -## The asis module implemented .asis file types, which allow the embedding +## The asis module implements .asis file types, which allow the embedding ## of HTTP headers at the beginning of the document. mod_imap handles internal ## imagemaps (no more cgi-bin/imagemap/!). mod_actions is used to specify ## CGI scripts which act as handlers for particular files, for example to @@ -233,7 +233,7 @@ ## URL translation modules. ## -## The Speling module attemps to correct mispellings of URLs that +## The Speling module attempts to correct misspellings of URLs that ## users might have entered, namely by checking capitalizations ## or by allowing up to one misspelling (character insertion / omission / ## transposition/typo). This catches the majority of misspelled requests. @@ -306,7 +306,7 @@ ## Miscellaneous modules ## -## mod_usertrack.c is the new name for mod_cookies.c. This module +## mod_usertrack is the new name for mod_cookies. This module ## uses Netscape cookies to automatically construct and log ## click-trails from Netscape cookies, or compatible clients who ## aren't coming in via proxy. @@ -335,7 +335,10 @@ # AddModule modules/standard/mod_unique_id.o -## mod_so lets you add modules to Apache without recompiling. This -## is experimental at this stage. +## mod_so lets you add modules to Apache without recompiling. +## This is an experimental feature at this stage and only supported +## on a subset of the platforms we generally support. +## Don't change this entry to a 'SharedModule' variant (Bootstrapping!) # AddModule modules/standard/mod_so.o + 1.15 +2 -2 apache-1.3/src/modules/standard/mod_speling.c Index: mod_speling.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_speling.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_speling.c 1998/02/03 17:49:02 1.14 +++ mod_speling.c 1998/03/12 18:17:15 1.15 @@ -59,8 +59,8 @@ /* mod_speling.c - by Alexei Kosut [EMAIL PROTECTED] June, 1996 * - * This module is transparent, and simple. It attemps to correct - * mispellings of URLs that users might have entered, namely by checking + * This module is transparent, and simple. It attempts to correct + * misspellings of URLs that users might have entered, namely by checking * capitalizations. If it finds a match, it sends a redirect. * * 08-Aug-1997 [EMAIL PROTECTED]
cvs commit: apache-1.3 STATUS
rse 98/03/09 23:45:04
Modified:.STATUS
Log:
Snow is falling down in germany but the Sun comes out...
Revision ChangesPath
1.182 +9 -1 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- STATUS1998/03/06 12:57:37 1.181
+++ STATUS1998/03/10 07:45:03 1.182
@@ -66,10 +66,18 @@
* Ken's abstraction of SERVER_{BUILT,VERSION}
* Ken's fix for os/unix/os.h and the new -DHIDE functionality
* Ralf's Config File Line Continuation
-* Ralf's Reanimation of DBM support for RewriteMap in mod_rewrite
+* 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
* Mark's fix for ProxyPass/ProxyRequests interaction broken by uri stuff
+* Rasmus' generation of the new src/include/ap_config.h header file
+* Dean's fix for mod_mime_magic and files with length 0
+* Dean's change to Location and LocationMatch semantics. PR#1440
* Ralf's fix for the flock()-fork() problematic for RewriteLock's
+* Dean's Minor cleanup in http_main
+* Ralf's Various improvements to the configuration and build support
+* Corrections to the setup of the REMOTE_HOST variable. PR#1925
+* Fix for rputs() which did not calculate r-sent_bodyct properly.
PR#1900
+* Don't tweak TZ envvar if the user has specified an explicit one.
PR#1888
Available Patches:
cvs commit: apache-1.3/src/modules/standard mod_so.c
module mod_setenvif.c [debug] mod_so.c(163): unloaded module mod_access.c [debug] mod_so.c(163): unloaded module mod_userdir.c [debug] mod_so.c(163): unloaded module mod_dir.c [debug] mod_so.c(163): unloaded module mod_autoindex.c [debug] mod_so.c(163): unloaded module mod_negotiation.c [debug] mod_so.c(163): unloaded module mod_log_config.c [error] Cannot remove module mod_setenvif.c: not found in module list [debug] mod_so.c(163): unloaded module mod_setenvif.c [error] Cannot remove module mod_access.c: not found in module list [debug] mod_so.c(163): unloaded module mod_access.c [error] Cannot remove module mod_userdir.c: not found in module list [debug] mod_so.c(163): unloaded module mod_userdir.c [error] Cannot remove module mod_dir.c: not found in module list [debug] mod_so.c(163): unloaded module mod_dir.c [error] Cannot remove module mod_autoindex.c: not found in module list [debug] mod_so.c(163): unloaded module mod_autoindex.c [error] Cannot remove module mod_negotiation.c: not found in module list [debug] mod_so.c(163): unloaded module mod_negotiation.c [error] Cannot remove module mod_log_config.c: not found in module list [debug] mod_so.c(163): unloaded module mod_log_config.c [error] Cannot remove module mod_setenvif.c: not found in module list [debug] mod_so.c(163): unloaded module mod_setenvif.c [error] Cannot remove module mod_access.c: not found in module list [debug] mod_so.c(163): unloaded module mod_access.c [error] Cannot remove module mod_userdir.c: not found in module list [debug] mod_so.c(163): unloaded module mod_userdir.c [error] Cannot remove module mod_dir.c: not found in module list [debug] mod_so.c(163): unloaded module mod_dir.c [error] Cannot remove module mod_autoindex.c: not found in module list [debug] mod_so.c(163): unloaded module mod_autoindex.c [error] Cannot remove module mod_negotiation.c: not found in module list [debug] mod_so.c(163): unloaded module mod_negotiation.c [error] Cannot remove module mod_log_config.c: not found in module list [debug] mod_so.c(163): unloaded module mod_log_config.c And this is the one with the new mod_so.c: (again the first unloads correspond to the first loads which are printed on stderr unless mod_log_config is present) [debug] mod_so.c(191): unloaded module setenvif_module [debug] mod_so.c(191): unloaded module access_module [debug] mod_so.c(191): unloaded module userdir_module [debug] mod_so.c(191): unloaded module dir_module [debug] mod_so.c(191): unloaded module autoindex_module [debug] mod_so.c(191): unloaded module negotiation_module [debug] mod_so.c(191): unloaded module config_log_module [debug] mod_so.c(261): loaded module config_log_module [debug] mod_so.c(261): loaded module negotiation_module [debug] mod_so.c(261): loaded module autoindex_module [debug] mod_so.c(261): loaded module dir_module [debug] mod_so.c(261): loaded module userdir_module [debug] mod_so.c(261): loaded module access_module [debug] mod_so.c(261): loaded module setenvif_module [notice] Apache/1.3b6-dev configured -- resuming normal operations [notice] httpd: caught SIGTERM, shutting down [debug] mod_so.c(191): unloaded module setenvif_module [debug] mod_so.c(191): unloaded module access_module [debug] mod_so.c(191): unloaded module userdir_module [debug] mod_so.c(191): unloaded module dir_module [debug] mod_so.c(191): unloaded module autoindex_module [debug] mod_so.c(191): unloaded module negotiation_module [debug] mod_so.c(191): unloaded module config_log_module Revision ChangesPath 1.183 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- STATUS1998/03/10 07:45:03 1.182 +++ STATUS1998/03/10 08:52:55 1.183 @@ -78,6 +78,7 @@ * Corrections to the setup of the REMOTE_HOST variable. PR#1925 * Fix for rputs() which did not calculate r-sent_bodyct properly. PR#1900 * Don't tweak TZ envvar if the user has specified an explicit one. PR#1888 +* Ralf's mod_so changes to keep track of loaded modules ourself. Available Patches: 1.698 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.697 retrieving revision 1.698 diff -u -r1.697 -r1.698 --- CHANGES 1998/03/10 06:30:46 1.697 +++ CHANGES 1998/03/10 08:52:56 1.698 @@ -1,5 +1,9 @@ Changes with Apache 1.3b6 + *) Now mod_so keeps track of which module shared objects with which names + are loaded and thus avoids multiple loading and unloading and irritating + error_log messages. [Ralf S. Engelschall
cvs commit: apache-1.3/src CHANGES Configure
rse 98/03/10 08:40:49 Modified:src CHANGES Configure Log: Here it comes: Shared Object support SunOS 4.1 with GCC and Sun's ACC. BTW: I received SIGBUS all the time in dlopen() and after wasting a lot of time debugging this problem I discovered that SunOS doesn't like it when the mod_xx.so files are stripped on installation. So, never strip them on SunOS. Revision ChangesPath 1.699 +4 -4 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.698 retrieving revision 1.699 diff -u -r1.698 -r1.699 --- CHANGES 1998/03/10 08:52:56 1.698 +++ CHANGES 1998/03/10 16:40:44 1.699 @@ -18,10 +18,10 @@ [Tony Fincg [EMAIL PROTECTED]] PR#1925 *) Various improvements to the configuration and build support for compiling - modules as shared objects. Especially Solaris 2.x support with GCC and - WorkShop Compilers 4.2 was added. This way shared object support is now - provided out-of-the-box for FreeBSD, Linux and Solaris. - [Ralf S. Engelschall] + modules as shared objects. Especially Solaris 2.x and SunOS 4.1 support + with GCC and WorkShop Compilers 4.2 was added. This way shared object + support is now provided out-of-the-box for FreeBSD, Linux, Solaris and + SunOS. [Ralf S. Engelschall] *) Minor cleanup in http_main -- split QNX and OS2 specific mmap scoreboard code into separate #defines -- USE_POSIX_SCOREBOARD 1.201 +32 -24apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- Configure 1998/03/10 09:52:18 1.200 +++ Configure 1998/03/10 16:40:45 1.201 @@ -662,33 +662,41 @@ # We adjust now CFLAGS_SHLIB, LDFLAGS_SHLIB and LDFLAGS_SHLIB_EXPORT as -# required. For more PLATFORMs just add the required lines below. +# required. For more platforms just add the required lines below. # if [ x$using_shlib = x1 ] ; then case $PLAT in - *-linux1) - CFLAGS_SHLIB=-fpic - LDFLAGS_SHLIB=-Bshareable - LDFLAGS_SHLIB_EXPORT=-rdynamic - ;; - *-linux2) - CFLAGS_SHLIB=-fpic - LDFLAGS_SHLIB=-Bshareable - LDFLAGS_SHLIB_EXPORT=-rdynamic - ;; - *-freebsd*) - CFLAGS_SHLIB=-fpic - LDFLAGS_SHLIB=-Bshareable - LDFLAGS_SHLIB_EXPORT= - ;; - *-solaris2*) - case $CC in - */gcc|gcc ) CFLAGS_SHLIB=-fpic ;; - */cc|cc ) CFLAGS_SHLIB=-KPIC ;; - esac - LDFLAGS_SHLIB=-G - LDFLAGS_SHLIB_EXPORT= - ;; +*-linux1) +CFLAGS_SHLIB=-fpic +LDFLAGS_SHLIB=-Bshareable +LDFLAGS_SHLIB_EXPORT=-rdynamic +;; +*-linux2) +CFLAGS_SHLIB=-fpic +LDFLAGS_SHLIB=-Bshareable +LDFLAGS_SHLIB_EXPORT=-rdynamic +;; +*-freebsd*) +CFLAGS_SHLIB=-fpic +LDFLAGS_SHLIB=-Bshareable +LDFLAGS_SHLIB_EXPORT= +;; +*-solaris2*) +case $CC in +*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;; +*/cc|cc ) CFLAGS_SHLIB=-KPIC ;; +esac +LDFLAGS_SHLIB=-G +LDFLAGS_SHLIB_EXPORT= +;; +*-sunos4*) +case $CC in +*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;; +*/acc|acc ) CFLAGS_SHLIB=-pic ;; +esac +LDFLAGS_SHLIB=-assert pure-text +LDFLAGS_SHLIB_EXPORT= +;; esac fi
cvs commit: apache-1.3/src Configuration.tmpl
rse 98/03/10 08:42:27 Modified:src Configuration.tmpl Log: Update comment for SunOS shared object support. Revision ChangesPath 1.83 +4 -4 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- Configuration.tmpl1998/03/09 16:47:08 1.82 +++ Configuration.tmpl1998/03/10 16:42:27 1.83 @@ -61,10 +61,10 @@ # # The Configure script currently has only limited built-in # knowledge on how to compile shared objects because this is -# heavily platform-dependend. Currently only Linux, FreeBSD and -# Solaris are supported out-of-the-box. For other platforms where -# you want to use the `SharedModule' directive you have to -# provide the appropriate flags here. +# heavily platform-dependend. Currently only Linux, FreeBSD, +# Solaris and SunOS are supported out-of-the-box. For other +# platforms where you want to use the `SharedModule' directive +# you have to provide the appropriate flags here. # #CFLAGS_SHLIB= #LDFLAGS_SHLIB=
cvs commit: apache-1.3/src/modules/standard mod_so.c
rse 98/03/09 03:35:42 Modified:src/modules/standard mod_so.c Log: Cosmetics and completion of module structure Revision ChangesPath 1.6 +5 -2 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mod_so.c 1998/02/24 10:30:54 1.5 +++ mod_so.c 1998/03/09 11:35:42 1.6 @@ -222,7 +222,7 @@ modp-dynamic_load_handle = modhandle; -add_module (modp); +add_module(modp); /* Register a cleanup in the config pool (normally pconf). When * we do a restart (or shutdown) this cleanup will cause the @@ -307,5 +307,8 @@ NULL, /* check access */ NULL, /* type_checker */ NULL, /* logger */ - NULL /* header parser */ + NULL, /* header parser */ + NULL, /* child_init */ + NULL, /* child_exit */ + NULL /* post read-request */ };
cvs commit: apache-1.3/src/os/win32 mod_dll.c
rse 98/03/09 03:38:57 Modified:src/os/win32 mod_dll.c Log: typo Revision ChangesPath 1.7 +1 -1 apache-1.3/src/os/win32/mod_dll.c Index: mod_dll.c === RCS file: /export/home/cvs/apache-1.3/src/os/win32/mod_dll.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_dll.c 1998/01/07 16:47:08 1.6 +++ mod_dll.c 1998/03/09 11:38:57 1.7 @@ -77,7 +77,7 @@ * 1. Add the following to the module source file's module record *definition: MODULE_VAR_EXPORT. i.e. if you have *module foo_module;, replace it with - *module MODULE+VAR_EXPORT foo_module;. If your module is to be + *module MODULE_VAR_EXPORT foo_module;. If your module is to be *compiled with both Windows and Unix, you may wish to use an #ifdef *WIN32 *
cvs commit: apache-1.3/src Configure
rse 98/03/09 04:52:06
Modified:src Configure
Log:
ConfigStart/End sections were totally ignored for SharedModule
Revision ChangesPath
1.197 +9 -5 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- Configure 1998/03/09 08:41:58 1.196
+++ Configure 1998/03/09 12:52:05 1.197
@@ -815,7 +815,7 @@
# additional hackery. It would be nice to reduce the number of times
# we have to awk the $tmpfile, though.
-# MODFILES contains a list of module filenames (could be .c, .o, .a
+# MODFILES contains a list of module filenames (could be .c, .o, .so, .a
#or .module files) from AddModule lines only
# MODDIRS contains a list of subdirectories under 'modules' which
#contain modules we want to build from both AddModule and Module
@@ -823,7 +823,7 @@
echo + adding selected modules
-MODFILES=`awk $tmpfile '$1 == AddModule { printf %s , $2 }'`
+MODFILES=`awk $tmpfile '($1 == AddModule || $1 == SharedModule) {
printf %s , $2 }'`
MODDIRS=`awk $tmpfile '
($1 == Module $3 ~ /^modules\//) {
split ($3, pp, /)
@@ -892,14 +892,18 @@
. ./$tmpfile3
fi
rm -f $tmpfile2 $tmpfile3
- ext=o
+ if [ $ext != so ]; then
+ ext=o
+ fi
fi
if [ x$modname = x ] ; then
modname=`echo $modbase | sed 's/^.*\///' | \
sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
fi
-#echo Adding Module $modname $modbase.$ext
- echo Module $modname $modbase.$ext $tmpfile
+ if [ $ext != so ]; then
+#echo Adding Module $modname $modbase.$ext
+ echo Module $modname $modbase.$ext $tmpfile
+ fi
done
# $tmpfile now contains Module lines for all the modules we want
cvs commit: apache-1.3/src CHANGES Configuration.tmpl Configure
rse 98/03/09 08:47:10 Modified:src CHANGES Configuration.tmpl Configure Log: Various Enhancements to the Shared Object support - 1. Shared object support is compiler-dependend, so we have to move the XXX_SHLIB stuff _after_ the compiler checks in the Configure script. 3. Added entries for manual/custom shared object support to Configuration.tmpl file, so the user knows what he has to do. Configure already supported this in the past but nothing was documented here. 3. Added initial support for Solaris 2.x. 4. I've now tested shared object support under the following platform/compiler combinations: - FreeBSD 2.1.5 with gcc 2.8.0 - Debian 1.3.1 with gcc 2.7.2 - Solaris 2.6 with gcc 2.7.2 - Solaris 2.5.1 with gcc 2.7.2 - Solaris 2.5.1 with WorkShop Compilers 4.2 30 Oct 1996 C 4.2 All ran out-the-box with my test procedure: [Yes, I really would like to see my configure stuff added...] $ gunzip apache-1.3b6-dev.tar.gz $ cd apache-1.3b6-dev $ ./configure --prefix=/tmp/apache --enable-shared=max $ make $ make install $ /tmp/apache/sbin/apachectl start $ lynx -mime_header -source http://localhost:80/ $ /tmp/apache/sbin/apachectl stop $ cd .. $ rm -rf apache-1.3b6-dev Revision ChangesPath 1.694 +6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.693 retrieving revision 1.694 diff -u -r1.693 -r1.694 --- CHANGES 1998/03/08 04:25:53 1.693 +++ CHANGES 1998/03/09 16:47:06 1.694 @@ -1,5 +1,11 @@ Changes with Apache 1.3b6 + *) Various improvements to the configuration and build support for compiling + modules as shared objects. Especially Solaris 2.x support with GCC and + WorkShop Compilers 4.2 was added. This way shared object support is now + provided out-of-the-box for FreeBSD, Linux and Solaris. + [Ralf S. Engelschall] + *) Minor cleanup in http_main -- split QNX and OS2 specific mmap scoreboard code into separate #defines -- USE_POSIX_SCOREBOARD and USE_OS2_SCOREBOARD. [Dean Gaudet] 1.82 +20 -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.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- Configuration.tmpl1998/03/01 03:19:49 1.81 +++ Configuration.tmpl1998/03/09 16:47:08 1.82 @@ -51,6 +51,26 @@ #RANLIB= +# Makefile configuration (Shared Object support) +# +# There is experimental support for compiling Apache Modules as +# shared objects. This feature can be enabled for each module +# individually by replacing the `AddModule' command of the +# corresponding module line below with `SharedModule' and +# changing the filename extension from `.o' to `.so'. +# +# The Configure script currently has only limited built-in +# knowledge on how to compile shared objects because this is +# heavily platform-dependend. Currently only Linux, FreeBSD and +# Solaris are supported out-of-the-box. For other platforms where +# you want to use the `SharedModule' directive you have to +# provide the appropriate flags here. +# +#CFLAGS_SHLIB= +#LDFLAGS_SHLIB= +#LDFLAGS_SHLIB_EXPORT= + + # Rules configuration # # These are used to let Configure know that we want certain 1.198 +60 -17apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- Configure 1998/03/09 12:52:05 1.197 +++ Configure 1998/03/09 16:47:08 1.198 @@ -324,15 +324,11 @@ OS='Linux' CFLAGS=$CFLAGS -DLINUX=2 LIBS=$LIBS -lm - CFLAGS_SHLIB=-fpic - LDFLAGS_SHLIB=-Bshareable ;; *-linux1) DEF_WANTHSREGEX=yes OS='Linux' CFLAGS=$CFLAGS -DLINUX=1 - CFLAGS_SHLIB=-fpic - LDFLAGS_SHLIB=-Bshareable ;; *-lynx-lynxos) OS='LynxOS 2.x' @@ -371,8 +367,6 @@ LIBS=$LIBS -lcrypt DBM_LIB= DB_LIB= - CFLAGS_SHLIB=-fpic - LDFLAGS_SHLIB=-Bshareable ;; *-openbsd*) OS='OpenBSD' @@ -648,12 +642,10 @@ echo + setting C compiler to $CC fi
cvs commit: apache-1.3/src Configure
rse 98/03/08 04:58:21
Modified:src Configure
Log:
Fix Configure script:
1. move generation of ap_config.h to a later point in the script
because else it doesn't pick up HIDE or STATUS correctly.
2. change the generation of shared objects from explicit rules to
implicit rules: First the $ is only portable for implict
rules (e.g. FreeBSD's make fails) and second we already build
.o's implicitly, so we should do with .so's the same way.
Revision ChangesPath
1.195 +26 -23apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- Configure 1998/03/05 18:58:31 1.194
+++ Configure 1998/03/08 12:58:19 1.195
@@ -841,24 +841,6 @@
}'`
#
-# At this point we can pick out all -D's from CFLAGS and create ap_config.h
-# to be used by external modules needing to include Apache header files.
-#
-
-for cflag in $CFLAGS; do
- echo $cflag $tmpconfig ;
-done
-awk include/ap_config.h $tmpconfig '
- BEGIN {
- printf /* Automatically generated file - do not edit */\n\n
- }
- /^-D.*/ {
- split(substr($1,3,length($1)),parts,=)
- printf (#define %s %s\n,parts[1],parts[2])
- }
-'
-
-#
# Now autoconfigure each of the modules specified by AddModule.
# Use tmpfile2 for the module definition file, and tmpfile3 for the
# shell commands to be executed for this module.
@@ -1078,6 +1060,25 @@
echo End of Configure created section Makefile.config
+# Continue building include/ap_config.h
+#
+# We pick out all -D's from CFLAGS and create ap_config.h which
+# can be used by external modules needing to include Apache
+# header files.
+for cflag in $CFLAGS; do
+ echo $cflag $tmpconfig ;
+done
+awk include/ap_config.h $tmpconfig '
+ BEGIN {
+ printf /* Automatically generated file - do not edit */\n\n
+ }
+ /^-D.*/ {
+ split(substr($1,3,length($1)),parts,=)
+ printf (#define %s %s\n,parts[1],parts[2])
+ }
+'
+
+
# Use TestCompile to see if $(CC) is ANSI and as a final sanity
# check
#
@@ -1167,15 +1168,11 @@
split(pp[3], parts, .)
base=parts[1]
shlibsobj=shlibsobj base -so.o
- comp=comp base .so: base -so.o\n
- comp=comp $(LD) $(LDFLAGS) $(LDFLAGS_SHLIB) -o base
.so $\n
- comp=comp base -so.o: base .c\n
- comp=comp $(CC) $(CFLAGS) $(INCLUDES) $(CFLAGS_SHLIB) -c
-o base -so.o $\n
}
END {
printf SHLIBS=%s\n, shlibs;
printf SHLIBS_OBJ=%s\n, shlibsobj;
- print \n comp \n }'
+}'
$CAT 'EOF' $moddir/Makefile
@@ -1188,8 +1185,14 @@
ar cr $@ $(OBJS)
$(RANLIB) $@
+.SUFFIXES: .o .so
+
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $
+
+.c.so:
+ $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) -o $*-so.o $
+ $(LD) $(LDFLAGS) $(LDFLAGS_SHLIB) -o $@ $*-so.o
clean:
rm -f $(OBJS) $(SHLIBS) $(SHLIBS_OBJ) $(LIB) $(SHLIB)
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h
rse 98/03/06 04:52:59
Modified:src CHANGES
src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
Avoid the flock()-fork() problematic by giving each child an
own file descriptor instead of a shared one.
Revision ChangesPath
1.692 +11 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -r1.691 -r1.692
--- CHANGES 1998/03/06 09:37:04 1.691
+++ CHANGES 1998/03/06 12:52:55 1.692
@@ -1,5 +1,16 @@
Changes with Apache 1.3b6
+ *) Fix one more special locking problem for RewriteMap programs in
+ mod_rewrite: According to the documentation of flock(), Locks are on
+ files, not file descriptors. That is, file descriptors duplicated
+ through dup(2) or fork(2) do not result in multiple instances of a lock,
+ but rather multiple references to a single lock. If a process holding a
+ lock on a file forks and the child explicitly unlocks the file, the
+ parent will lose its lock.. To overcome this we have to make sure the
+ RewriteLock file is opened _AFTER_ the childs were spawned which is now
+ the case by opening it in the child_init instead of the module_init API
+ hook. [Ralf S. Engelschall, PR#1029]
+
*) Change to Location and LocationMatch semantics. LocationMatch no
longer lets a single slash match multiple adjacent slashes in the
URL. This change is for consistency with RewriteRule and
1.87 +86 -29apache-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.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mod_rewrite.c 1998/03/05 12:42:37 1.86
+++ mod_rewrite.c 1998/03/06 12:52:57 1.87
@@ -193,7 +193,7 @@
hook_fixup, /* [#7] pre-run fixups */
NULL,/* [#9] log a transaction */
NULL,/* [#3] header parser */
- NULL,/* child_init */
+ init_child, /* child_init */
NULL,/* child_exit */
NULL /* [#0] post read-request */
};
@@ -869,7 +869,7 @@
/*
**
-** module initialisation
+** Global Module Initialization
** [called from read_config() after all
** config commands were already called]
**
@@ -877,26 +877,42 @@
static void init_module(server_rec *s, pool *p)
{
+/* check if proxy module is available */
+proxy_available = is_proxy_available(s);
+
+/* precompile a static pattern
+ for the txt mapfile parsing */
+lookup_map_txtfile_regexp = pregcomp(p, MAPFILE_PATTERN, REG_EXTENDED);
+
+/* create the rewriting lockfile in the parent */
+rewritelock_create(s, p);
+register_cleanup(p, (void *)s, rewritelock_remove, null_cleanup);
+
/* step through the servers and
* - open each rewriting logfile
- * - open each rewriting lockfile
* - open the RewriteMap prg:xxx programs
*/
for (; s; s = s-next) {
open_rewritelog(s, p);
-open_rewritelock(s, p);
run_rewritemap_programs(s, p);
}
+}
-/* create the lookup cache */
-cachep = init_cache(p);
-/* check if proxy module is available */
-proxy_available = is_proxy_available(s);
+/*
+**
+** Per-Child Module Initialization
+** [called after a child process is spawned]
+**
+*/
-/* precompile a static pattern
- for the txt mapfile parsing */
-lookup_map_txtfile_regexp = pregcomp(p, MAPFILE_PATTERN, REG_EXTENDED);
+static void init_child(server_rec *s, pool *p)
+{
+ /* open the rewriting lockfile */
+ rewritelock_open(s, p);
+
+ /* create the lookup cache */
+ cachep = init_cache(p);
}
@@ -2984,37 +3000,78 @@
** +---+
*/
-static void open_rewritelock(server_rec *s, pool *p)
-{
-rewrite_server_conf *conf;
-char *fname;
-intrewritelock_flags = ( O_WRONLY|O_APPEND|O_CREAT );
#ifdef WIN32
-mode_t rewritelock_mode = ( _S_IREAD|_S_IWRITE );
+#define REWRITELOCK_MODE ( _S_IREAD|_S_IWRITE )
#else
-mode_t rewritelock_mode = ( S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH );
+#define REWRITELOCK_MODE ( S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH )
#endif
+static void rewritelock_create(server_rec *s, pool *p
cvs commit: apache-1.3 STATUS
rse 98/03/06 04:57:38 Modified:.STATUS Log: Again cold days in germany... Revision ChangesPath 1.181 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- STATUS1998/03/06 12:43:51 1.180 +++ STATUS1998/03/06 12:57:37 1.181 @@ -69,6 +69,7 @@ * Ralf's Reanimation of DBM support for RewriteMap in mod_rewrite * Ralf's fix for the `VirtualHost w/o mod_rewrite' situation. PR#1790 * Mark's fix for ProxyPass/ProxyRequests interaction broken by uri stuff +* Ralf's fix for the flock()-fork() problematic for RewriteLock's Available Patches:
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h
rse 98/03/06 05:47:42
Modified:src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
Inline the proxy availability check because the existence of the function
is_proxy_available() is historical and from days where no find_linked_module()
function existed and where this was a bigger function.
Revision ChangesPath
1.88 +1 -13 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.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- mod_rewrite.c 1998/03/06 12:52:57 1.87
+++ mod_rewrite.c 1998/03/06 13:47:40 1.88
@@ -878,7 +878,7 @@
static void init_module(server_rec *s, pool *p)
{
/* check if proxy module is available */
-proxy_available = is_proxy_available(s);
+proxy_available = (find_linked_module(mod_proxy.c) != NULL);
/* precompile a static pattern
for the txt mapfile parsing */
@@ -3783,18 +3783,6 @@
return 1;
else
return 0;
-}
-
-/*
-**
-** check if proxy module is available
-** i.e. if it is compiled in and turned on
-**
-*/
-
-static int is_proxy_available(server_rec *s)
-{
-return (find_linked_module(mod_proxy.c) != NULL);
}
1.48 +0 -3 apache-1.3/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mod_rewrite.h 1998/03/06 12:52:58 1.47
+++ mod_rewrite.h 1998/03/06 13:47:41 1.48
@@ -458,9 +458,6 @@
static intprefix_stat(const char *path, struct stat *sb);
static void add_env_variable(request_rec *r, char *s);
-/* Proxy Module check */
-static int is_proxy_available(server_rec *s);
-
/* File locking */
static void fd_lock(int fd);
static void fd_unlock(int fd);
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 98/03/04 23:50:33 Modified:src/modules/standard mod_rewrite.c Log: Make sure the returned value of rand() is not greater then RAND_MAX on systems like SunOS where we guessed the RAND_MAX value. This the way Ben requested but without the +1 because this actually leaded to an overflow warning under compiletime and is not really needed because this is random number generating functions where it doesn't count because of the additional bounding checks. I've tested it now under FreeBSD 2.1.5 _and_ SunOS 4.1.3 and it both correctly gives numbers between 1 and N when run with l=1 and h=N. Nothing more is needed Revision ChangesPath 1.82 +1 -1 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.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- mod_rewrite.c 1998/03/04 13:55:08 1.81 +++ mod_rewrite.c 1998/03/05 07:50:31 1.82 @@ -2796,7 +2796,7 @@ char buf[50]; rewrite_rand_init(); -sprintf(buf, %.0f, (((double)rand()/RAND_MAX)*(h-l))); +sprintf(buf, %.0f, (((double)(rand()%RAND_MAX)/RAND_MAX)*(h-l))); i = atoi(buf)+1; if (i l) i = l; if (i h) i = h;
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 98/03/04 23:54:01
Modified:src/modules/standard mod_rewrite.c
Log:
Just cosmetic issues I stumpled over...
Revision ChangesPath
1.83 +4 -4 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.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- mod_rewrite.c 1998/03/05 07:50:31 1.82
+++ mod_rewrite.c 1998/03/05 07:53:59 1.83
@@ -130,7 +130,7 @@
**
** o Runtime logic of a request is as following:
** while(request or subrequest)
-** foreach(stage #1...#9)
+** foreach(stage #0...#9)
** foreach(module) (**)
** try to run hook
**
@@ -141,7 +141,7 @@
**
** o there are two different types of result checking and
** continue processing:
-** for hook #1,#4,#5,#6,#8:
+** for hook #0,#1,#4,#5,#6,#8:
** hook run loop stops on first modules which gives
** back a result != DECLINED, i.e. it usually returns OK
** which says OK, module has handled this _stage_ and for #1
@@ -222,7 +222,7 @@
NULL,/* [#3] header parser */
NULL,/* child_init */
NULL,/* child_exit */
- NULL /* post read-request */
+ NULL /* [#0] post read-request */
};
/* the cache */
@@ -2240,7 +2240,7 @@
}
/* now check whether we could reduce it to a local path... */
- if (matches_request_vhost(r, host, port)) {
+if (matches_request_vhost(r, host, port)) {
/* this is our host, so only the URL remains */
r-filename = pstrdup(r-pool, url);
rewritelog(r, 3, reduce %s - %s, olduri, r-filename);
cvs commit: apache-1.3/src/modules/standard mod_rewrite.h
rse 98/03/05 02:45:25 Modified:src/include conf.h src/modules/standard mod_rewrite.h Log: Situation: The function getpwnam() is used in main/util.c main/util_script.c modules/standard/mod_userdir.c modules/standard/mod_rewrite.c but only for mod_rewrite.c the file os/win32/passwd.h was included. All others were compiled without the prototype. Under Unix this is no problem, because there we have pwd.h which is already included in conf.h. Solution: put the special stuff which was added to mod_rewrite.h into conf.h where it belongs to, so it is generally used by all modules. (The netinet/in.h is also removed from mod_rewrite.h because already included in conf.h) Revision ChangesPath 1.187 +11 -2 apache-1.3/src/include/conf.h Index: conf.h === RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- conf.h1998/03/03 01:22:10 1.186 +++ conf.h1998/03/05 10:45:23 1.187 @@ -836,7 +836,6 @@ #include arpa/inet.h /* for inet_ntoa */ #endif #include sys/wait.h -#include pwd.h #include grp.h #include fcntl.h #include limits.h @@ -850,7 +849,17 @@ #include malloc.h #include io.h #include fcntl.h -#endif /* ndef WIN32 */ +#endif /* WIN32 */ + +/* + * Under Unix we have pwd.h for getpwnam() and friends, + * under WIN32 this is emulated by our os/win32/passwd.h + */ +#ifdef WIN32 +#include ../os/win32/passwd.h +#else +#include pwd.h +#endif #include time.h/* for ctime */ #include signal.h 1.46 +0 -5 apache-1.3/src/modules/standard/mod_rewrite.h Index: mod_rewrite.h === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- mod_rewrite.h 1998/03/05 10:21:25 1.45 +++ mod_rewrite.h 1998/03/05 10:45:24 1.46 @@ -99,11 +99,6 @@ #include ctype.h #include sys/types.h #include sys/stat.h -#ifdef WIN32 -#include ../../os/win32/passwd.h -#else -#include netinet/in.h -#endif /* Include from the Apache server ... */ #include httpd.h
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 98/03/05 02:48:07
Modified:src/modules/standard mod_rewrite.c
Log:
Add missing MODULE_VAR_EXPORT for mod_rewrite's module structure
as requested by Marc. Thanks to him for discovering this.
Revision ChangesPath
1.85 +1 -1 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.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- mod_rewrite.c 1998/03/05 10:21:24 1.84
+++ mod_rewrite.c 1998/03/05 10:48:05 1.85
@@ -175,7 +175,7 @@
};
/* the main config structure */
-module rewrite_module = {
+module MODULE_VAR_EXPORT rewrite_module = {
STANDARD_MODULE_STUFF,
init_module, /* module initializer */
config_perdir_create,/* create per-dirconfig structures */
cvs commit: apache-1.3 STATUS
rse 98/03/05 07:31:27 Modified:.STATUS Log: Yeah, 1.2.6 has to go out. This is the best way to start. Revision ChangesPath 1.179 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- STATUS1998/03/05 12:40:56 1.178 +++ STATUS1998/03/05 15:31:26 1.179 @@ -372,4 +372,4 @@ Dean intends to post this on friday, around noon PST. -Status: Dean +1, Ken +1 +Status: Dean +1, Ken +1, Ralf +1
cvs commit: apache-devsite how-to-release.html
rse 98/03/05 07:33:58
Modified:.how-to-release.html
Log:
The stuff in src/modules/test/ is of the same type as
the stuff in src/test, so better to leave it out in the
distribution tarball...
Revision ChangesPath
1.30 +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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- how-to-release.html 1998/03/05 11:58:34 1.29
+++ how-to-release.html 1998/03/05 15:33:57 1.30
@@ -160,10 +160,11 @@
P
LI Remove CODESTATUS/CODE, CODERULES.CVS/CODE,
CODEsrc/INDENT/CODE, various CODE.cvsignore/CODE files
- and the developer's test subdirectory:BR
+ and the developer's test subdirectories:BR
CODESTRONG$ rm STATUS RULES.CVS src/INDENT/STRONG/CODEBR
- CODESTRONG$ find . -name .cvsignore -exec rm {} \;/STRONG/CODE
+ CODESTRONG$ find . -name .cvsignore -exec rm {}
\;/STRONG/CODEBR
CODESTRONG$ rm -rf src/test/STRONG/CODEBR
+ CODESTRONG$ rm -rf src/modules/test/STRONG/CODE
UL
LIFONT COLOR=redNote:/FONT If you needed to do a
CODEcheckout/CODE instead of a CODEexport/CODE, you
cvs commit: apache-1.3 STATUS
rse 98/03/04 04:08:49
Modified:src CHANGES
src/main util.c
.STATUS
Log:
The Line Contunuation feature (take 4):
Same as the voted take 3 but I've replaced the *(cp-N) syntax with cp[-N]
because most of us like this one more.
Submitted by: Ralf S. Engelschall
Reviewed by: Jim Jagielski, Dean Gaudet, Martin Kraemer,
Dirk-Willem van Gulik, Ralf S. Engelschall
Revision ChangesPath
1.683 +7 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -r1.682 -r1.683
--- CHANGES 1998/03/04 10:58:06 1.682
+++ CHANGES 1998/03/04 12:08:45 1.683
@@ -1,5 +1,12 @@
Changes with Apache 1.3b6
+ *) Now all configuration files support Unix-style line-continuation via
+ the trailing backslash (\) character. This enables us to write down
+ complex or just very long directives in a more readable way. The
+ backslash character has to be really the last character before the
+ newline and it has not been prefixed by another (escaping) backslash.
+ [Ralf S. Engelschall]
+
*) When using ProxyPass the ?querystring was not passed correctly.
[Joel Truher [EMAIL PROTECTED]]
1.97 +58 -3 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- util.c1998/03/04 09:45:38 1.96
+++ util.c1998/03/04 12:08:47 1.97
@@ -756,9 +756,49 @@
/* If a get string function is defined, use it */
if (cfp-getstr != NULL) {
char *src, *dst;
- ++cfp-line_number;
- if (cfp-getstr(buf, bufsize, cfp-param) == NULL)
- return 1;
+ char *cp;
+ char *cbuf = buf;
+ size_t cbufsize = bufsize;
+
+ while (1) {
+ ++cfp-line_number;
+ if (cfp-getstr(cbuf, cbufsize, cfp-param) == NULL)
+ return 1;
+
+ /*
+ * check for line continuation,
+ * i.e. match [^\\]\\[\r]\n only
+ */
+ cp = cbuf;
+ while (cp cbuf+cbufsize *cp != '\0')
+ cp++;
+ if (cp cbuf cp[-1] == LF) {
+ cp--;
+ if (cp cbuf cp[-1] == CR)
+ cp--;
+ if (cp cbuf cp[-1] == '\\') {
+ cp--;
+ if (!(cp cbuf cp[-1] == '\\')) {
+ /*
+ * line continuation requested -
+ * then remove backslash and continue
+ */
+ cbuf = cp;
+ cbufsize -= (cp-cbuf);
+ continue;
+ }
+ else {
+ /*
+ * no real continuation because escaped -
+ * then just remove escape character
+ */
+ for ( ; cp cbuf+cbufsize *cp != '\0'; cp++)
+ cp[0] = cp[1];
+ }
+ }
+ }
+ break;
+ }
/* Compress the line, reducing all blanks and tabs to one space.
* Leading and trailing white space is eliminated completely
@@ -820,6 +860,21 @@
++cfp-line_number;
}
if (c == EOF || c == 0x4 || c == LF || i = (bufsize - 2)) {
+ /*
+ * check for line continuation
+ */
+ if (i 0 buf[i-1] == '\\') {
+ i--;
+ if (!(i 0 buf[i-1] == '\\')) {
+ /* line is continued */
+ c = cfp-getch(cfp-param);
+ continue;
+ }
+ /* else nothing needs be done because
+ * then the backslash is escaped and
+ * we just strip to a single one
+ */
+ }
/* blast trailing whitespace */
while (i 0 isspace(buf[i - 1]))
--i;
1.173 +1 -10 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- STATUS1998/03/04 09:59:47 1.172
+++ STATUS1998/03/04 12:08:48 1.173
@@ -65,18 +65,9 @@
* back out USE_PTHREAD_SERIALIZED_ACCEPT for solaris
* Ken's abstraction of SERVER_{BUILT,VERSION}
* Ken's fix for os/unix/os.h
cvs commit: apache-1.3/src/helpers UpdateHide
rse 98/03/04 04:48:13
Modified:src/helpers UpdateHide
Log:
- Add Apache license header
- Add usage information
- Add Linux hint
- Correct regex recently added by Ken
Revision ChangesPath
1.6 +65 -4 apache-1.3/src/helpers/UpdateHide
Index: UpdateHide
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/UpdateHide,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UpdateHide1998/03/04 12:02:07 1.5
+++ UpdateHide1998/03/04 12:48:12 1.6
@@ -1,11 +1,72 @@
:
eval 'exec perl -S $0 ${1+$@}'
if $running_under_some_shell;
+##
+## Copyright (c) 1995-1998 The Apache Group. All rights reserved.
##
-## UpdateHideHeader -- update include/hide.h header file
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+##
+## 1. Redistributions of source code must retain the above copyright
+##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
+##the documentation and/or other materials provided with the
+##distribution.
+##
+## 3. All advertising materials mentioning features or use of this
+##software must display the following acknowledgment:
+##This product includes software developed by the Apache Group
+##for use in the Apache HTTP server project (http://www.apache.org/).
+##
+## 4. The names Apache Server and Apache Group must not be used to
+##endorse or promote products derived from this software without
+##prior written permission. For written permission, please contact
+##[EMAIL PROTECTED]
+##
+## 5. Redistributions of any form whatsoever must retain the following
+##acknowledgment:
+##This product includes software developed by the Apache Group
+##for use in the Apache HTTP server project (http://www.apache.org/).
+##
+## THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+## EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
+## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+## NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+## LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+## STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+## ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+## OF THE POSSIBILITY OF SUCH DAMAGE.
+##
+##
+## This software consists of voluntary contributions made by many
+## individuals on behalf of the Apache Group and was originally based
+## on public domain software written at the National Center for
+## Supercomputing Applications, University of Illinois, Urbana-Champaign.
+## For more information on the Apache Group and the Apache HTTP server
+## project, please see http://www.apache.org/.
+##
+##
+
+##
+## UpdateHide -- update the include/hide.h header file
## Written by Ralf S. Engelschall, [EMAIL PROTECTED]
##
+# usage
+if ($#ARGV != 2) {
+print STDERR Usage: UpdateHide httpd-binary hide-header-file
gnu-triple\n;
+print STDERR Example: UpdateHide httpd include/hide.h
`helpers/GuessOS`\n;
+print STDERR Hint:Use the 'makeupdate' target of src/Makefile to
run it\n;
+exit(1);
+}
+
# the parameters
$httpdbinary = $ARGV[0];
$headerfile = $ARGV[1];
@@ -42,13 +103,13 @@
$nm_cmd = '/usr/ccs/bin/nm -p -g';
$us_strip = 0;
}
-elsif ($gnutriple =~ /linux/) {
+elsif ($gnutriple =~ m|.*-linux.*|) {
$nm_cmd = '/usr/bin/nm -g';
$us_strip = 0;
}
else {
print STDERR Sorry, UpdateHide currently can be used only under\n;
-print STDERR the following OS: FreeBSD, Solaris, HPUX\n;
+print STDERR the following OS: FreeBSD, Solaris, HPUX, Linux\n;
exit(1);
}
@@ -76,7 +137,7 @@
#already compiled with HIDE defined)
$name =~ s|^AP_||;
# skip any already-protected symbols
-next if ($name =~ m:^ap(_)|(api):);
+next if ($name =~ m/^ap(?:_|api)/);
# skip any compiler- or system-private symbols
next if ($name !~ m|^[a-zA-Z]+|);
# skip any symbols in our exclusion list
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h
rse 98/03/04 05:17:01
Modified:src CHANGES
src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
Reanimate the DBM support for RewriteMap in mod_rewrite by fixing two source
code errors and making sure it is disabled when DBM support is not available
on the used platform.
Revision ChangesPath
1.684 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -r1.683 -r1.684
--- CHANGES 1998/03/04 12:08:45 1.683
+++ CHANGES 1998/03/04 13:16:56 1.684
@@ -1,5 +1,11 @@
Changes with Apache 1.3b6
+ *) Fixed the DBM RewriteMap support for mod_rewrite: First the support now
+ is automatically disabled under configure time when the dbm_xxx
functions
+ are not available. Second, two heavy source code errors in the DBM
+ support code were fixed. This makes DBM RewriteMap's useable again
after
+ a long time of brokeness. [Ralf S. Engelschall]
+
*) Now all configuration files support Unix-style line-continuation via
the trailing backslash (\) character. This enables us to write down
complex or just very long directives in a more readable way. The
1.80 +22 -7 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.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- mod_rewrite.c 1998/03/04 02:28:23 1.79
+++ mod_rewrite.c 1998/03/04 13:16:59 1.80
@@ -157,6 +157,21 @@
** or not!
*/
+/* The section for the Configure script:
+ * MODULE-DEFINITION-START
+ * Name: rewrite_module
+ * ConfigStart
+if ./helpers/TestCompile func dbm_open; then
+echo enabling DBM support for mod_rewrite
+else
+echo disabling DBM support for mod_rewrite
+echo (perhaps you need to add -ldbm, -lndbm or -lgdbm to
EXTRA_LIBS)
+CFLAGS=$CFLAGS -DNO_DBM_REWRITEMAP
+fi
+ * ConfigEnd
+ * MODULE-DEFINITION-END
+ */
+
/* the table of commands we provide */
static command_rec command_table[] = {
{ RewriteEngine, cmd_rewriteengine, NULL, OR_FILEINFO, FLAG,
@@ -472,7 +487,7 @@
new-checkfile = a2+4;
}
else if (strncmp(a2, dbm:, 4) == 0) {
-#ifdef HAS_NDBM_LIB
+#ifndef NO_DBM_REWRITEMAP
new-type = MAPTYPE_DBM;
new-datafile = a2+4;
new-checkfile = pstrcat(cmd-pool, a2+4, NDBM_FILE_SUFFIX, NULL);
@@ -2519,13 +2534,13 @@
}
}
else if (s-type == MAPTYPE_DBM) {
-#if HAS_NDBM_LIB
+#ifndef NO_DBM_REWRITEMAP
if (stat(s-checkfile, st) == -1) {
-aplog_error(APLOG_MARK, APLOG_ERROR, r-server,
-mod_rewrite: can't access dbm RewriteMap
-file %s: %s, s-checkfile);
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+mod_rewrite: can't access DBM RewriteMap
+file %s, s-checkfile);
rewritelog(r, 1,
- can't open RewriteMap file, see error log);
+ can't open DBM RewriteMap file, see error
log);
return NULL;
}
value = get_cache_string(cachep, s-name, CACHEMODE_TS,
@@ -2660,7 +2675,7 @@
return value;
}
-#if HAS_NDBM_LIB
+#ifndef NO_DBM_REWRITEMAP
static char *lookup_map_dbmfile(request_rec *r, char *file, char *key)
{
DBM *dbmfp = NULL;
1.43 +2 -2 apache-1.3/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mod_rewrite.h 1998/03/03 15:58:11 1.42
+++ mod_rewrite.h 1998/03/04 13:17:00 1.43
@@ -95,7 +95,7 @@
* But we have to stat the file for the mtime,
* so we also need to know the file extension
*/
-#if HAS_NDBM_LIB
+#ifndef NO_DBM_REWRITEMAP
#include ndbm.h
#if (__FreeBSD__)
#define NDBM_FILE_SUFFIX .db
@@ -379,7 +379,7 @@
/* rewrite map support functions */
static char *lookup_map(request_rec *r, char *name, char *key);
static char *lookup_map_txtfile(request_rec *r, char *file, char *key);
-#if HAS_NDBM_LIB
+#ifndef NO_DBM_REWRITEMAP
static char
cvs commit: apache-1.3 STATUS
rse 98/03/04 05:20:16
Modified:.STATUS
Log:
I hate the weather in germany: Sunday snow was falling down and
just three days later we have a hot sunny day with 20 degree Celcius...
Revision ChangesPath
1.174 +1 -0 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- STATUS1998/03/04 12:08:48 1.173
+++ STATUS1998/03/04 13:20:14 1.174
@@ -66,6 +66,7 @@
* Ken's abstraction of SERVER_{BUILT,VERSION}
* Ken's fix for os/unix/os.h and the new -DHIDE functionality
* Ralf's Config File Line Continuation
+* Ralf's Reanimation of DBM support for RewriteMap in mod_rewrite
Available Patches:
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h
rse 98/03/04 05:55:11
Modified:src CHANGES
src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
Ok, here it comes: the last bugfix for mod_rewrite on my TODO list.
It fixes the PR's problem the way Dean initially wanted:
On-the-fly without changing any configuration structures.
Revision ChangesPath
1.685 +9 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.684
retrieving revision 1.685
diff -u -r1.684 -r1.685
--- CHANGES 1998/03/04 13:16:56 1.684
+++ CHANGES 1998/03/04 13:55:06 1.685
@@ -1,5 +1,14 @@
Changes with Apache 1.3b6
+ *) Fix mod_rewrite for the ugly API case where VirtualHost sections exist
+ but without any RewriteX directives. Here mod_rewrite is given no
+ chance by the API to initialise its per-server configuration and thus
+ receives the wrong one from the main server. This is now avoided by
+ remembering the server together with the config structure while
+ configuring and later assuming there is no config when we see a
+ difference between the remembered server and the one calling us.
+ [Ralf S. Engelschall, PR#1790]
+
*) Fixed the DBM RewriteMap support for mod_rewrite: First the support now
is automatically disabled under configure time when the dbm_xxx
functions
are not available. Second, two heavy source code errors in the DBM
1.81 +13 -0 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.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- mod_rewrite.c 1998/03/04 13:16:59 1.80
+++ mod_rewrite.c 1998/03/04 13:55:08 1.81
@@ -271,6 +271,7 @@
a-rewritemaps = make_array(p, 2, sizeof(rewritemap_entry));
a-rewriteconds= make_array(p, 2, sizeof(rewritecond_entry));
a-rewriterules= make_array(p, 2, sizeof(rewriterule_entry));
+a-server = s;
return (void *)a;
}
@@ -285,6 +286,7 @@
a-state = overrides-state;
a-options = overrides-options;
+a-server = overrides-server;
if (a-options OPTION_INHERIT) {
/*
@@ -971,6 +973,17 @@
* else return immediately!
*/
if (conf-state == ENGINE_DISABLED)
+return DECLINED;
+
+/*
+ * check for the ugly API case of a virtual host section where no
+ * mod_rewrite directives exists. In this situation we became no chance
+ * by the API to setup our default per-server config so we have to
+ * on-the-fly assume we have the default config. But because the default
+ * config has a disabled rewriting engine we are lucky because can
+ * just stop operating now.
+ */
+if (conf-server != r-server)
return DECLINED;
/*
1.44 +1 -0 apache-1.3/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mod_rewrite.h 1998/03/04 13:17:00 1.43
+++ mod_rewrite.h 1998/03/04 13:55:09 1.44
@@ -263,6 +263,7 @@
array_header *rewritemaps; /* the RewriteMap entries */
array_header *rewriteconds;/* the RewriteCond entries (temporary) */
array_header *rewriterules;/* the RewriteRule entries */
+server_rec *server; /* the corresponding server indicator */
} rewrite_server_conf;
cvs commit: apache-1.3 STATUS
rse 98/03/04 05:58:59 Modified:.STATUS Log: And still a sunny day... Revision ChangesPath 1.175 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- STATUS1998/03/04 13:20:14 1.174 +++ STATUS1998/03/04 13:58:58 1.175 @@ -67,6 +67,7 @@ * Ken's fix for os/unix/os.h and the new -DHIDE functionality * Ralf's Config File Line Continuation * Ralf's Reanimation of DBM support for RewriteMap in mod_rewrite +* Ralf's fix for the `VirtualHost w/o mod_rewrite' situation. PR#1790 Available Patches:
cvs commit: apache-1.3/src CHANGES
rse 98/03/04 06:14:13 Modified:src CHANGES Log: Add this PR because it reported the problem, too. Revision ChangesPath 1.686 +1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.685 retrieving revision 1.686 diff -u -r1.685 -r1.686 --- CHANGES 1998/03/04 13:55:06 1.685 +++ CHANGES 1998/03/04 14:14:10 1.686 @@ -13,7 +13,7 @@ is automatically disabled under configure time when the dbm_xxx functions are not available. Second, two heavy source code errors in the DBM support code were fixed. This makes DBM RewriteMap's useable again after - a long time of brokeness. [Ralf S. Engelschall] + a long time of brokeness. [Ralf S. Engelschall, PR#1696] *) Now all configuration files support Unix-style line-continuation via the trailing backslash (\) character. This enables us to write down
cvs commit: apache-1.3/htdocs/manual/images mod_rewrite_fig1.fig mod_rewrite_fig1.gif mod_rewrite_fig2.fig mod_rewrite_fig2.gif
rse 98/03/04 08:51:19 Modified:htdocs/manual/mod mod_rewrite.html Added: htdocs/manual/images mod_rewrite_fig1.fig mod_rewrite_fig1.gif mod_rewrite_fig2.fig mod_rewrite_fig2.gif Log: Phase 1 of mod_rewrite documentation enhancement: Adding of new information. Now especially the detailed information about how mod_rewrite internally works which is written down here for better understanding of the directive documentation. I've also painted two initial figures to illustrate this better which are added to htdocs/manual/images/. (Phase 2 will be error correction and markup code cleanup) Revision ChangesPath 1.26 +291 -80 apache-1.3/htdocs/manual/mod/mod_rewrite.html Index: mod_rewrite.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mod_rewrite.html 1998/02/25 15:42:58 1.25 +++ mod_rewrite.html 1998/03/04 16:51:15 1.26 @@ -15,54 +15,86 @@ VLINK=#80 ALINK=#FF +BLOCKQUOTE !--#include virtual=header.html -- -H1 ALIGN=CENTERModule mod_rewrite/H1 +BR +H1 ALIGN=CENTERModule mod_rewriteBRURL Rewriting Engine/H1 This module is contained in the CODEmod_rewrite.c/CODE file, with Apache -1.2 and later. It provides a rule-based rewriting engine to rewrite requested -URLs on the fly. CODEmod_rewrite/CODE is not compiled into the server by -default. To use CODEmod_rewrite/CODE you have to enable the following line -in the server build Configuration file: +1.2 and later. It provides a rule-based rewriting engine to rewrite requested +URLs on the fly. It is not compiled into the server by default. To use +CODEmod_rewrite/CODE you have to enable the following line in the server +build CODEConfiguration/CODE file: PRE AddModule modules/standard/mod_rewrite.o /PRE +HR NOSHADE SIZE=1 + +BR H2Summary/H2 -This module uses a rule-based rewriting engine (based on a -regular-expression parser) to rewrite requested URLs on the fly. +BLOCKQUOTE +BLOCKQUOTE +BLOCKQUOTE +EM,,The great thing about mod_rewrite is it gives you all the +configurability and flexibility of Sendmail. The downside to +mod_rewrite is that it gives you all the configurability and +flexibility of Sendmail.''/EM +DIV ALIGN=RIGHT +-- Brian BehlendorfBR +Apache Group +/DIV +/BLOCKQUOTE +/BLOCKQUOTE +/BLOCKQUOTE + +Welcome to mod_rewrite, the Swiss Army Knife of URL manipulation! P -It supports an unlimited number of additional rule conditions (which can -operate on a lot of variables, including HTTP headers) for granular -matching and external database lookups (either via plain text -tables, DBM hash files or external processes) for advanced URL -substitution. +This module uses a rule-based rewriting engine (based on a regular-expression +parser) to rewrite requested URLs on the fly. It supports an unlimited number +of rules and an unlimited number of attached rule conditions for each rule to +provide a really flexible and powerful URL manipulation mechanism. The URL +manipulations can depend on various tests, for instance server variables, +environment variables, HTTP headers, timestamps and even external database +lookups in various formats can be used to achieve a really granular URL +matching. P -It operates on the full URLs (including the PATH_INFO part) both in per-server -context (httpd.conf) and per-dir context (.htaccess) and even can generate -QUERY_STRING parts on result. The rewritten result can lead to internal -sub-processing, external request redirection or to internal proxy throughput. +This module operates on the full URLs (including the path-info part) both in +per-server context (CODEhttpd.conf/CODE) and per-directory context +(CODE.htaccess/CODE) and even can generate query-string parts on result. +The rewritten result can lead to internal sub-processing, external request +redirection or even to an internal proxy throughput. P -This module was originally written in April 1996 and -gifted exclusively to the The Apache Group in July 1997 by +But all this functionality and flexibility has its drawback: complexity. So +don't expect to understand this module in it's whole in just one day. +P +This module was invented and originally written in April 1996BR +and gifted exclusively to the The Apache Group in July 1997 by P BLOCKQUOTE -EMRalf S. Engelschall/EMBR +A HREF=http://www.engelschall.com/;TTRalf S. Engelschall/TT/ABR A HREF=mailto:[EMAIL PROTECTED]TT[EMAIL PROTECTED]/TT/ABR A HREF=http://www.engelschall.com/;TTwww.engelschall.com/TT/A /BLOCKQUOTE -!--%hypertext -- -HR -!--/%hypertext
cvs commit: apache-1.3/src Makefile.tmpl
rse 98/03/03 05:47:44 Modified:src/include hide.h src/helpers UpdateHide src Makefile.tmpl Log: Made the generation of src/include/hide.h more robust and complete and commit an updated version of this header file. Revision ChangesPath 1.2 +3 -11 apache-1.3/src/include/hide.h Index: hide.h === RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hide.h1998/02/28 15:39:32 1.1 +++ hide.h1998/03/03 13:47:41 1.2 @@ -76,8 +76,6 @@ #define daemons_max_free AP_daemons_max_free #define daemons_min_free AP_daemons_min_free #define daemons_to_start AP_daemons_to_start -#define endAP_end -#define environAP_environ #define excess_requests_per_child AP_excess_requests_per_child #define group_id AP_group_id #define jmpbuffer AP_jmpbuffer @@ -129,7 +127,6 @@ #define digest_module AP_digest_module #define dir_module AP_dir_module #define dummy_mutexAP_dummy_mutex -#define edata AP_edata #define env_module AP_env_module #define example_cmds AP_example_cmds #define example_handlers AP_example_handlers @@ -231,7 +228,6 @@ #define check_alarmAP_check_alarm #define check_auth AP_check_auth #define check_cmd_context AP_check_cmd_context -#define check_fulluri AP_check_fulluri #define check_serverpath AP_check_serverpath #define check_symlinks AP_check_symlinks #define check_user_id AP_check_user_id @@ -265,6 +261,7 @@ #define create_request_config AP_create_request_config #define create_server_config AP_create_server_config #define default_handlerAP_default_handler +#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_pool AP_destroy_pool @@ -274,10 +271,6 @@ #define directory_walk AP_directory_walk #define dirsection AP_dirsection #define discard_request_body AP_discard_request_body -#define dlcloseAP_dlclose -#define dlerrorAP_dlerror -#define dlopen AP_dlopen -#define dlsym AP_dlsym #define do_nothing AP_do_nothing #define document_root AP_document_root #define each_byterange AP_each_byterange @@ -287,7 +280,6 @@ #define escape_htmlAP_escape_html #define escape_path_segmentAP_escape_path_segment #define escape_shell_cmd AP_escape_shell_cmd -#define etext AP_etext #define exists_scoreboard_imageAP_exists_scoreboard_image #define file_walk AP_file_walk #define filesectionAP_filesection @@ -379,6 +371,7 @@ #define make_sub_request AP_make_sub_request #define make_table AP_make_table #define malloc_block AP_malloc_block +#define matches_request_vhost AP_matches_request_vhost #define meets_conditions AP_meets_conditions #define merge_core_dir_configs AP_merge_core_dir_configs #define merge_core_server_configs AP_merge_core_server_configs @@ -407,7 +400,6 @@ #define parse_htaccess AP_parse_htaccess #define parse_uri AP_parse_uri #define parse_uri_components AP_parse_uri_components -#define parse_uri_components_regex AP_parse_uri_components_regex #define parse_vhost_addrs AP_parse_vhost_addrs #define pcallocAP_pcalloc #define pcfg_open_custom AP_pcfg_open_custom @@ -554,6 +546,7 @@ #define set_pidfileAP_set_pidfile #define set_scoreboard AP_set_scoreboard #define set_send_buffer_size AP_set_send_buffer_size +#define set_server_alias AP_set_server_alias #define set_server_limit AP_set_server_limit #define set_server_rootAP_set_server_root #define set_server_string_slot AP_set_server_string_slot @@ -580,7 +573,6 @@ #define spawn_child_err_buff AP_spawn_child_err_buff #define
cvs commit: apache-1.3/src/modules/standard mod_rewrite.h
rse 98/03/03 07:53:34 Modified:src/modules/standard mod_rewrite.h Log: Add own definition for RAND_MAX because some non-strict-POSIX platforms don't define it although they provide the rand() function :-( Revision ChangesPath 1.41 +4 -0 apache-1.3/src/modules/standard/mod_rewrite.h Index: mod_rewrite.h === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- mod_rewrite.h 1998/03/02 06:51:20 1.40 +++ mod_rewrite.h 1998/03/03 15:53:33 1.41 @@ -198,6 +198,10 @@ #define YES TRUE #endif +#ifndef RAND_MAX +#define RAND_MAX 32767 +#endif + #ifndef LONG_STRING_LEN #define LONG_STRING_LEN 2048 #endif
cvs commit: apache-1.3/src/modules/standard mod_rewrite.h
rse 98/03/03 07:58:12 Modified:src/modules/standard mod_rewrite.h Log: Remove already no longer needed define, because we replaced all of its usages with ap_cpystrn() variants in the past. Revision ChangesPath 1.42 +0 -3 apache-1.3/src/modules/standard/mod_rewrite.h Index: mod_rewrite.h === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- mod_rewrite.h 1998/03/03 15:53:33 1.41 +++ mod_rewrite.h 1998/03/03 15:58:11 1.42 @@ -208,9 +208,6 @@ #define MAX_ENV_FLAGS 5 -#define EOS_PARANOIA(ca)ca[sizeof(ca)-1] = '\0' -#define EOS_PARANOIA_SIZE(cp, size) cp[size-1] = '\0' - /* **
cvs commit: apache-1.3 STATUS
rse 98/03/02 06:32:33 Modified:.STATUS Log: Because real hacker's have nothing do to: fill the `Committed Code Changes' to make Ken happy ;-) (and update the available votes) Revision ChangesPath 1.167 +49 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- STATUS1998/03/02 12:07:35 1.166 +++ STATUS1998/03/02 14:32:33 1.167 @@ -19,17 +19,61 @@ Showstoppers: Committed Code Changes: +* Dean's `const'-change to os_is_path_absolute(). +* Security patch for UserDir /abspath without a * in the path. PR#1701 +* Dean's cleanup of race conditions in Unix child_main +* Dean's fixes for better handling of various errors from select() and + accept() in child_main(). PR#1747, 1107, 588, 1787, 987, 588 +* Dean's add of -lm to LIBS for HPUX. PR#1639 +* Ralf's remove of obsolete dist.tar target from Makefile.tmpl +* Dean's fixes for some inconsistencies in Files semantics. PR#1817 +* Dean's Files is not permitted within Location. PR#379 +* Dean's and Martin's fix of /Files +* Fix for mod_mime_magic error messages. PR#1827 +* Workaround for using RLIMIT_AS for the RLimitMEM directive. PR#1816 +* Doug's patch to bind a process to a single processor under AIX +* Martin's patch for mod_info to fix HTML markup +* Martin's changes to the check_cmd_context() function +* Patch for the ap_cpystrn() off-by-1 error +* Dean's fix for multiple UserDir problem introduced during 1.3b4-dev. +* Dean's fix to problems with absoluteURIs. +* Dean's patch to use SA_RESETHAND or SA_ONESHOT for coredump handlers. +* Patch to recognize FreeBSD versions. PR#1450 +* Workaround in mod_status for NeXT's running not m68k chips +* Fix for -X situation to honor the SIGINT or SIGQUIT signals +* Patch to hide Proxy-Authorization from CGI/SSI/etc +* Ralf's new ProxyPassReverse directive for mod_proxy +* Ralf's add of new RewriteMap types: rnd and int. PR#1631 +* Fix regex handling for mod_setenvif BrowserMatch command. PR#1825 +* Ralf's fix for assumptions on the username characters in mod_rewrite +* Paul's merge of os/win32/mod_dll.c into modules/standard/mod_so.c +* Paul's patch for reading the server-root from the NT registry +* Ralf's fix for locking of `RewriteMap' programs. PR#1029 +* Dean's fix for the `config with no Port setting' situation +* Ralf's fix for `RewriteMap' program handling. PR#1431 +* Ralf's fix for the initialization of RewriteLogLevel. PR#1325 +* Ralf's mod_rewrite meta-construct expansion inconsistency fix +* Martin's new URI parsing stuff (the source module main/util_uri.c) +* New `%a' construct for LogFormat and CustomLog. PR#1885 +* Ralf's `Rule HIDE' feature for hiding the symbol namespace +* Make \\ behave as expected. +* Fix for poly directive in image maps. PR#1771 +* Reduce memory usage, and speed up ServerAlias support. PR#1531 +* Dean's cleanup of code in http_vhost.c and vhost-stuff in mod_rewrite.c +* Dean's rewrite of absoluteURI handling vhost matching +* Dean's new mod_test_util_uri.c Available Patches: -* Ralf's [PATCH] Config File Line Continuation (take 2) -[EMAIL PROTECTED] +* Ralf's [PATCH] Config File Line Continuation (take 3) +[EMAIL PROTECTED] (this version uses strict matching of the backslash, i.e. no trailing spaces are allowed - this should be now avoid problems) Status: Ralf +1 Martin +1 (on concept) -Dean +1 (on concept) -Dean -1? (because of RAW_ARGS issues) +Dean +1 (on concept, but -1? because of RAW_ARGS issues?) + Dirk-Willem van Gulik +1 + Jim +1 * M.D.Parker's [PATCH] mod_status/1448: Status Information have version [EMAIL PROTECTED] @@ -47,6 +91,7 @@ Jim +1(for 1.3.1 on concept) Jim -1(for 1.3.0 because too late) Randy -1 (too late for 1.3 in general) +Ken -1(for 1.3.0 in general) * Dean's [PRE-PATCH] expanding ap_snprintf() [EMAIL PROTECTED]
cvs commit: apache-1.3/src Configure
rse 98/03/01 04:56:03
Modified:src Configure
Log:
Make display more consequent:
All other + .. messages start with a lower case...
Revision ChangesPath
1.192 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- Configure 1998/02/28 15:39:28 1.191
+++ Configure 1998/03/01 12:56:02 1.192
@@ -825,7 +825,7 @@
#contain modules we want to build from both AddModule and Module
#lines
-echo + Adding selected modules
+echo + adding selected modules
MODFILES=`awk $tmpfile '$1 == AddModule { printf %s , $2 }'`
MODDIRS=`awk $tmpfile '
cvs commit: apache-1.3/src/modules/standard mod_log_config.c
rse 98/02/28 00:12:50
Modified:src CHANGES
htdocs/manual/mod mod_log_config.html
src/modules/standard mod_log_config.c
Log:
Add %a to mod_log_config for inserting the remote IP-address. This is the
adapted patch against 1.3 of Todd Eigenschink [EMAIL PROTECTED]'s original
patch for 1.2.5. For 1.2.5 we don't want it because its a feature. I also
added corresponding entries to the CHANGES and mod_log_config.html file.
Submitted by: Todd Eigenschink [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
Revision ChangesPath
1.672 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -r1.671 -r1.672
--- CHANGES 1998/02/27 15:15:13 1.671
+++ CHANGES 1998/02/28 08:12:46 1.672
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) Add the `%a' construct to LogFormat and CustomLog to log the client IP
+ address. [Todd Eigenschink [EMAIL PROTECTED], PR#1885]
+
*) For testing purposes, I added a new source called main/util_uri.c;
It contains a routine parse_uri_components_regex() and friends which
tries to break an URI into its parts. These parts are stored in a new
1.24 +1 -0 apache-1.3/htdocs/manual/mod/mod_log_config.html
Index: mod_log_config.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_log_config.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_log_config.html 1998/02/05 20:04:53 1.23
+++ mod_log_config.html 1998/02/28 08:12:48 1.24
@@ -110,6 +110,7 @@
%...f: Filename
%...{FOOBAR}e: The contents of the environment variable FOOBAR
%...h: Remote host
+%...a: Remote IP-address
%...{Foobar}i: The contents of Foobar: header line(s) in the request
sent to the server.
%...l: Remote logname (from identd, if supplied)
1.45 +9 -0 apache-1.3/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_config.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mod_log_config.c 1998/02/27 15:15:28 1.44
+++ mod_log_config.c 1998/02/28 08:12:49 1.45
@@ -117,6 +117,7 @@
* %...{FOOBAR}e: The contents of the environment variable FOOBAR
* %...f: filename
* %...h: remote host
+ * %...a: remote IP-address
* %...{Foobar}i: The contents of Foobar: header line(s) in the request
* sent to the client.
* %...l: remote logname (from identd, if supplied)
@@ -276,6 +277,11 @@
REMOTE_NAME);
}
+static char *log_remote_address(request_rec *r, char *a)
+{
+return r-connection-remote_ip;
+}
+
static char *log_remote_logname(request_rec *r, char *a)
{
return (char *) get_remote_logname(r);
@@ -432,6 +438,9 @@
{
'h', log_remote_host, 0
+},
+{
+'a', log_remote_address, 0
},
{
'l', log_remote_logname, 0
cvs commit: apache-1.3/src/helpers UpdateHide
rse 98/02/28 07:39:38 Modified:src CHANGES Configuration.tmpl Configure Makefile.tmpl buildmark.c src/include conf.h src/main fnmatch.c src/os/bs2000 ebcdic.c os-inline.c src/os/unix os-inline.c os.c src/os/emx os-inline.c Added: src/include hide.h src/helpers UpdateHide Log: Take in the new HIDE feature to avoid namespace conflicts by using Rule HIDE=yes in the Configuration file. Basically this patch adds a pre-generated include/hide.h file and the helpers/UpdateHide script for updating it when new functions are added. All other changes were just to make sure the conf.h file is really included (which itself includes hide.h if HIDE is defined), because we need the redefinition list everywhere to hide every function. Submitted by: Ralf S. Engelschall Reviewed by: Jim Jagielski, Dean Gaudet, Martin Kraemer, Ralf S. Engelschall Revision ChangesPath 1.673 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.672 retrieving revision 1.673 diff -u -r1.672 -r1.673 --- CHANGES 1998/02/28 08:12:46 1.672 +++ CHANGES 1998/02/28 15:39:25 1.673 @@ -1,5 +1,9 @@ Changes with Apache 1.3b6 + *) Add `Rule HIDE' to Configuration to hide the Apache symbol + namespace from conflicting with third-party libraries some + modules force to be linked with Apache. [Ralf S. Engelschall] + *) Add the `%a' construct to LogFormat and CustomLog to log the client IP address. [Todd Eigenschink [EMAIL PROTECTED], PR#1885] 1.80 +6 -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.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- Configuration.tmpl1998/02/03 11:20:13 1.79 +++ Configuration.tmpl1998/02/28 15:39:27 1.80 @@ -92,12 +92,18 @@ # is performing this function. If PARANOID is set to yes, it will # actually print-out the code that the modules execute # +# HIDE: +# This has no run-time penalty, but helps keep the Apache +# namespace from colliding with that used by other libraries +# pulled in by modules. +# Rule STATUS=yes Rule SOCKS4=no Rule IRIXNIS=no Rule IRIXN32=yes Rule PARANOID=no +Rule HIDE=no # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for 1.191 +8 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- Configure 1998/02/28 11:50:53 1.190 +++ Configure 1998/02/28 15:39:28 1.191 @@ -161,6 +161,7 @@ RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file` RULE_IRIXN32=`./helpers/CutRule IRIXN32 $file` RULE_PARANOID=`./helpers/CutRule PARANOID $file` +RULE_HIDE=`./helpers/CutRule HIDE $file` # Preset some constants; can be overridden on a per-platform basis below. @@ -915,6 +916,13 @@ REGLIB=regex/libregex.a SUBDIRS=$SUBDIRS regex CFLAGS=$CFLAGS -DUSE_HSREGEX +fi + +# +# Now the definition of HIDE if needed/wanted. +# +if [ $RULE_HIDE = yes ]; then +CFLAGS=$CFLAGS -DHIDE fi # create modules.c 1.80 +17 -1 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- Makefile.tmpl 1998/02/28 10:31:53 1.79 +++ Makefile.tmpl 1998/02/28 15:39:29 1.80 @@ -29,7 +29,7 @@ @false $(TARGET): subdirs modules.o - $(CC) -c $(CFLAGS) buildmark.c + $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) buildmark.c $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) -o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(LIBS) subdirs: @@ -61,6 +61,22 @@ for i in $(SUBDIRS); do \ ( cd $$i $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' depend ) || exit 1; \ done + +# We really don't expect end users to use this rule. It builds a +# httpd binary with all modules built in and then updates the +# include/hide.h file according to the exported symbols of this +# binary. So run this target once after
