cvs commit: apache-1.3/conf httpd.conf-dist
rse 00/02/20 23:30:46 Modified:conf httpd.conf-dist Log: Clarify that MultiViews is required for the automatic extension checks. Submitted by: Ian Kallen [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall Revision ChangesPath 1.55 +4 -3 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- httpd.conf-dist 2000/01/30 16:18:34 1.54 +++ httpd.conf-dist 2000/02/21 07:30:46 1.55 @@ -615,9 +615,10 @@ # HeaderName is the name of a file which should be prepended to # directory indexes. # -# The server will first look for name.html and include it if found. -# If name.html doesn't exist, the server will then look for name.txt -# and include it as plaintext if found. +# If MultiViews are amongst the Options in effect, the server will +# first look for name.html and include it if found. If name.html +# doesn't exist, the server will then look for name.txt and include +# it as plaintext if found. # ReadmeName README HeaderName HEADER
cvs commit: apache-1.3/htdocs/manual/mod mod_rewrite.html
rse 00/02/20 23:35:36 Modified:htdocs/manual/mod mod_rewrite.html Log: Documentation fixes do not harm anyone, so I feel free to commit this English cleanup to the mod_rewrite documentation although we're in code freeze state. But we should now really kick out the 1.3.12 baby. We're already behind the proposed dates... Submitted by: G.W. Haywood [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall Revision ChangesPath 1.49 +132 -133 apache-1.3/htdocs/manual/mod/mod_rewrite.html Index: mod_rewrite.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- mod_rewrite.html 2000/02/05 11:44:06 1.48 +++ mod_rewrite.html 2000/02/21 07:35:35 1.49 @@ -81,13 +81,13 @@ P 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. +(CODE.htaccess/CODE) and can even 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 But all this functionality and flexibility has its drawback: complexity. So -don't expect to understand this module in its whole in just one day. +don't expect to understand this entire module in just one day. P This module was invented and originally written in April 1996BR @@ -152,46 +152,46 @@ First you have to understand that when Apache processes a HTTP request it does this in phases. A hook for each of these phases is provided by the Apache API. Mod_rewrite uses two of these hooks: the URL-to-filename translation hook -which is used after the HTTP request was read and before any authorization +which is used after the HTTP request has been read but before any authorization starts and the Fixup hook which is triggered after the authorization phases -and after the per-directory config files (CODE.htaccess/CODE) where read, -but before the content handler is activated. +and after the per-directory config files (CODE.htaccess/CODE) have been +read, but before the content handler is activated. P So, after a request comes in and Apache has determined the corresponding -server (or virtual server) the rewriting engine start processing of all +server (or virtual server) the rewriting engine starts processing of all mod_rewrite directives from the per-server configuration in the URL-to-filename phase. A few steps later when the final data directories are found, the per-directory configuration directives of mod_rewrite are triggered -in the Fixup phase. In both situations mod_rewrite either rewrites URLs to new +in the Fixup phase. In both situations mod_rewrite rewrites URLs either to new URLs or to filenames, although there is no obvious distinction between them. -This is a usage of the API which was not intended this way when the API +This is a usage of the API which was not intended to be this way when the API was designed, but as of Apache 1.x this is the only way mod_rewrite can operate. To make this point more clear remember the following two points: OL -LIThe API currently provides only a URL-to-filename hook. Although -mod_rewrite rewrites URLs to URLs, URLs to filenames and even -filenames to filenames. In Apache 2.0 the two missing hooks -will be added to make the processing more clear. But this -point has no drawbacks for the user, it is just a fact which -should be remembered: Apache does more in the URL-to-filename hook -then the API intends for it. +LIAlthough mod_rewrite rewrites URLs to URLs, URLs to filenames and +even filenames to filenames, the API currently provides only a +URL-to-filename hook. In Apache 2.0 the two missing hooks will be +added to make the processing more clear. But this point has no +drawbacks for the user, it is just a fact which should be +remembered: Apache does more in the URL-to-filename hook than the +API intends for it. P LIUnbelievably mod_rewrite provides URL manipulations in per-directory -context, EMi.e./EM, within CODE.htaccess/CODE files, although -these are -reached a very long time after the URLs were translated to filenames (this -has to be this way, because CODE.htaccess/CODE files stay in the -filesystem, so processing has already been reached this stage of -processing). In other words: According to the API phases at this time it -is too late for any URL manipulations. To overcome this chicken and egg -problem mod_rewrite uses a trick: When you manipulate a URL/filename in -per-directory
cvs commit: apache-1.3 STATUS
rse 00/02/16 11:56:03 Modified:.STATUS Log: IMHO these PRs should be considered before kicking out 1.3.12... Revision ChangesPath 1.804 +3 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.803 retrieving revision 1.804 diff -u -r1.803 -r1.804 --- STATUS2000/02/13 17:41:30 1.803 +++ STATUS2000/02/16 19:56:02 1.804 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/02/13 17:41:30 $] + Last modified at [$Date: 2000/02/16 19:56:02 $] Release: @@ -27,7 +27,8 @@ RELEASE SHOWSTOPPERS: -* NONE !! * +* general/5766: AddDefaultCharset bug with CGI scripts + general/5760: Use of text type t in fopen call... RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
cvs commit: apache-1.3/htdocs/manual/misc rewriteguide.html
rse 00/02/11 00:58:29 Modified:htdocs/manual/misc rewriteguide.html Log: Change /a to /A to be consistent with remaining layout. Thanks to Martin for hint. Revision ChangesPath 1.7 +5 -5 apache-1.3/htdocs/manual/misc/rewriteguide.html Index: rewriteguide.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/rewriteguide.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rewriteguide.html 2000/02/10 16:53:00 1.6 +++ rewriteguide.html 2000/02/11 08:58:28 1.7 @@ -29,13 +29,13 @@ P This document supplements the mod_rewrite A -HREF=../mod/mod_rewrite.htmlreference documentation/a. It describes +HREF=../mod/mod_rewrite.htmlreference documentation/A. It describes how one can use Apache's mod_rewrite to solve typical URL-based problems webmasters are usually confronted with in practice. I give detailed descriptions on how to solve each problem by configuring URL rewriting rulesets. -H2A name=ToC1Introduction to mod_rewrite/a/H2 +H2A name=ToC1Introduction to mod_rewrite/A/H2 The Apache module mod_rewrite is a killer one, i.e. it is a really sophisticated module which provides a powerful way to do URL manipulations. @@ -50,7 +50,7 @@ of its power. This paper tries to give you a few initial success events to avoid the first case by presenting already invented solutions to you. -H2A name=ToC2Practical Solutions/a/H2 +H2A name=ToC2Practical Solutions/A/H2 Here come a lot of practical solutions I've either invented myself or collected from other peoples solutions in the past. Feel free to learn the @@ -724,7 +724,7 @@ DTSTRONGDescription:/STRONG DD Do you know the great CPAN (Comprehensive Perl Archive Network) under A -HREF=http://www.perl.com/CPAN;http://www.perl.com/CPAN/a? This does a +HREF=http://www.perl.com/CPAN;http://www.perl.com/CPAN/A? This does a redirect to one of several FTP servers around the world which carry a CPAN mirror and is approximately near the location of the requesting client. Actually this can be called an FTP access multiplexing service. While CPAN @@ -1084,7 +1084,7 @@ P A sophisticated DNS-based method for load-balancing is to use the program CODElbnamed/CODE which can be found at A -HREF=http://www.stanford.edu/~schemers/docs/lbnamed/lbnamed.html;http://www.stanford.edu/~schemers/docs/lbnamed/lbnamed.html/a. +HREF=http://www.stanford.edu/~schemers/docs/lbnamed/lbnamed.html;http://www.stanford.edu/~schemers/docs/lbnamed/lbnamed.html/A. It is a Perl 5 program in conjunction with auxilliary tools which provides a real load-balancing for DNS.
cvs commit: apache-1.3/htdocs/manual/misc rewriteguide.html
rse 00/02/10 08:24:28
Modified:htdocs/manual/misc rewriteguide.html
Log:
Fix typos.
Submitted by: Howard Jones [EMAIL PROTECTED]
PR: 5733
Revision ChangesPath
1.2 +2 -2 apache-1.3/htdocs/manual/misc/rewriteguide.html
Index: rewriteguide.html
===
RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/rewriteguide.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rewriteguide.html 2000/01/08 14:50:14 1.1
+++ rewriteguide.html 2000/02/10 16:24:26 1.2
@@ -1378,7 +1378,7 @@
DTSTRONGDescription:/STRONG
DD
Here comes a really esoteric feature: Dynamically generated but statically
-served pages, i.e. pages should be delivered as pur static pages (read from
+served pages, i.e. pages should be delivered as pure static pages (read from
the filesystem and just passed through), but they have to be generated
dynamically by the webserver if missing. This way you can have CGI-generated
pages which are statically unless one (or a cronjob) removes the static
@@ -1391,7 +1391,7 @@
PTABLE BGCOLOR=#E0E5F5 BORDER=0 CELLSPACING=0
CELLPADDING=5TRTDPRE
RewriteCond %{REQUEST_FILENAME} b!-s/b
-RewriteCond ^page\.bhtml/b$ page.bcgi/b
[T=application/x-httpd-cgi,L]
+RewriteRule ^page\.bhtml/b$ page.bcgi/b
[T=application/x-httpd-cgi,L]
/PRE/TD/TR/TABLE
P
cvs commit: apache-1.3/htdocs/manual/misc rewriteguide.html
rse 00/02/10 08:35:50 Modified:htdocs/manual/misc rewriteguide.html Log: Cleanup my old physical HTML markup into a logical one to fit better into the Apache documentation. Revision ChangesPath 1.3 +179 -179 apache-1.3/htdocs/manual/misc/rewriteguide.html Index: rewriteguide.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/rewriteguide.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rewriteguide.html 2000/02/10 16:24:26 1.2 +++ rewriteguide.html 2000/02/10 16:35:48 1.3 @@ -28,14 +28,14 @@ /DIV P -This document supplements the mod_rewrite a -href=../mod/mod_rewrite.htmlreference documentation/a. It describes +This document supplements the mod_rewrite A +HREF=../mod/mod_rewrite.htmlreference documentation/a. It describes how one can use Apache's mod_rewrite to solve typical URL-based problems webmasters are usually confronted with in practice. I give detailed descriptions on how to solve each problem by configuring URL rewriting rulesets. -H2a name=ToC1Introduction to mod_rewrite/a/H2 +H2A name=ToC1Introduction to mod_rewrite/a/H2 The Apache module mod_rewrite is a killer one, i.e. it is a really sophisticated module which provides a powerful way to do URL manipulations. @@ -50,7 +50,7 @@ of its power. This paper tries to give you a few initial success events to avoid the first case by presenting already invented solutions to you. -H2a name=ToC2Practical Solutions/a/H2 +H2A name=ToC2Practical Solutions/a/H2 Here come a lot of practical solutions I've either invented myself or collected from other peoples solutions in the past. Feel free to learn the @@ -60,7 +60,7 @@ ATTENTION: Depending on your server-configuration it can be necessary to slightly change the examples for your situation, e.g. adding the [PT] flag when additionally using mod_alias and mod_userdir, etc. Or rewriting a ruleset -to fit in tt.htaccess/tt context instead of per-server context. Always try +to fit in CODE.htaccess/CODE context instead of per-server context. Always try to understand what a particular ruleset really does before you use it. It avoid problems. @@ -83,12 +83,12 @@ DD We do an external HTTP redirect for all non-canonical URLs to fix them in the location view of the Browser and for all subsequent requests. In the example -ruleset below we replace tt/~user/tt by the canonical tt/u/user/tt and -fix a missing trailing slash for tt/u/user/tt. +ruleset below we replace CODE/~user/CODE by the canonical CODE/u/user/CODE and +fix a missing trailing slash for CODE/u/user/CODE. PTABLE BGCOLOR=#E0E5F5 BORDER=0 CELLSPACING=0 CELLPADDING=5TRTDPRE -RewriteRule ^/b~/b([^/]+)/?(.*)/bu/b/$1/$2 [bR/b] -RewriteRule ^/([uge])/(b[^/]+/b)$ /$1/$2b//b [bR/b] +RewriteRule ^/STRONG~/STRONG([^/]+)/?(.*)/STRONGu/STRONG/$1/$2 [STRONGR/STRONG] +RewriteRule ^/([uge])/(STRONG[^/]+/STRONG)$ /$1/$2STRONG//STRONG [STRONGR/STRONG] /PRE/TD/TR/TABLE /DL @@ -126,26 +126,26 @@ DTSTRONGDescription:/STRONG DD Usually the DocumentRoot of the webserver directly relates to the URL -``tt//tt''. But often this data is not really of top-level priority, it is +``CODE//CODE''. But often this data is not really of top-level priority, it is perhaps just one entity of a lot of data pools. For instance at our Intranet -sites there are tt/e/www//tt (the homepage for WWW), tt/e/sww//tt (the +sites there are CODE/e/www//CODE (the homepage for WWW), CODE/e/sww//CODE (the homepage for the Intranet) etc. Now because the data of the DocumentRoot stays -at tt/e/www//tt we had to make sure that all inlined images and other +at CODE/e/www//CODE we had to make sure that all inlined images and other stuff inside this data pool work for subsequent requests. P DTSTRONGSolution:/STRONG DD -We just redirect the URL tt//tt to tt/e/www//tt. While is seems +We just redirect the URL CODE//CODE to CODE/e/www//CODE. While is seems trivial it is actually trivial with mod_rewrite, only. Because the typical -old mechanisms of URL iAliases/i (as provides by mod_alias and friends) -only used iprefix/i matching. With this you cannot do such a redirection +old mechanisms of URL EMAliases/EM (as provides by mod_alias and friends) +only used EMprefix/EM matching. With this you cannot do such a redirection because the DocumentRoot is a prefix of all URLs. With mod_rewrite it is really trivial: PTABLE BGCOLOR=#E0E5F5 BORDER=0 CELLSPACING=0 CELLPADDING=5TRTDPRE RewriteEngine on -RewriteRule b^/$/b /e/www/ [bR/b] +RewriteRule STRONG^/$/STRONG /e/www/ [STRONGR/STRONG] /PRE/TD/TR/TABLE /DL @@ -159,9 +159,9 @@ DD Every webmaster can sing a song about
cvs commit: apache-1.3/htdocs/manual/misc rewriteguide.html
rse 00/02/10 08:38:58 Modified:htdocs/manual/misc rewriteguide.html Log: Update old net.sw entry to avoid confusion by the reader. Revision ChangesPath 1.4 +5 -6 apache-1.3/htdocs/manual/misc/rewriteguide.html Index: rewriteguide.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/rewriteguide.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rewriteguide.html 2000/02/10 16:35:48 1.3 +++ rewriteguide.html 2000/02/10 16:38:57 1.4 @@ -354,14 +354,13 @@ drwxrwxr-x 10 netsw users512 Jul 9 14:08 X11/ /PREP -In July 1996 I decided to make this 350 MB archive public to the world via a -nice Web interface (A HREF=http://net.sw.engelschall.com/net.sw/;CODE -http://net.sw.engelschall.com/net.sw//CODE/a). Nice means that I wanted to -offer a interface where you can browse directly through the archive hierarchy. +In July 1996 I decided to make this archive public to the world via a +nice Web interface. Nice means that I wanted to +offer an interface where you can browse directly through the archive hierarchy. And nice means that I didn't wanted to change anything inside this hierarchy - not even by putting some CGI scripts at the top of it. Why? Because the above structure should be later accessible via FTP as well, and I didn't -want any Web or CGI stuuf to be there. +want any Web or CGI stuff to be there. P DTSTRONGSolution:/STRONG @@ -390,7 +389,7 @@ real STRONGEMnet.sw/EM/STRONG stuff and gets automatically updated via CODErdist/CODE from time to time. - The second part of the problem remains: how to link these two structures +The second part of the problem remains: how to link these two structures together into one smooth-looking URL tree? We want to hide the CODEDATA//CODE directory from the user while running the appropriate CGI scripts for the various URLs.
cvs commit: apache-1.3/htdocs/manual/misc rewriteguide.html
rse 00/02/10 08:44:06 Modified:htdocs/manual/misc rewriteguide.html Log: Make sure we don't receive another PR where a user tried to take the solutions exactly as written down without noticing that they usually always have to be adjusted for local contexts. Revision ChangesPath 1.5 +2 -0 apache-1.3/htdocs/manual/misc/rewriteguide.html Index: rewriteguide.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/rewriteguide.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rewriteguide.html 2000/02/10 16:38:57 1.4 +++ rewriteguide.html 2000/02/10 16:43:57 1.5 @@ -57,12 +57,14 @@ black magic of URL rewriting from these examples. P +TABLE BGCOLOR=#FFE0E0 BORDER=0 CELLSPACING=0 CELLPADDING=5TRTD ATTENTION: Depending on your server-configuration it can be necessary to slightly change the examples for your situation, e.g. adding the [PT] flag when additionally using mod_alias and mod_userdir, etc. Or rewriting a ruleset to fit in CODE.htaccess/CODE context instead of per-server context. Always try to understand what a particular ruleset really does before you use it. It avoid problems. +/TD/TR/TABLE H1URL Layout/H1
cvs commit: apache-1.3/htdocs/manual/misc rewriteguide.html
rse 00/02/10 08:53:08 Modified:htdocs/manual/misc rewriteguide.html Log: One more fix. Thanks to Eric Cholet [EMAIL PROTECTED] Revision ChangesPath 1.6 +1 -1 apache-1.3/htdocs/manual/misc/rewriteguide.html Index: rewriteguide.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/rewriteguide.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rewriteguide.html 2000/02/10 16:43:57 1.5 +++ rewriteguide.html 2000/02/10 16:53:00 1.6 @@ -1382,7 +1382,7 @@ served pages, i.e. pages should be delivered as pure static pages (read from the filesystem and just passed through), but they have to be generated dynamically by the webserver if missing. This way you can have CGI-generated -pages which are statically unless one (or a cronjob) removes the static +pages which are statically served unless one (or a cronjob) removes the static contents. Then the contents gets refreshed. P
cvs commit: apache-1.3/src/support apxs.pl
rse 00/02/06 05:16:02
Modified:src CHANGES
src/support apxs.pl
Log:
Fix handling of multiple queries in APXS commands (e.g. apxs -q
CC CFLAGS) and make sure Perl-related command line options (which
can contain the :: constructs) do no longer cause an incorrect
internal parsing of the query result.
Submitted by: Ralf S. Engelschall
Hints by: Steve Robb [EMAIL PROTECTED]
Revision ChangesPath
1.1512+6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1511
retrieving revision 1.1512
diff -u -r1.1511 -r1.1512
--- CHANGES 2000/02/05 14:28:54 1.1511
+++ CHANGES 2000/02/06 13:15:59 1.1512
@@ -1,5 +1,11 @@
Changes with Apache 1.3.12
+ *) Fix handling of multiple queries in APXS commands (e.g. apxs -q
+ CC CFLAGS) and make sure Perl-related command line options (which
+ can contain the :: constructs) do no longer cause an incorrect
+ internal parsing of the query result.
+ [Ralf S. Engelschall, Steve Robb [EMAIL PROTECTED]]
+
*) Avoid infinite looping in APACI's configure script
inside Ultrix' /bin/sh5 upgrade step.
[Jan Gallo [EMAIL PROTECTED], Ralf S. Engelschall] PR#4940
1.32 +3 -3 apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- apxs.pl 1999/12/16 16:10:30 1.31
+++ apxs.pl 2000/02/06 13:16:02 1.32
@@ -297,7 +297,7 @@
)) {
if ($arg eq $name or $arg eq lc($name)) {
my $val = eval \$CFG_$name;
-$result .= ${val}::;
+$result .= ${val}##;
$ok = 1;
}
}
@@ -306,8 +306,8 @@
exit(1);
}
}
-$result =~ s|::$||;
-$result =~ s|::| |;
+$result =~ s|##$||;
+$result =~ s|##| |g;
print $result;
}
cvs commit: apache-1.3/src/support ab.c
rse 00/02/05 01:50:57
Modified:src/support ab.c
Log:
Typo
Revision ChangesPath
1.38 +3 -3 apache-1.3/src/support/ab.c
Index: ab.c
===
RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ab.c 1999/12/10 11:03:40 1.37
+++ ab.c 2000/02/05 09:50:54 1.38
@@ -81,7 +81,7 @@
**- Cleaned up by Ralf S. Engelschall [EMAIL PROTECTED], March 1998
**- POST and verbosity by Kurt Sussman [EMAIL PROTECTED], August
1998
**- HTML table output added by David N. Welton [EMAIL PROTECTED],
January 1999
- **- Added Cookie, Arbitrary header and auth support. [EMAIL
PROTECTED], April 199
+ **- Added Cookie, Arbitrary header and auth support. [EMAIL
PROTECTED], April 1999
**
*/
@@ -884,14 +884,14 @@
static void copyright(void)
{
if (!use_html) {
- printf(This is ApacheBench, Version %s\n, VERSION $Revision: 1.37
$ apache-1.3);
+ printf(This is ApacheBench, Version %s\n, VERSION $Revision: 1.38
$ apache-1.3);
printf(Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/\n;);
printf(Copyright (c) 1998-1999 The Apache Group,
http://www.apache.org/\n;);
printf(\n);
}
else {
printf(p\n);
- printf( This is ApacheBench, Version %s ilt;%sgt;/i
apache-1.3br\n, VERSION, $Revision: 1.37 $);
+ printf( This is ApacheBench, Version %s ilt;%sgt;/i
apache-1.3br\n, VERSION, $Revision: 1.38 $);
printf( Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/br\n);
printf( Copyright (c) 1998-1999 The Apache Group,
http://www.apache.org/br\n);
printf(/p\np\n);
cvs commit: apache-1.3 configure
rse 00/02/05 01:57:16 Modified:.configure Log: Fix usage: it's '#-1' and not just '-1' Revision ChangesPath 1.118 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- configure 2000/02/04 23:09:52 1.117 +++ configure 2000/02/05 09:57:15 1.118 @@ -444,7 +444,7 @@ echo --without-confadjust disable the user/situation adjustments in config echo --without-execstripdisable the stripping of executables on installation echo --server-uid=UID set the user ID the web server should run as [nobody] -echo --server-gid=GID set the group ID the web server UID is a memeber of [-1] +echo --server-gid=GID set the group ID the web server UID is a memeber of [#-1] echo echo suEXEC options: echo --enable-suexecenable the suEXEC feature
cvs commit: apache-1.3/htdocs/manual/mod mod_mime.html
rse 00/02/05 03:34:38 Modified:htdocs/manual/mod mod_mime.html Log: Enhance AddCharset description. Submitted by: Youichirou Koga [EMAIL PROTECTED] PR: 5554 Revision ChangesPath 1.35 +5 -5 apache-1.3/htdocs/manual/mod/mod_mime.html Index: mod_mime.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_mime.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- mod_mime.html 2000/01/08 19:57:29 1.34 +++ mod_mime.html 2000/02/05 11:34:36 1.35 @@ -139,12 +139,12 @@ /pre P -Then the document samp.ja.jis/samp will be treated as being a +Then the document CODE.ja.jis/CODE will be treated as being a Japanese document whose charset is ISO-2022-JP (as will the document -samp.jis.ja/samp). Although the content charset is reported to -the client, the browser is unlikely to use this information. The -AddCharset directive is more useful for -A HREF=../content-negotiation.htmlcontent negotiation/A, where +CODE.jis.ja/CODE). The AddCharset directive is useful for both +to inform the client about the character encoding of the document so +that the document can be interpreted and displayed appropriately, and +for A HREF=../content-negotiation.htmlcontent negotiation/A, where the server returns one from several documents based on the client's charset preference. /P
cvs commit: apache-1.3/htdocs/manual/vhosts ip-based.html
rse 00/02/05 03:39:55 Modified:htdocs/manual/vhosts ip-based.html Log: Make clear that there are more directives which are actually not allowed in VirtualHost sections. Submitted by: sehh [EMAIL PROTECTED] PR: 5596 Revision ChangesPath 1.6 +3 -2 apache-1.3/htdocs/manual/vhosts/ip-based.html Index: ip-based.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/vhosts/ip-based.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ip-based.html 1998/02/05 20:05:16 1.5 +++ ip-based.html 2000/02/05 11:39:54 1.6 @@ -119,8 +119,9 @@ A HREF=../mod/core.html#listenListen/A, A HREF=../mod/core.html#pidfilePidFile/A, A HREF=../mod/mod_mime.html#typesconfigTypesConfig/A, -A HREF=../mod/core.html#serverrootServerRoot/A and -A HREF=../mod/core.html#namevirtualhostNameVirtualHost/A. +A HREF=../mod/core.html#serverrootServerRoot/A, +A HREF=../mod/core.html#namevirtualhostNameVirtualHost/A +and a few other directives. P A HREF=../mod/core.html#userUser/A and A HREF=../mod/core.html#groupGroup/A may be used inside a VirtualHost
cvs commit: apache-1.3/htdocs/manual/mod mod_rewrite.html
rse 00/02/05 03:44:07 Modified:htdocs/manual/mod mod_rewrite.html Log: Fix description of regex quantifiers. Submitted by: Carl van Tast [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 5614 Revision ChangesPath 1.48 +1 -1 apache-1.3/htdocs/manual/mod/mod_rewrite.html Index: mod_rewrite.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- mod_rewrite.html 2000/01/08 14:50:12 1.47 +++ mod_rewrite.html 2000/02/05 11:44:06 1.48 @@ -1364,7 +1364,7 @@ STRONGQuantifiers:/STRONG STRONGCODE?/CODE/STRONG 0 or 1 of the preceding text - STRONGCODE*/CODE/STRONG 0 or N of the preceding text (N gt; 1) + STRONGCODE*/CODE/STRONG 0 or N of the preceding text (N gt; 0) STRONGCODE+/CODE/STRONG 1 or N of the preceding text (N gt; 1) STRONGGrouping:/STRONG
cvs commit: apache-1.3/src/main http_main.c
rse 00/02/05 04:01:55
Modified:src CHANGES
src/main http_main.c
Log:
Cast integer ap_wait_t values in http_main.c to get rid of compile time
errors on platforms where ap_wait_t is not defined as int (currently
only the NEXT and UTS21 platforms). If you've a better non-evil-cast
solution, feel free to adjust this again.
Submitted by: Gary Bickford [EMAIL PROTECTED], Ralf S. Engelschall
Reviewed by: Ralf S. Engelschall
PR: 5053
Revision ChangesPath
1.1508+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1507
retrieving revision 1.1508
diff -u -r1.1507 -r1.1508
--- CHANGES 2000/02/05 01:32:32 1.1507
+++ CHANGES 2000/02/05 12:01:48 1.1508
@@ -1,5 +1,10 @@
Changes with Apache 1.3.12
+ *) Cast integer ap_wait_t values in http_main.c to get rid of compile
+ time errors on platforms where ap_wait_t is not defined as int
+ (currently only the NEXT and UTS21 platforms).
+ [Gary Bickford [EMAIL PROTECTED], Ralf S. Engelschall] PR#5053
+
*) The default suexec path was HTTPD_ROOT/sbin/suexec if not
configured via APACI. Changed to HTTPD_ROOT/bin/suexec.
[Lars Eilebrecht]
1.491 +5 -5 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- http_main.c 2000/01/26 20:10:38 1.490
+++ http_main.c 2000/02/05 12:01:52 1.491
@@ -1585,7 +1585,7 @@
for (pocr = other_children; *pocr; pocr = (*pocr)-next) {
if ((*pocr)-data == data) {
nocr = (*pocr)-next;
- (*(*pocr)-maintenance) (OC_REASON_UNREGISTER, (*pocr)-data, -1);
+ (*(*pocr)-maintenance) (OC_REASON_UNREGISTER, (*pocr)-data,
(ap_wait_t)-1);
*pocr = nocr;
/* XXX: um, well we've just wasted some space in pconf ? */
return;
@@ -1641,7 +1641,7 @@
continue;
if (FD_ISSET(ocr-write_fd, writable_fds))
continue;
- (*ocr-maintenance) (OC_REASON_UNWRITABLE, ocr-data, -1);
+ (*ocr-maintenance) (OC_REASON_UNWRITABLE, ocr-data, (ap_wait_t)-1);
}
}
@@ -2460,16 +2460,16 @@
waitret = waitpid(ocr-pid, status, WNOHANG);
if (waitret == ocr-pid) {
ocr-pid = -1;
- (*ocr-maintenance) (OC_REASON_DEATH, ocr-data, status);
+ (*ocr-maintenance) (OC_REASON_DEATH, ocr-data,
(ap_wait_t)status);
}
else if (waitret == 0) {
- (*ocr-maintenance) (OC_REASON_RESTART, ocr-data, -1);
+ (*ocr-maintenance) (OC_REASON_RESTART, ocr-data,
(ap_wait_t)-1);
++not_dead_yet;
}
else if (waitret == -1) {
/* uh what the heck? they didn't call unregister? */
ocr-pid = -1;
- (*ocr-maintenance) (OC_REASON_LOST, ocr-data, -1);
+ (*ocr-maintenance) (OC_REASON_LOST, ocr-data, (ap_wait_t)-1);
}
}
#endif
cvs commit: apache-1.3/src/modules/standard mod_auth.c mod_status.c mod_cern_meta.c
rse 00/02/05 04:33:17
Modified:src CHANGES
src/modules/standard mod_auth.c mod_status.c mod_cern_meta.c
Log:
Make implementation/descriptions of the FLAG directives
AuthAuthoritative, MetaFiles and ExtendedStatus consistent with
documentation and the standard way of implementation those directives.
Submitted by: David MacKenzie [EMAIL PROTECTED], Ralf S. Engelschall
Reviewed by: Ralf S. Engelschall
PR: 5642
Revision ChangesPath
1.1509+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -r1.1508 -r1.1509
--- CHANGES 2000/02/05 12:01:48 1.1508
+++ CHANGES 2000/02/05 12:33:13 1.1509
@@ -1,5 +1,10 @@
Changes with Apache 1.3.12
+ *) Make implementation/descriptions of the FLAG directives
+ AuthAuthoritative, MetaFiles and ExtendedStatus consistent with
+ documentation and the standard way of implementation those directives.
+ [David MacKenzie [EMAIL PROTECTED], Ralf S. Engelschall] PR#5642
+
*) Cast integer ap_wait_t values in http_main.c to get rid of compile
time errors on platforms where ap_wait_t is not defined as int
(currently only the NEXT and UTS21 platforms).
1.48 +1 -1 apache-1.3/src/modules/standard/mod_auth.c
Index: mod_auth.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mod_auth.c1999/08/02 20:50:22 1.47
+++ mod_auth.c2000/02/05 12:33:15 1.48
@@ -110,7 +110,7 @@
{AuthAuthoritative, ap_set_flag_slot,
(void *) XtOffsetOf(auth_config_rec, auth_authoritative),
OR_AUTHCFG, FLAG,
- Set to 'no' to allow access control to be passed along to lower
modules if the UserID is not known to this module},
+ Set to 'off' to allow access control to be passed along to lower
modules if the UserID is not known to this module},
{NULL}
};
1.112 +3 -8 apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- mod_status.c 2000/02/02 20:44:06 1.111
+++ mod_status.c 2000/02/05 12:33:16 1.112
@@ -135,24 +135,19 @@
*command-related code. This is here to prevent use of ExtendedStatus
* without status_module included.
*/
-static const char *set_extended_status(cmd_parms *cmd, void *dummy, char
*arg)
+static const char *set_extended_status(cmd_parms *cmd, void *dummy, int arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return err;
}
-if (!strcasecmp(arg, off) || !strcmp(arg, 0)) {
- ap_extended_status = 0;
-}
-else {
- ap_extended_status = 1;
-}
+ap_extended_status = arg;
return NULL;
}
static const command_rec status_module_cmds[] =
{
-{ ExtendedStatus, set_extended_status, NULL, RSRC_CONF, TAKE1,
+{ ExtendedStatus, set_extended_status, NULL, RSRC_CONF, FLAG,
\On\ to enable extended status information, \Off\ to disable },
{NULL}
};
1.38 +2 -2 apache-1.3/src/modules/standard/mod_cern_meta.c
Index: mod_cern_meta.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_cern_meta.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_cern_meta.c 1999/10/21 20:45:17 1.37
+++ mod_cern_meta.c 2000/02/05 12:33:16 1.38
@@ -169,7 +169,7 @@
typedef struct {
char *metadir;
char *metasuffix;
-char *metafiles;
+int metafiles;
} cern_meta_dir_config;
static void *create_cern_meta_dir_config(pool *p, char *dummy)
@@ -210,7 +210,7 @@
return NULL;
}
-static const char *set_metafiles(cmd_parms *parms, cern_meta_dir_config *
dconf, char *arg)
+static const char *set_metafiles(cmd_parms *parms, cern_meta_dir_config *
dconf, int arg)
{
dconf-metafiles = arg;
return NULL;
cvs commit: apache-1.3/src/main http_config.c
rse 00/01/15 08:40:42 Modified:src CHANGES src/main http_config.c Log: Fixed parsing of TAKE13-based configuration directives. Submitted by: Steffen Roller [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 5550 Revision ChangesPath 1.1499+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1498 retrieving revision 1.1499 diff -u -r1.1498 -r1.1499 --- CHANGES 2000/01/14 09:15:22 1.1498 +++ CHANGES 2000/01/15 16:40:40 1.1499 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) Fixed parsing of TAKE13-based configuration directives. + [Steffen Roller [EMAIL PROTECTED]] PR#5550 + *) rename the lookup() function to hashTableLookup() (in expat-lite) to prevent name clashes with modules / third-party software. [Ralf S. Engelschall, Greg Stein] 1.150 +1 -1 apache-1.3/src/main/http_config.c Index: http_config.c === RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- http_config.c 2000/01/01 17:07:34 1.149 +++ http_config.c 2000/01/15 16:40:42 1.150 @@ -881,7 +881,7 @@ w2 = *args ? ap_getword_conf(parms-pool, args) : NULL; w3 = *args ? ap_getword_conf(parms-pool, args) : NULL; - if (*w == '\0' || (*w2 !w3) || *args != 0) + if (*w == '\0' || (w2 *w2 !w3) || *args != 0) return ap_pstrcat(parms-pool, cmd-name, takes one or three arguments, cmd-errmsg ? , : NULL, cmd-errmsg, NULL);
cvs commit: apache-1.3/htdocs/manual/misc rewriteguide.html
rse 00/01/08 06:50:16 Modified:src CHANGES htdocs/manual index.html htdocs/manual/mod mod_rewrite.html Added: htdocs/manual/misc rewriteguide.html Log: Make our nitpicking and complaining guys happy: Added the mod_rewrite `URL Rewriting Guide' to the online documentation (htdocs/manual/misc/rewriteguide.html). This paper provides a large collection of practical solutions to URL based problems a webmaster is often confronted with. This version of the text was translated from my WML source on my website and my old official version is now discarded. So, as it was requested, this can be treated as an official donation of this text to the ASF. This way the ASF is now the official owner of this text. - - - IRONIC Be happy and give Ken and Jim the credit for achieving this by being such sensitive and friendly to other developers like me and always reminding us that it is such contemptuous to implicitly promote ones name by writing free software and contributing to projects like Apache. Sorry that I have forgotten to donate this piece of text to the ASF in the past and instead added such a contemptible hyperlink directing to a page on www.engelschall.com. I hope this is now fixed and the closed and holy ASF world is rescued again. /IRONIC PERSONAL I think, I don't have to say that I'm more than angry and disappointed how developers like me are constantly bashed in the ASF... we can go for it also in the future, but we should stop looking astonished all the time if we find out that too less people contribute to the ASF and old developers like me no longer have a warm feeling here, please. It's our own fault in thinking that contributions are for free and anonymous just because our project is a group effort. IMHO we already have forgotten the golden rule of Open Source development: if one wants happy and long-term contributing developers one especially has to make sure they receive the requested credit. There is an upper limit a project can accept to give, of course. But credit always has to depend on the amount, quality _and_ duration of contribution and IMHO cannot be judged by stating that just all people are equal and so some contributors can be bashed for the fact that their name occurs more often. It is correct that my name occurs more often caused by the fact that I always try to bring in my stuff to the project. But keep in mind that this is because I _HAVE_ stuff to bring in which I've created _OUTSIDE_ the project. So I think its unfair to bash me just because I try harder to bring in my additional stuff. If a developer has not much externally created stuff, he cannot bring it in to the project, of course. But just because one has more externally created stuff and tries to bring it in, is IMHO no reason and excuse to bash him for this. It's not my fault that I write in my freetime more Open Source packages like most of you. So if you dislike stuff developers want to bring in, decide on the contribution based on fair technical arguments (pros and cons). But don't judge the contributions all the time just because you think this way you promote someone (be it RSE, GNU or whoever else). Hell, an Open Source project is not a group of people to rule their own closed world and be celebrated in the press for this. It's still an effort to create the best piece of _software_ money can't buy. So you should stop thinking about contributors as our enemy. They are the main driving force of every project, although some people seem to not understand this at all. And whatever you think about my personal opinion, but IMHO it's not bad for a project if someone's name is promoted with it, too. What is actually bad are those complains and discussions which make developers angry and the fact that they result in even less contributions. /PERSONAL Revision ChangesPath 1.1489+6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1488 retrieving revision 1.1489 diff -u -r1.1488 -r1.1489 --- CHANGES 2000/01/01 17:07:32 1.1488 +++ CHANGES 2000/01/08 14:50:05 1.1489 @@ -1,5 +1,11 @@ Changes with Apache 1.3.10 + *) Added the mod_rewrite `URL Rewriting Guide' to the online + documentation (htdocs/manual/misc/rewriteguide.html). This paper + provides a large collection of practical solutions to URL based + problems a webmaster is often confronted with. + [Ralf S. Engelschall] + *) Add a suexec status report to the '-l' (compiled-in modules) output. [Ken Coar] 1.30 +1 -0 apache-1.3/htdocs/manual/index.html Index: index.html
cvs commit: apache-1.3 config.layout
rse 99/12/28 01:12:36 Modified:src CHANGES .config.layout Log: Add also BSDI layout. Submitted by: Timur Bakeyev [EMAIL PROTECTED]] PR: 5154 Revision ChangesPath 1.1486+3 -2 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1485 retrieving revision 1.1486 diff -u -r1.1485 -r1.1486 --- CHANGES 1999/12/21 07:52:53 1.1485 +++ CHANGES 1999/12/28 09:12:33 1.1486 @@ -11,8 +11,9 @@ *) Updated README.config to reflect current APACI state. [Brian Slesinsky [EMAIL PROTECTED]] PR#5397 - *) Added SuSE layout to config.layout for convinience reasons. - [Sebastian Helms [EMAIL PROTECTED]] PR#5112 + *) Added SuSE and BSDI layouts to config.layout for convinience reasons. + [Sebastian Helms [EMAIL PROTECTED], Timur Bakeyev + [EMAIL PROTECTED]] PR#5112 PR#5154 *) Consistency cleanup of the complete APXS tool and corresponding manpage. [Ralf S. Engelschall] 1.12 +20 -0 apache-1.3/config.layout Index: config.layout === RCS file: /home/cvs/apache-1.3/config.layout,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- config.layout 1999/12/17 22:23:07 1.11 +++ config.layout 1999/12/28 09:12:35 1.12 @@ -170,3 +170,23 @@ proxycachedir: $localstatedir/cache/httpd /Layout +# BSD/OS layout +Layout BSDI +prefix:/var/www +exec_prefix: /usr/contrib +bindir:$exec_prefix/bin +sbindir: $exec_prefix/bin +libexecdir:$exec_prefix/libexec/apache +mandir:$exec_prefix/man +sysconfdir:$prefix/conf +datadir: $prefix +iconsdir: $datadir/icons +htdocsdir: $datadir/htdocs +cgidir:$datadir/cgi-bin +includedir:$exec_prefix/include/apache +localstatedir: /var +runtimedir:$localstatedir/run +logfiledir:$localstatedir/log/httpd +proxycachedir: $localstatedir/proxy +/Layout +
cvs commit: apache-1.3 config.layout
rse 99/12/17 14:23:08 Modified:src CHANGES .config.layout Log: Added SuSE layout to config.layout for convinience reasons. Submitted by: Sebastian Helms [EMAIL PROTECTED] PR: 5112 Revision ChangesPath 1.1482+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1481 retrieving revision 1.1482 diff -u -r1.1481 -r1.1482 --- CHANGES 1999/12/16 16:10:25 1.1481 +++ CHANGES 1999/12/17 22:22:59 1.1482 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) Added SuSE layout to config.layout for convinience reasons. + [Sebastian Helms [EMAIL PROTECTED]] PR#5112 + *) Consistency cleanup of the complete APXS tool and corresponding manpage. [Ralf S. Engelschall] 1.11 +20 -0 apache-1.3/config.layout Index: config.layout === RCS file: /home/cvs/apache-1.3/config.layout,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- config.layout 1999/07/29 18:12:43 1.10 +++ config.layout 1999/12/17 22:23:07 1.11 @@ -150,3 +150,23 @@ proxycachedir: $localstatedir/proxy /Layout +# SuSE 6.x layout +Layout SuSE +prefix:/usr +exec_prefix: $prefix +bindir:$prefix/bin +sbindir: $prefix/sbin +libexecdir:$prefix/lib/apache +mandir:$prefix/man +sysconfdir:/etc/httpd +datadir: /usr/local/httpd +iconsdir: $datadir/icons +htdocsdir: $datadir/htdocs +cgidir:$datadir/cgi-bin +includedir:$prefix/include/apache +localstatedir: /var +runtimedir:$localstatedir/run +logfiledir:$localstatedir/log/httpd +proxycachedir: $localstatedir/cache/httpd +/Layout +
cvs commit: apache-1.3 README.configure
rse 99/12/17 14:25:18 Modified:src CHANGES .README.configure Log: Updated README.config to reflect current APACI state. Submitted by: rian Slesinsky [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 5397 Revision ChangesPath 1.1483+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1482 retrieving revision 1.1483 diff -u -r1.1482 -r1.1483 --- CHANGES 1999/12/17 22:22:59 1.1482 +++ CHANGES 1999/12/17 22:25:11 1.1483 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) Updated README.config to reflect current APACI state. + [Brian Slesinsky [EMAIL PROTECTED]] PR#5397 + *) Added SuSE layout to config.layout for convinience reasons. [Sebastian Helms [EMAIL PROTECTED]] PR#5112 1.19 +10 -10apache-1.3/README.configure Index: README.configure === RCS file: /home/cvs/apache-1.3/README.configure,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- README.configure 1999/02/07 18:05:33 1.18 +++ README.configure 1999/12/17 22:25:17 1.19 @@ -64,27 +64,27 @@ $ make install This builds Apache 1.3 with the standard set of enabled modules - (automatically determined from src/Configuration.tmpl) with a GNU-conforming - subdirectory layout under /path/to/apache. For using the old Apache 1.2 - subdirectory layout additionally use the --compat option: + (automatically determined from src/Configuration.tmpl) with an Apache 1.2 + conforming subdirectory layout under /path/to/apache. For using the GNU + style subdirectory layout additionally use the --with-layout=GNU option: -$ ./configure --compat --prefix=/path/to/apache +$ ./configure --with-layout=GNU --prefix=/path/to/apache $ make $ make install If you are not sure which directory layout you want, you can use the - --layout option. It displays the directory layout which would be used but - immediately exits without configuring anything. Examples: + --show-layout option. It displays the directory layout which would be used + but immediately exits without configuring anything. Examples: -$ ./configure --layout -$ ./configure --prefix=/path/to/apache --layout -$ ./configure --compat --prefix=/path/to/apache --layout +$ ./configure --show-layout +$ ./configure --prefix=/path/to/apache --show-layout +$ ./configure --with-layout=GNU --prefix=/path/to/apache --show-layout Additionally if some of the shown paths still don't fit for your particular situation, you can use the --bindir, --sbindir, --libexecdir, --mandir, --sysconfdir, --datadir, --localstatedir, --runtimedir, --logfiledir and --proxycachedir options to adjust the layout as required. Always check with - --layout the resulting directory layout which would be used for + --show-layout the resulting directory layout which would be used for installation. suEXEC support
cvs commit: apache-1.3/src/support apxs.pl apxs.8
rse 99/12/16 08:10:31
Modified:src CHANGES
src/support apxs.pl apxs.8
Log:
Consistency cleanup of the complete APXS tool and corresponding manpage
after the numerous small recent changes.
Revision ChangesPath
1.1481+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1480
retrieving revision 1.1481
diff -u -r1.1480 -r1.1481
--- CHANGES 1999/12/15 23:04:07 1.1480
+++ CHANGES 1999/12/16 16:10:25 1.1481
@@ -1,5 +1,8 @@
Changes with Apache 1.3.10
+ *) Consistency cleanup of the complete APXS tool and corresponding manpage.
+ [Ralf S. Engelschall]
+
*) Add %q logging format directive (logs ? and the query string part
of a query, or the empty string if no query).
Can be used in combination with %m, %U and %H: %m %U%q %H is the
1.31 +65 -69apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- apxs.pl 1999/12/07 00:03:24 1.30
+++ apxs.pl 1999/12/16 16:10:30 1.31
@@ -68,18 +68,18 @@
## Configuration
##
-my $CFG_TARGET= '@TARGET@';# substituted via
Makefile.tmpl
-my $CFG_CC= '@CC@';# substituted via
Makefile.tmpl
-my $CFG_CFLAGS= '@CFLAGS@';# substituted via
Makefile.tmpl
-my $CFG_CFLAGS_SHLIB = '@CFLAGS_SHLIB@'; # substituted via
Makefile.tmpl
-my $CFG_LD_SHLIB = '@LD_SHLIB@'; # substituted via
Makefile.tmpl
-my $CFG_LDFLAGS_SHLIB = q(@LDFLAGS_MOD_SHLIB@);# substituted via
Makefile.tmpl
-my $CFG_LIBS_SHLIB= '@LIBS_SHLIB@';# substituted via
Makefile.tmpl
-my $CFG_PREFIX= '@prefix@';# substituted via APACI
install
-my $CFG_SBINDIR = '@sbindir@'; # substituted via APACI
install
-my $CFG_INCLUDEDIR= '@includedir@';# substituted via APACI
install
-my $CFG_LIBEXECDIR= '@libexecdir@';# substituted via APACI
install
-my $CFG_SYSCONFDIR= '@sysconfdir@';# substituted via APACI
install
+my $CFG_TARGET= q(@TARGET@);# substituted via
Makefile.tmpl
+my $CFG_CC= q(@CC@);# substituted via
Makefile.tmpl
+my $CFG_CFLAGS= q(@CFLAGS@);# substituted via
Makefile.tmpl
+my $CFG_CFLAGS_SHLIB = q(@CFLAGS_SHLIB@); # substituted via
Makefile.tmpl
+my $CFG_LD_SHLIB = q(@LD_SHLIB@); # substituted via
Makefile.tmpl
+my $CFG_LDFLAGS_SHLIB = q(@LDFLAGS_MOD_SHLIB@); # substituted via
Makefile.tmpl
+my $CFG_LIBS_SHLIB= q(@LIBS_SHLIB@);# substituted via
Makefile.tmpl
+my $CFG_PREFIX= q(@prefix@);# substituted via APACI
install
+my $CFG_SBINDIR = q(@sbindir@); # substituted via APACI
install
+my $CFG_INCLUDEDIR= q(@includedir@);# substituted via APACI
install
+my $CFG_LIBEXECDIR= q(@libexecdir@);# substituted via APACI
install
+my $CFG_SYSCONFDIR= q(@sysconfdir@);# substituted via APACI
install
##
## Cleanup the above stuff
@@ -127,10 +127,10 @@
last;
}
$pos = index($argumentative,$first);
-if($pos = $[) {
-if($args[$pos+1] eq ':') {
+if ($pos = $[) {
+if ($args[$pos+1] eq ':') {
shift(@ARGV);
-if($rest eq '') {
+if ($rest eq '') {
unless (@ARGV) {
print STDERR apxs:Error: Incomplete option: $first
(needs an argument)\n;
++$errs;
@@ -141,7 +141,7 @@
}
elsif ($args[$pos+1] eq '+') {
shift(@ARGV);
-if($rest eq '') {
+if ($rest eq '') {
unless (@ARGV) {
print STDERR apxs:Error: Incomplete option: $first
(needs an argument)\n;
++$errs;
@@ -152,7 +152,7 @@
}
else {
eval \$opt_$first = 1;
-if($rest eq '') {
+if ($rest eq '') {
shift(@ARGV);
}
else {
@@ -163,7 +163,7 @@
else {
print STDERR apxs:Error: Unknown option: $first\n;
++$errs;
-if($rest ne '') {
+if ($rest ne '') {
$ARGV[0] = -$rest;
}
else {
@@ -197,39 +197,37 @@
my $name = 'unknown';
$name = $opt_n if ($opt_n ne
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 99/12/04 03:43:19
Modified:src CHANGES
src/modules/standard mod_rewrite.c
Log:
Fixed a recently introduced off-by-one-character bug in
mod_rewrite's expansion of expression back-references.
Submitted by: Cliff Woolley [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
PR: 4766, 5389
Revision ChangesPath
1.1469+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1468
retrieving revision 1.1469
diff -u -r1.1468 -r1.1469
--- CHANGES 1999/12/01 22:10:39 1.1468
+++ CHANGES 1999/12/04 11:43:12 1.1469
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) Fixed a recently introduced off-by-one-character bug in
+ mod_rewrite's expansion of expression back-references.
+ [Cliff Woolley [EMAIL PROTECTED]] PR#4766 PR#5389
+
*) Add IndexOptions DescriptionWidth so that the width of the
description field in fancy-indexed directory listings can
be specified.
1.153 +1 -1 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- mod_rewrite.c 1999/11/26 19:43:50 1.152
+++ mod_rewrite.c 1999/12/04 11:43:17 1.153
@@ -2513,7 +2513,7 @@
/* now apply the standard regex substitution function */
ap_cpystrn(buf, ap_pregsub(p, buf, bri-source,
- bri-nsub+0, bri-regmatch), nbuf);
+ bri-nsub+1, bri-regmatch), nbuf);
/* restore the original $N and backrefs */
for (i = 0; buf[i] != '\0' i nbuf; i++) {
cvs commit: apache-1.3 configure
rse 99/11/28 03:10:53 Modified:src CHANGES .configure Log: Made `tr' usage in top-level configure script more portable by always using square brackets consistently. Submitted by: Masashi Kizaki [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 5230 Revision ChangesPath 1.1447+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1446 retrieving revision 1.1447 diff -u -r1.1446 -r1.1447 --- CHANGES 1999/11/28 10:55:28 1.1446 +++ CHANGES 1999/11/28 11:10:48 1.1447 @@ -1,4 +1,8 @@ Changes with Apache 1.3.10 + + *) Made `tr' usage in top-level configure script more portable + by always using square brackets consistently. + [Masashi Kizaki [EMAIL PROTECTED]] PR#5230 *) Fixed ap_config_auto.h generation in src/Configure: there for the ``quad integer'' stuff ``#ifndef+#undef+#endif'' pairs were generated instead of 1.107 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- configure 1999/11/17 19:12:45 1.106 +++ configure 1999/11/28 11:10:52 1.107 @@ -257,7 +257,7 @@ for rule in `grep '^Rule' $src/Configuration.tmpl`; do rule=`echo $rule | sed -e 's/^Rule[]*//'` name=`echo $rule | sed -e 's/=.*$//'` -namelow=`echo $name | tr 'A-Z' 'a-z'` +namelow=`echo $name | tr '[A-Z]' '[a-z]'` arg=`echo $rule | sed -e 's/^.*=//'` eval rule_$namelow=$arg rules=$rules:$namelow
cvs commit: apache-1.3 configure
rse 99/11/28 03:17:58 Modified:src CHANGES .configure Log: Made stripping of a trailing slash in directory names in top-level configure script more robust and this way support also a plain `/' as the argument without resulting in an empty name. PR: 5291 Revision ChangesPath 1.1448+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1447 retrieving revision 1.1448 diff -u -r1.1447 -r1.1448 --- CHANGES 1999/11/28 11:10:48 1.1447 +++ CHANGES 1999/11/28 11:17:50 1.1448 @@ -1,4 +1,9 @@ Changes with Apache 1.3.10 + + *) Made stripping of a trailing slash in directory names in top-level + configure script more robust and this way support also a plain `/' + as the argument without resulting in an empty name. + [Matthias Lohmann [EMAIL PROTECTED]] PR#5291 *) Made `tr' usage in top-level configure script more portable by always using square brackets consistently. 1.108 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- configure 1999/11/28 11:10:52 1.107 +++ configure 1999/11/28 11:17:57 1.108 @@ -1038,7 +1038,7 @@ localstatedir runtimedir logfiledir proxycachedir \ suexec_docroot suexec_logexec; do eval val=\\$$var\; -val=`echo $val | sed -e 's:/*$::'` +val=`echo $val | sed -e 's:\(.\)/*$:\1:'` eval $var=\$val\ # expand value eval val=\$$var
cvs commit: apache-1.3/src/helpers GuessOS
rse 99/11/28 03:24:27
Modified:src CHANGES
src/helpers GuessOS
Log:
Replaced pipes with commas in GuessOS' fallback output (displayed for not
explicitly recognized platforms) to avoid side-effects with APACI's --shadow
feature and similar uses where GuessOS' output is used directly on the
filesystem (where pipes are meta-characters!).
Submitted by: Paul Gilmartin [EMAIL PROTECTED]
Adjusted and reviewed by: Ralf S. Engelschall
PR: 5303
Revision ChangesPath
1.1449+6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1448
retrieving revision 1.1449
diff -u -r1.1448 -r1.1449
--- CHANGES 1999/11/28 11:17:50 1.1448
+++ CHANGES 1999/11/28 11:24:25 1.1449
@@ -1,4 +1,10 @@
Changes with Apache 1.3.10
+
+ *) Replaced pipes with commas in GuessOS' fallback output (displayed for
not
+ explicitly recognized platforms) to avoid side-effects with APACI's
+ --shadow feature and similar uses where GuessOS' output is used directly
+ on the filesystem (where pipes are meta-characters!).
+ [Paul Gilmartin [EMAIL PROTECTED]] PR#5303
*) Made stripping of a trailing slash in directory names in top-level
configure script more robust and this way support also a plain `/'
1.64 +1 -1 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- GuessOS 1999/08/09 07:38:44 1.63
+++ GuessOS 1999/11/28 11:24:27 1.64
@@ -326,5 +326,5 @@
# At this point we gone through all the one's
# we know of: Punt
-echo ${MACHINE}-whatever-${SYSTEM}|${RELEASE}|${VERSION}
+echo ${MACHINE}-whatever-${SYSTEM},${RELEASE},${VERSION}
exit 0
cvs commit: apache-1.3/htdocs/manual install.html
rse 99/11/28 03:38:58 Modified:src CHANGES htdocs/manual install.html Log: Fixed typo in htdocs/manual/install.html. Submitted by: Chris Pepper [EMAIL PROTECTED] PR: 5360 Revision ChangesPath 1.1451+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1450 retrieving revision 1.1451 diff -u -r1.1450 -r1.1451 --- CHANGES 1999/11/28 11:36:51 1.1450 +++ CHANGES 1999/11/28 11:38:56 1.1451 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) Fixed typo in htdocs/manual/install.html. + [Chris Pepper [EMAIL PROTECTED]] PR#5360 + *) Fix $AWK/awk usage in top-level configure script: We confused ourself and replaced the wrong $AWK with a plain awk in the last releases. So we now both fix this and move the comment which already tried to explain it 1.27 +1 -1 apache-1.3/htdocs/manual/install.html Index: install.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/install.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- install.html 1999/04/27 08:26:55 1.26 +++ install.html 1999/11/28 11:38:58 1.27 @@ -215,7 +215,7 @@ If when you run CODEhttpd/CODE it complained about being unable to bind to an address, then either some other process is already using the port you have configured Apache to use, or you are running httpd -as a normal user but trying to use port below 1024 (such as the +as a normal user but trying to use a port below 1024 (such as the default port 80). P
cvs commit: apache-1.3/htdocs/manual/mod directives.html
rse 99/11/28 04:14:22 Modified:src CHANGES htdocs/manual/mod directives.html Log: Added missing links to htdocs/manual/mod/directives.html for AllowCONNECT and ProxyDomain. Submitted by: Patrik Grip-Jansson [EMAIL PROTECTED], Ralf S. Engelschall Reviewed by: Ralf S. Engelschall PR: 5319 Revision ChangesPath 1.1453+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1452 retrieving revision 1.1453 diff -u -r1.1452 -r1.1453 --- CHANGES 1999/11/28 11:41:53 1.1452 +++ CHANGES 1999/11/28 12:14:18 1.1453 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) Added missing links to htdocs/manual/mod/directives.html + for AllowCONNECT and ProxyDomain. [Patrik Grip-Jansson + [EMAIL PROTECTED], Ralf S. Engelschall] PR#5319 + *) Fixed typo in htdocs/manual/install.html. [Chris Pepper [EMAIL PROTECTED]] PR#5360 1.59 +2 -0 apache-1.3/htdocs/manual/mod/directives.html Index: directives.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- directives.html 1999/06/24 16:38:34 1.58 +++ directives.html 1999/11/28 12:14:21 1.59 @@ -44,6 +44,7 @@ LIA HREF=mod_alias.html#aliasAlias/A LIA HREF=mod_alias.html#aliasmatchAliasMatch/A LIA HREF=mod_access.html#allowallow/A +LIA HREF=mod_proxy.html#allowconnectAllowCONNECT/A LIA HREF=core.html#allowoverrideAllowOverride/A LIA HREF=mod_auth_anon.html#anonymousAnonymous/A LIA HREF=mod_auth_anon.html#AuthoritativeAnonymous_Authoritative/A @@ -155,6 +156,7 @@ LIA HREF=core.html#pidfilePidFile/A LIA HREF=core.html#portPort/A LIA HREF=mod_proxy.html#proxyblockProxyBlock/A +LIA HREF=mod_proxy.html#proxydomainProxyDomain/A LIA HREF=mod_proxy.html#proxypassProxyPass/A LIA HREF=mod_proxy.html#proxypassreverseProxyPassReverse/A LIA HREF=mod_proxy.html#proxyreceivebuffersizeProxyReceiveBufferSize/A
cvs commit: apache-1.3/src/include ap_config.h
rse 99/11/28 04:28:06 Modified:src CHANGES src/include ap_config.h Log: Removed the variable name template from a prototype for SunOS4 in ap_config.h to make C++ compiler happy, too. Submitted by: SAKAI Kiyotaka [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 5363 Revision ChangesPath 1.1454+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1453 retrieving revision 1.1454 diff -u -r1.1453 -r1.1454 --- CHANGES 1999/11/28 12:14:18 1.1453 +++ CHANGES 1999/11/28 12:28:02 1.1454 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) Removed the variable name template from a prototype for SunOS4 + in ap_config.h to make C++ compiler happy, too. + [SAKAI Kiyotaka [EMAIL PROTECTED]] PR#5363 + *) Added missing links to htdocs/manual/mod/directives.html for AllowCONNECT and ProxyDomain. [Patrik Grip-Jansson [EMAIL PROTECTED], Ralf S. Engelschall] PR#5319 1.273 +1 -1 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- ap_config.h 1999/10/28 17:57:28 1.272 +++ ap_config.h 1999/11/28 12:28:06 1.273 @@ -160,7 +160,7 @@ #undef NO_KILLPG #undef NO_SETSID char *crypt(const char *pw, const char *salt); -char *mktemp(char *template); +char *mktemp(char *); #define HAVE_MMAP 1 #define USE_MMAP_SCOREBOARD #define USE_MMAP_FILES
cvs commit: apache-1.3/src/modules/experimental mod_auth_digest.c
rse 99/11/28 04:42:01
Modified:src CHANGES
src/modules/experimental mod_auth_digest.c
Log:
Fixed mod_auth_digest.c: result of an open() call was being
checked against the wrong failure value.
Submitted by: Rick Ohnemus [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
PR: 5292
Revision ChangesPath
1.1455+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1454
retrieving revision 1.1455
diff -u -r1.1454 -r1.1455
--- CHANGES 1999/11/28 12:28:02 1.1454
+++ CHANGES 1999/11/28 12:41:54 1.1455
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) Fixed mod_auth_digest.c: result of an open() call was being
+ checked against the wrong failure value.
+ [Rick Ohnemus [EMAIL PROTECTED]] PR#5292
+
*) Removed the variable name template from a prototype for SunOS4
in ap_config.h to make C++ compiler happy, too.
[SAKAI Kiyotaka [EMAIL PROTECTED]] PR#5363
1.11 +1 -1 apache-1.3/src/modules/experimental/mod_auth_digest.c
Index: mod_auth_digest.c
===
RCS file: /home/cvs/apache-1.3/src/modules/experimental/mod_auth_digest.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_auth_digest.c 1999/09/19 21:28:34 1.10
+++ mod_auth_digest.c 1999/11/28 12:41:59 1.11
@@ -317,7 +317,7 @@
#ifdef DEV_RANDOM
#define XSTR(x) #x
#define STR(x) XSTR(x)
-if ((rnd = open(STR(DEV_RANDOM), O_RDONLY)) == NULL) {
+if ((rnd = open(STR(DEV_RANDOM), O_RDONLY)) == -1) {
ap_log_error(APLOG_MARK, APLOG_CRIT, s,
Digest: Couldn't open STR(DEV_RANDOM));
exit(EXIT_FAILURE);
cvs commit: apache-1.3/src/modules/standard mod_auth_db.c
rse 99/11/28 04:59:52
Modified:src CHANGES
src/modules/standard mod_auth_db.c
Log:
Added support for Berkeley-DB/3.x to mod_auth_db.
Submitted by: Steve Atkins [EMAIL PROTECTED]
Cleaned up and reviewed by: Ralf S. Engelschall
PR: 5382
Revision ChangesPath
1.1456+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1455
retrieving revision 1.1456
diff -u -r1.1455 -r1.1456
--- CHANGES 1999/11/28 12:41:54 1.1455
+++ CHANGES 1999/11/28 12:59:49 1.1456
@@ -1,4 +1,7 @@
Changes with Apache 1.3.10
+
+ *) Added support for Berkeley-DB/3.x to mod_auth_db.
+ [Steve Atkins [EMAIL PROTECTED], Ralf S. Engelschall] PR#5382
*) Fixed mod_auth_digest.c: result of an open() call was being
checked against the wrong failure value.
1.43 +12 -4 apache-1.3/src/modules/standard/mod_auth_db.c
Index: mod_auth_db.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mod_auth_db.c 1999/08/02 20:50:22 1.42
+++ mod_auth_db.c 1999/11/28 12:59:51 1.43
@@ -97,9 +97,14 @@
#include http_protocol.h
#include db.h
-#if defined(DB_VERSION_MAJOR) (DB_VERSION_MAJOR == 2)
+#if defined(DB_VERSION_MAJOR)
+#if (DB_VERSION_MAJOR == 2)
#define DB2
#endif
+#if (DB_VERSION_MAJOR == 3)
+#define DB3
+#endif
+#endif
typedef struct {
@@ -161,7 +166,10 @@
q.data = user;
q.size = strlen(q.data);
-#ifdef DB2
+#if defined(DB3)
+if ( db_create(f, NULL, 0) != 0
+|| f-open(f, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
+#elif defined(DB2)
if (db_open(auth_dbpwfile, DB_HASH, DB_RDONLY, 0664, NULL, NULL, f) !=
0) {
#else
if (!(f = dbopen(auth_dbpwfile, O_RDONLY, 0664, DB_HASH, NULL))) {
@@ -171,7 +179,7 @@
return NULL;
}
-#ifdef DB2
+#if defined(DB2) || defined(DB3)
if (!((f-get) (f, NULL, q, d, 0))) {
#else
if (!((f-get) (f, q, d, 0))) {
@@ -181,7 +189,7 @@
pw[d.size] = '\0'; /* Terminate the string */
}
-#ifdef DB2
+#if defined(DB2) || defined(DB3)
(f-close) (f, 0);
#else
(f-close) (f);
cvs commit: apache-1.3/src CHANGES Configure
rse 99/11/28 05:21:51 Modified:src CHANGES Configure Log: Fix SHARED_CORE feature for HPUX by backing-out a change (comitted between 1.3.7 and 1.3.9) which changed the DSO extension from `sl' to `so'. This worked only for modules (where we load the DSO manually), but horribly fails under HPUX for DSO-based/shared libraries (where our $SHLIB_SUFFIX_NAME is used, too). Submitted by: Gary Silverman [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 4974 Revision ChangesPath 1.1457+7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1456 retrieving revision 1.1457 diff -u -r1.1456 -r1.1457 --- CHANGES 1999/11/28 12:59:49 1.1456 +++ CHANGES 1999/11/28 13:21:47 1.1457 @@ -1,4 +1,11 @@ Changes with Apache 1.3.10 + + *) Fix SHARED_CORE feature for HPUX by backing-out a change (comitted + between 1.3.7 and 1.3.9) which changed the DSO extension from `sl' to + `so'. This worked only for modules (where we load the DSO manually), but + horribly fails under HPUX for DSO-based/shared libraries (where our + $SHLIB_SUFFIX_NAME is used, too). + [Gary Silverman [EMAIL PROTECTED]] PR#4974 *) Added support for Berkeley-DB/3.x to mod_auth_db. [Steve Atkins [EMAIL PROTECTED], Ralf S. Engelschall] PR#5382 1.375 +2 -0 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.374 retrieving revision 1.375 diff -u -r1.374 -r1.375 --- Configure 1999/11/28 10:55:28 1.374 +++ Configure 1999/11/28 13:21:48 1.375 @@ -1224,6 +1224,7 @@ LDFLAGS_SHLIB=-b LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred + SHLIB_SUFFIX_NAME=sl ;; *-hp-hpux10.*|*-hp-hpux11.*) case $CC in @@ -1233,6 +1234,7 @@ LDFLAGS_SHLIB=-b LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred -Wl,+s + SHLIB_SUFFIX_NAME=sl ;; *-ibm-aix*) case $CC in
cvs commit: apache-1.3/src/include ap_config.h
rse 99/11/28 05:28:08 Modified:src CHANGES src/include ap_config.h Log: Fixed NEXT/OpenStep building by adding an fallback typedef for rlim_t to ap_config.h. Submitted by: Mark Miller [EMAIL PROTECTED] PR: 4906 Revision ChangesPath 1.1458+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1457 retrieving revision 1.1458 diff -u -r1.1457 -r1.1458 --- CHANGES 1999/11/28 13:21:47 1.1457 +++ CHANGES 1999/11/28 13:28:05 1.1458 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) Fixed NEXT/OpenStep building by adding an fallback typedef for + rlim_t to ap_config.h. + [Mark Miller [EMAIL PROTECTED]] PR#4906 + *) Fix SHARED_CORE feature for HPUX by backing-out a change (comitted between 1.3.7 and 1.3.9) which changed the DSO extension from `sl' to `so'. This worked only for modules (where we load the DSO manually), but 1.274 +1 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- ap_config.h 1999/11/28 12:28:06 1.273 +++ ap_config.h 1999/11/28 13:28:07 1.274 @@ -350,6 +350,7 @@ #elif defined(NEXT) typedef unsigned short mode_t; +typedef int rlim_t; #define HAVE_GMTOFF 1 #undef NO_KILLPG #define NO_SETSID
cvs commit: apache-1.3/src/support dbmmanage
rse 99/11/28 05:37:53 Modified:src CHANGES src/support dbmmanage Log: Fixed error handling in dbmmanage script. Submitted by: Andrew McRae [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 4973 Revision ChangesPath 1.1459+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1458 retrieving revision 1.1459 diff -u -r1.1458 -r1.1459 --- CHANGES 1999/11/28 13:28:05 1.1458 +++ CHANGES 1999/11/28 13:37:50 1.1459 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) Fixed error handling in dbmmanage script. + [Andrew McRae [EMAIL PROTECTED]] PR#4973 + *) Fixed NEXT/OpenStep building by adding an fallback typedef for rlim_t to ap_config.h. [Mark Miller [EMAIL PROTECTED]] PR#4906 1.14 +1 -1 apache-1.3/src/support/dbmmanage Index: dbmmanage === RCS file: /home/cvs/apache-1.3/src/support/dbmmanage,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dbmmanage 1999/01/01 19:05:33 1.13 +++ dbmmanage 1999/11/28 13:37:53 1.14 @@ -91,7 +91,7 @@ my($mode, $flags) = $command =~ /^(?:view|check)$/ ? (0644, O_RDONLY) : (0644, O_RDWR|O_CREAT); -tie %DB, AnyDBM_File, $file, $flags, $mode || die Can't tie $file: $!; +tie (%DB, AnyDBM_File, $file, $flags, $mode) || die Can't tie $file: $!; dbmc-$command(); untie %DB;
cvs commit: apache-1.3/src/ap ap_snprintf.c
rse 99/11/28 05:51:54
Modified:src CHANGES
src/ap ap_snprintf.c
Log:
Fixed `quad integer' (aka `long long') handling in ap_snprintf.c
More details were described in my original posting two weeks ago:
---
Today (on my birthday ;) I've hacked on and cleaned up snprintf
implementations for a forthcoming string library and discovered the following
bug in ap_snprintf. If one tries to print a long long value which is just a
little bit lower than the maximimum unsigned long (not unsigned long
long!) value, ap_snprintf treats the value as a (signed) long instead of a
long long:
| $ cat test.c
| #include stdio.h
| #include ap_config.h
| #include ap.h
|
| int main(int argc, char *argv[])
| {
| char buf[1024];
|
| ap_snprintf(buf, sizeof(buf), %qd %qd, 4294967290ULL, 4294967297ULL);
| printf(ap_snprintf: \%s\\n, buf);
|
| sprintf(buf, %qd %qd, 4294967290ULL, 4294967297ULL);
| printf(sprintf: \%s\\n, buf);
| }
| $ cc -I../os/unix -I../include -o test test.c libap.a ./test
| ap_snprintf: -6 4294967297
| sprintf: 4294967290 4294967297
The reason is a wrong optimization test in ap_snprintf.c which
can be fixed this way:
Index: ap_snprintf.c
===
RCS file: /e/apache/REPOS/apache-1.3/src/ap/ap_snprintf.c,v
retrieving revision 1.37
diff -u -r1.37 ap_snprintf.c
--- ap_snprintf.c 1999/10/21 20:44:10 1.37
+++ ap_snprintf.c 1999/11/17 12:22:11
@@ -414,7 +413,7 @@
* If the value is less than the maximum unsigned long value,
* then we know we aren't using quads, so use the faster function
*/
-if (num = ULONG_MAX)
+if (num = ULONG_MAX is_unsigned)
return(conv_10( (wide_int)num, is_unsigned, is_negative,
buf_end, len));
With this patch ap_snprintf and the (FreeBSD) vendor sprintf print the same
values:
| $ cc -I../os/unix -I../include -o test test.c libap.a ./test
| ap_snprintf: 4294967290 4294967297
| sprintf: 4294967290 4294967297
I think the patch is correct, although I have to admit that because of time
I've not checked the whole quad-fiddling in ap_snprintf.c now. So I do not
commit this myself. Instead someone else should review this first.
---
Revision ChangesPath
1.1460+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1459
retrieving revision 1.1460
diff -u -r1.1459 -r1.1460
--- CHANGES 1999/11/28 13:37:50 1.1459
+++ CHANGES 1999/11/28 13:51:49 1.1460
@@ -1,5 +1,8 @@
Changes with Apache 1.3.10
+ *) Fixed `quad integer' (aka `long long') handling in ap_snprintf.c
+ [Ralf S. Engelschall]
+
*) Fixed error handling in dbmmanage script.
[Andrew McRae [EMAIL PROTECTED]] PR#4973
1.38 +1 -1 apache-1.3/src/ap/ap_snprintf.c
Index: ap_snprintf.c
===
RCS file: /home/cvs/apache-1.3/src/ap/ap_snprintf.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ap_snprintf.c 1999/10/21 20:44:10 1.37
+++ ap_snprintf.c 1999/11/28 13:51:54 1.38
@@ -414,7 +414,7 @@
* If the value is less than the maximum unsigned long value,
* then we know we aren't using quads, so use the faster function
*/
-if (num = ULONG_MAX)
+if (num = ULONG_MAX is_unsigned)
return(conv_10( (wide_int)num, is_unsigned, is_negative,
buf_end, len));
cvs commit: apache-1.3/src/ap ap_snprintf.c
rse 99/11/28 05:53:41 Modified:src/ap ap_snprintf.c Log: Remove a useless #define which was left over from xinetd days. Revision ChangesPath 1.39 +0 -1 apache-1.3/src/ap/ap_snprintf.c Index: ap_snprintf.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_snprintf.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ap_snprintf.c 1999/11/28 13:51:54 1.38 +++ ap_snprintf.c 1999/11/28 13:53:40 1.39 @@ -84,7 +84,6 @@ #define AP_LONGEST_LONG long #endif #define NUL '\0' -#define INT_NULL ((int *)0) #define WIDE_INT long #define WIDEST_INT AP_LONGEST_LONG
cvs commit: apache-1.3 configure
rse 99/11/28 06:15:37 Modified:src CHANGES .configure Log: Add --iconsdir, --htdocsdir, and --cgidir option to top-level configure script to allow one to override the corresponding variables from config.layout. Revision ChangesPath 1.1461+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1460 retrieving revision 1.1461 diff -u -r1.1460 -r1.1461 --- CHANGES 1999/11/28 13:51:49 1.1460 +++ CHANGES 1999/11/28 14:15:32 1.1461 @@ -1,5 +1,10 @@ Changes with Apache 1.3.10 + *) Add --iconsdir, --htdocsdir, and --cgidir option to top-level + configure script to allow one to override the corresponding + variables from config.layout. + [Ralf S. Engelschall] + *) Fixed `quad integer' (aka `long long') handling in ap_snprintf.c [Ralf S. Engelschall] 1.110 +12 -0 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- configure 1999/11/28 11:36:53 1.109 +++ configure 1999/11/28 14:15:35 1.110 @@ -628,6 +628,18 @@ datadir=$apc_optarg autosuffix_datadir=no ;; +--iconsdir=*) +iconsdir=$apc_optarg +autosuffix_iconsdir=no +;; +--htdocsdir=*) +htdocsdir=$apc_optarg +autosuffix_htdocsdir=no +;; +--cgidir=*) +cgidir=$apc_optarg +autosuffix_cgidir=no +;; --includedir=*) includedir=$apc_optarg autosuffix_includedir=no
cvs commit: apache-2.0/src/lib/apr/file_io/unix dir.c
rse 99/10/31 08:18:36
Modified:src/lib/apr/time/unix time.c
src/lib/apr/file_io/unix dir.c
Log:
Be careful, _POSIX_THREAD_SAFE_FUNCTIONS is a feature test macro, yes, but it
works by being either defined or not. It's not always defined and just has a
value 0 or not 0...
Revision ChangesPath
1.11 +2 -2 apache-2.0/src/lib/apr/time/unix/time.c
Index: time.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- time.c1999/10/19 19:21:22 1.10
+++ time.c1999/10/31 16:18:35 1.11
@@ -107,7 +107,7 @@
{
switch (type) {
case APR_LOCALTIME: {
-#if APR_HAS_THREADS _POSIX_THREAD_SAFE_FUNCTIONS
+#if APR_HAS_THREADS defined(_POSIX_THREAD_SAFE_FUNCTIONS)
localtime_r(atime-currtime-tv_sec, atime-explodedtime);
#else
atime-explodedtime = localtime(atime-currtime-tv_sec);
@@ -115,7 +115,7 @@
break;
}
case APR_UTCTIME: {
-#if APR_HAS_THREADS _POSIX_THREAD_SAFE_FUNCTIONS
+#if APR_HAS_THREADS defined(_POSIX_THREAD_SAFE_FUNCTIONS)
gmtime_r(atime-currtime-tv_sec, atime-explodedtime);
#else
atime-explodedtime = gmtime(atime-currtime-tv_sec);
1.14 +1 -1 apache-2.0/src/lib/apr/file_io/unix/dir.c
Index: dir.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dir.c 1999/10/23 21:23:20 1.13
+++ dir.c 1999/10/31 16:18:36 1.14
@@ -124,7 +124,7 @@
*/
ap_status_t ap_readdir(struct dir_t *thedir)
{
-#if APR_HAS_THREADS _POSIX_THREAD_SAFE_FUNCTIONS
+#if APR_HAS_THREADS defined(_POSIX_THREAD_SAFE_FUNCTIONS)
ap_status_t ret;
ret = readdir_r(thedir-dirstruct, thedir-entry, thedir-entry);
/* Avoid the Linux problem where at end-of-directory thedir-entry
cvs commit: apache-1.3/src/support ab.c
rse 99/10/27 00:12:46 Modified:src CHANGES src/support ab.c Log: Made sure ApacheBench (ab) performs no more requests than specified on command line (option -n). Submitted by: Jim Cox [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 4839 Revision ChangesPath 1.1438+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1437 retrieving revision 1.1438 diff -u -r1.1437 -r1.1438 --- CHANGES 1999/10/13 02:38:18 1.1437 +++ CHANGES 1999/10/27 07:12:40 1.1438 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) Made sure ApacheBench (ab) performs no more requests than + specified on command line (option -n). + [Jim Cox [EMAIL PROTECTED]] PR#4839 + *) Support DSOs properly on 32-bit HP-UX 11.0 [Dilip Khandekar [EMAIL PROTECTED]] 1.34 +2 -1 apache-1.3/src/support/ab.c Index: ab.c === RCS file: /home/cvs/apache-1.3/src/support/ab.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ab.c 1999/09/29 21:14:47 1.33 +++ ab.c 1999/10/27 07:12:44 1.34 @@ -536,7 +536,8 @@ } /* connected first time */ -write_request(c); +c-state = STATE_CONNECTING; +FD_SET(c-fd, writebits); } /* - */
cvs commit: apache-1.3/src/support apxs.pl
rse 99/10/27 00:22:50
Modified:src/support apxs.pl
Log:
Allow egcc and /path/to/gcc, too.
Revision ChangesPath
1.28 +1 -1 apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- apxs.pl 1999/09/05 18:04:42 1.27
+++ apxs.pl 1999/10/27 07:22:48 1.28
@@ -383,7 +383,7 @@
$opt = '';
my ($opt_Wl, $opt_L, $opt_l);
foreach $opt_Wl (@opt_W) {
- if($CFG_LD_SHLIB ne gcc) {
+ if ($CFG_LD_SHLIB !~ m/gcc$/) {
$opt .= $1 if ($opt_Wl =~ m|^\s*l,(.*)$|);
} else {
$opt .= -W$opt_Wl;
cvs commit: apache-1.3/src/support ab.8
rse 99/10/27 00:38:52 Modified:src CHANGES src/support ab.8 Log: Overhauled ApacheBench (ab) manpage ab.8. Submitted by: Simon Baldwin [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 5139 Revision ChangesPath 1.1439+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1438 retrieving revision 1.1439 diff -u -r1.1438 -r1.1439 --- CHANGES 1999/10/27 07:12:40 1.1438 +++ CHANGES 1999/10/27 07:38:45 1.1439 @@ -1,5 +1,8 @@ Changes with Apache 1.3.10 + *) Overhauled ApacheBench (ab) manpage ab.8. + [Simon Baldwin [EMAIL PROTECTED]] PR#5139 + *) Made sure ApacheBench (ab) performs no more requests than specified on command line (option -n). [Jim Cox [EMAIL PROTECTED]] PR#4839 1.8 +50 -50apache-1.3/src/support/ab.8 Index: ab.8 === RCS file: /home/cvs/apache-1.3/src/support/ab.8,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ab.8 1999/09/27 20:27:27 1.7 +++ ab.8 1999/10/27 07:38:51 1.8 @@ -1,5 +1,4 @@ -.TH ab 1 March 1998 -.\ $Id: ab.8,v 1.7 1999/09/27 20:27:27 dirkx Exp $ +.TH ab 1 October 1999 .\ Copyright (c) 1998-1999 The Apache Group. All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without @@ -104,111 +103,112 @@ .PP .SH DESCRIPTION .B ab -is a tool for benchmarking your Apache HyperText Transfer Protocol (HTTP) -server. It is designed to give you an impression on how performant is your -current Apache installation. This especially shows you how much requests per -time your Apache installation is capable to serve. +is a tool for benchmarking the performance of your Apache HyperText Transfer +Protocol (HTTP) server. It does this by giving you an indication of how +many requests per second your Apache installation can serve. .PP .SH OPTIONS .TP 12 .B \-k -Enable the HTTP KeepAlive feature, i.e. perform multiple requests within one -HTTP session instead. Default is no KeepAlive. +Enable the HTTP KeepAlive feature; that is, perform multiple requests +within one HTTP session. Default is no KeepAlive. .TP 12 .B \-i Use an HTTP 'HEAD' instead of the GET method. Cannot be mixed with POST. .TP 12 .BI \-n requests -Number of requests to perform for the benchmarking session. The default is to -just perform one single request which usually leads to not very representative -benchmarking results. +The number of requests to perform for the benchmarking session. The +default is to perform just one single request, which will not give +representative benchmarking results. .TP 12 .BI \-t timelimit -Seconds to max. spend for benchmarking. This implies -a -.B \-n -.B 5 -internally. Use this to benchmark the server within a fixed total amount of -time. Per default there is no timelimit. +The number of seconds to spend benchmarking. Using this option automatically +set the number of requests for the benchmarking session to 5. +Use this to benchmark the server for a fixed period of time. By +default, there is no timelimit. .TP 12 .BI \-c concurrency -Number of multiple requests per time to perform. -Default is one request per time. +The number of simultaneous requests to perform. The default is to +perform one HTTP request at at time, that is, no concurrency. .TP 12 .BI \-p POST file -File containing data to POST. +A file containing data that the program will send to the Apache server in +any HTTP POST requests. .TP 12 .BI \-A Authorization username:password -Supply BASIC Authentification credentials to the server. The username -and password are separated by a single ':' and send on the wire uuencoded. -The string is send regardless of wether the server needs it; (i.e. has -send an 401. Authentifcation needed). +Supply Basic Authentication credentials to the server. The username +and password are separated by a single ':', and sent as uuencoded data. +The string is sent regardless of whether the server needs it; that is, +has sent a 401 Authentication needed. .TP 12 .BI \-p Proxy-Authorization username:password -Supply BASIC Authentification credentials to a proxy en-route. The username -and password are separated by a single ':' and send on the wire uuencoded. -The string is send regardless of wether the proxy needs it; (i.e. has -send an 407 Proxy authentifcation needed). +Supply Basic Authentication credentials to a proxy en-route. The username +and password are separated by a single ':', and sent as uuencoded data. +The string is sent regardless of whether
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 99/10/27 00:56:24
Modified:src CHANGES
src/modules/standard mod_rewrite.c
Log:
Make sure mod_rewrite matches URL schemes case-insensitive and also allow
additional (commonly used) URL schemes ldap:, news: and mailto:.
Requested by: Klaus Johannes Rusch [EMAIL PROTECTED]
Submitted by: Ralf S. Engelschall
Reviewed by: Ralf S. Engelschall
PR: 3140
Revision ChangesPath
1.1440+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1439
retrieving revision 1.1440
diff -u -r1.1439 -r1.1440
--- CHANGES 1999/10/27 07:38:45 1.1439
+++ CHANGES 1999/10/27 07:56:17 1.1440
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) Make sure mod_rewrite matches URL schemes case-insensitive and also
allow
+ additional (commonly used) URL schemes ldap:, news: and mailto:.
+ [Ralf S. Engelschall, Klaus Johannes Rusch [EMAIL PROTECTED]] PR#3140
+
*) Overhauled ApacheBench (ab) manpage ab.8.
[Simon Baldwin [EMAIL PROTECTED]] PR#5139
1.146 +37 -16apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- mod_rewrite.c 1999/10/21 20:45:36 1.145
+++ mod_rewrite.c 1999/10/27 07:56:22 1.146
@@ -1131,13 +1131,19 @@
return OK;
}
else if ( (strlen(r-filename) 7
-strncasecmp(r-filename, http://;, 7) == 0)
+strncasecmp(r-filename, http://;, 7) == 0)
|| (strlen(r-filename) 8
-strncasecmp(r-filename, https://;, 8) == 0)
+strncasecmp(r-filename, https://;, 8) == 0)
|| (strlen(r-filename) 9
strncasecmp(r-filename, gopher://;, 9) == 0)
|| (strlen(r-filename) 6
-strncasecmp(r-filename, ftp://;, 6) == 0)) {
+strncasecmp(r-filename, ftp://;,6) == 0)
+|| (strlen(r-filename) 5
+strncasecmp(r-filename, ldap:, 5) == 0)
+|| (strlen(r-filename) 5
+strncasecmp(r-filename, news:;, 5) == 0)
+|| (strlen(r-filename) 7
+strncasecmp(r-filename, mailto:;, 7) == 0)) {
/* it was finally rewritten to a remote URL */
/* skip 'scheme:' */
@@ -1391,13 +1397,19 @@
return OK;
}
else if ( (strlen(r-filename) 7
-strncmp(r-filename, http://;, 7) == 0)
+strncasecmp(r-filename, http://;, 7) == 0)
|| (strlen(r-filename) 8
-strncmp(r-filename, https://;, 8) == 0)
+strncasecmp(r-filename, https://;, 8) == 0)
|| (strlen(r-filename) 9
-strncmp(r-filename, gopher://;, 9) == 0)
+strncasecmp(r-filename, gopher://;, 9) == 0)
|| (strlen(r-filename) 6
-strncmp(r-filename, ftp://;, 6) == 0)) {
+strncasecmp(r-filename, ftp://;,6) == 0)
+|| (strlen(r-filename) 5
+strncasecmp(r-filename, ldap:, 5) == 0)
+|| (strlen(r-filename) 5
+strncasecmp(r-filename, news:;, 5) == 0)
+|| (strlen(r-filename) 7
+strncasecmp(r-filename, mailto:;, 7) == 0)) {
/* it was finally rewritten to a remote URL */
/* because we are in a per-dir context
@@ -2005,10 +2017,13 @@
i = strlen(r-filename);
if ( prefixstrip
!( r-filename[0] == '/'
- || ( (i 7 strncasecmp(r-filename, http://;, 7) == 0)
- || (i 8 strncasecmp(r-filename, https://;, 8) == 0)
+ || ( (i 7 strncasecmp(r-filename, http://;, 7) == 0)
+ || (i 8 strncasecmp(r-filename, https://;, 8) == 0)
|| (i 9 strncasecmp(r-filename, gopher://;, 9) == 0)
- || (i 6 strncasecmp(r-filename, ftp://;, 6) == 0
{
+ || (i 6 strncasecmp(r-filename, ftp://;,6) == 0)
+ || (i 5 strncasecmp(r-filename, ldap:, 5) == 0)
+ || (i 5 strncasecmp(r-filename, news:;, 5) == 0)
+ || (i 7 strncasecmp(r-filename, mailto:;, 7) ==
0 {
rewritelog(r, 3, [per-dir %s] add per-dir prefix: %s - %s%s
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 99/10/27 01:10:12
Modified:src CHANGES
src/modules/standard mod_rewrite.c
Log:
Make sure mod_rewrite escapes QUERY_STRINGS on redirects.
Submitted by: Klaus Johannes Rusch [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
PR: 4734
Revision ChangesPath
1.1441+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1440
retrieving revision 1.1441
diff -u -r1.1440 -r1.1441
--- CHANGES 1999/10/27 07:56:17 1.1440
+++ CHANGES 1999/10/27 08:10:06 1.1441
@@ -1,5 +1,8 @@
Changes with Apache 1.3.10
+ *) Make sure mod_rewrite escapes QUERY_STRINGS on redirects.
+ [Klaus Johannes Rusch [EMAIL PROTECTED]] PR#4734
+
*) Make sure mod_rewrite matches URL schemes case-insensitive and also
allow
additional (commonly used) URL schemes ldap:, news: and mailto:.
[Ralf S. Engelschall, Klaus Johannes Rusch [EMAIL PROTECTED]] PR#3140
1.147 +4 -4 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- mod_rewrite.c 1999/10/27 07:56:22 1.146
+++ mod_rewrite.c 1999/10/27 08:10:10 1.147
@@ -1163,8 +1163,8 @@
/* append the QUERY_STRING part */
if (r-args != NULL) {
- r-filename = ap_pstrcat(r-pool, r-filename,
-?, r-args, NULL);
+r-filename = ap_pstrcat(r-pool, r-filename, ?,
+ ap_escape_uri(r-pool, r-args),
NULL);
}
/* determine HTTP redirect response code */
@@ -1458,8 +1458,8 @@
/* append the QUERY_STRING part */
if (r-args != NULL) {
-r-filename = ap_pstrcat(r-pool, r-filename,
- ?, r-args, NULL);
+r-filename = ap_pstrcat(r-pool, r-filename, ?,
+ ap_escape_uri(r-pool, r-args),
NULL);
}
/* determine HTTP redirect response code */
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 99/10/27 01:19:01
Modified:src/modules/standard mod_rewrite.c
Log:
Indentation cleanup
Revision ChangesPath
1.148 +10 -10apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- mod_rewrite.c 1999/10/27 08:10:10 1.147
+++ mod_rewrite.c 1999/10/27 08:18:58 1.148
@@ -1859,7 +1859,7 @@
/* One condition is false, but another can be
* still true, so we have to continue...
*/
- ap_table_unset(r-notes, VARY_KEY_THIS);
+ap_table_unset(r-notes, VARY_KEY_THIS);
continue;
}
else {
@@ -1885,11 +1885,11 @@
break;
}
}
- vary = ap_table_get(r-notes, VARY_KEY_THIS);
- if (vary != NULL) {
- ap_table_merge(r-notes, VARY_KEY, vary);
- ap_table_unset(r-notes, VARY_KEY_THIS);
- }
+vary = ap_table_get(r-notes, VARY_KEY_THIS);
+if (vary != NULL) {
+ap_table_merge(r-notes, VARY_KEY, vary);
+ap_table_unset(r-notes, VARY_KEY_THIS);
+}
}
/* if any condition fails the complete rule fails */
if (failed) {
@@ -1905,7 +1905,7 @@
*/
if ((vary = ap_table_get(r-notes, VARY_KEY)) != NULL) {
ap_table_merge(r-headers_out, Vary, vary);
- ap_table_unset(r-notes, VARY_KEY);
+ap_table_unset(r-notes, VARY_KEY);
}
/*
@@ -2513,7 +2513,7 @@
/* now apply the pregsub() function */
ap_cpystrn(buf, ap_pregsub(p, buf, bri-source,
- bri-nsub+1, bri-regmatch), nbuf);
+ bri-nsub+0, bri-regmatch), nbuf);
if (c != '$') {
/* restore the original $N backrefs */
@@ -3640,7 +3640,7 @@
}
else if (strcasecmp(var, API_VERSION) == 0) { /* non-standard */
ap_snprintf(resultbuf, sizeof(resultbuf), %d:%d,
- MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
+MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
result = resultbuf;
}
@@ -3792,7 +3792,7 @@
continue;
}
if (strcasecmp(hdrs[i].key, name) == 0) {
- ap_table_merge(r-notes, VARY_KEY_THIS, name);
+ap_table_merge(r-notes, VARY_KEY_THIS, name);
return hdrs[i].val;
}
}
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 99/10/27 02:03:00
Modified:src CHANGES
src/modules/standard mod_rewrite.c
Log:
Overhauled mod_rewrite's general substitution function
(expand_backref_inbuffer): 1. The `$0' backreference is now officially allowed
and documented and references the while pattern space; 2. the ampersamp ()
backreference (which is equal to $0) is no longer expanded, because it was
never documented and only leads to confusion with QUERY_STRINGS; 3.
backslashes (\) are honored correctly, that is `\$N' now really forces the
dollar to be an ordinary character and $N is not expanded.
Submitted by: Ralf S. Engelschall
PR: 4766 4161
Revision ChangesPath
1.1442+10 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1441
retrieving revision 1.1442
diff -u -r1.1441 -r1.1442
--- CHANGES 1999/10/27 08:10:06 1.1441
+++ CHANGES 1999/10/27 09:02:43 1.1442
@@ -1,5 +1,15 @@
Changes with Apache 1.3.10
+ *) Overhauled mod_rewrite's general substitution function
+ (expand_backref_inbuffer): 1. The `$0' backreference is now officially
+ allowed and documented and references the while pattern space; 2. the
+ ampersamp () backreference (which is equal to $0) is no longer
expanded,
+ because it was never documented and only leads to confusion with
+ QUERY_STRINGS; 3. backslashes (\) are honored correctly, that is `\$N'
+ now really forces the dollar to be an ordinary character and $N is
+ not expanded.
+ [Ralf S. Engelschall] PR#4766 PR#4161
+
*) Make sure mod_rewrite escapes QUERY_STRINGS on redirects.
[Klaus Johannes Rusch [EMAIL PROTECTED]] PR#4734
1.149 +24 -21apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- mod_rewrite.c 1999/10/27 08:18:58 1.148
+++ mod_rewrite.c 1999/10/27 09:02:49 1.149
@@ -2493,34 +2493,37 @@
static void expand_backref_inbuffer(pool *p, char *buf, int nbuf,
backrefinfo *bri, char c)
{
-int i;
+register int i;
-if (bri-nsub 1) {
-return;
-}
-
-if (c != '$') {
-/* safe existing $N backrefs and replace cN with $N backrefs */
-for (i = 0; buf[i] != '\0' i nbuf; i++) {
-if (buf[i] == '$' (buf[i+1] = '0' buf[i+1] = '9')) {
-buf[i++] = '\001';
-}
-else if (buf[i] == c (buf[i+1] = '0' buf[i+1] = '9')) {
-buf[i++] = '$';
-}
+/* protect existing $N and backrefs and replace cN with $N backrefs
*/
+for (i = 0; buf[i] != '\0' i nbuf; i++) {
+if (buf[i] == '\\' (buf[i+1] != '\0' i (nbuf-1))) {
+i++; /* protect next */
+}
+else if (buf[i] == '') {
+buf[i] = '\001';
}
+else if (c != '$' buf[i] == '$' (buf[i+1] = '0' buf[i+1]
= '9')) {
+buf[i] = '\002';
+i++; /* speedup */
+}
+else if (buf[i] == c (buf[i+1] = '0' buf[i+1] = '9')) {
+buf[i] = '$';
+i++; /* speedup */
+}
}
-/* now apply the pregsub() function */
+/* now apply the standard regex substitution function */
ap_cpystrn(buf, ap_pregsub(p, buf, bri-source,
bri-nsub+0, bri-regmatch), nbuf);
-if (c != '$') {
-/* restore the original $N backrefs */
-for (i = 0; buf[i] != '\0' i nbuf; i++) {
-if (buf[i] == '\001' (buf[i+1] = '0' buf[i+1] = '9')) {
-buf[i++] = '$';
-}
+/* restore the original $N and backrefs */
+for (i = 0; buf[i] != '\0' i nbuf; i++) {
+if (buf[i] == '\001') {
+buf[i] = '';
+}
+else if (buf[i] == '\002') {
+buf[i] = '$';
}
}
}
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 99/10/27 02:13:21
Modified:src CHANGES
src/modules/standard mod_rewrite.c
Log:
Fixed QUERY_STRING handling for `RewriteRule ... [P]'
in per-directory context.
Submitted by: Martin Zeh [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
PR: 5073
Revision ChangesPath
1.1443+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1442
retrieving revision 1.1443
diff -u -r1.1442 -r1.1443
--- CHANGES 1999/10/27 09:02:43 1.1442
+++ CHANGES 1999/10/27 09:13:09 1.1443
@@ -1,4 +1,8 @@
Changes with Apache 1.3.10
+
+ *) Fixed QUERY_STRING handling for `RewriteRule ... [P]'
+ in per-directory context.
+ [Martin Zeh [EMAIL PROTECTED]] PR#5073
*) Overhauled mod_rewrite's general substitution function
(expand_backref_inbuffer): 1. The `$0' backreference is now officially
1.150 +1 -3 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- mod_rewrite.c 1999/10/27 09:02:49 1.149
+++ mod_rewrite.c 1999/10/27 09:13:17 1.150
@@ -1381,9 +1381,7 @@
* (r-path_info was already appended by the
* rewriting engine because of the per-dir context!)
*/
-if (r-args != NULL
- r-uri == r-unparsed_uri) {
-/* see proxy_http:proxy_http_canon() */
+if (r-args != NULL) {
r-filename = ap_pstrcat(r-pool, r-filename,
?, r-args, NULL);
}
cvs commit: apache-1.3/htdocs/manual/mod mod_rewrite.html
rse 99/10/27 02:14:33
Modified:htdocs/manual/mod mod_rewrite.html
Log:
Ops, I forgot to include this file in previous commit
Revision ChangesPath
1.45 +4 -5 apache-1.3/htdocs/manual/mod/mod_rewrite.html
Index: mod_rewrite.html
===
RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mod_rewrite.html 1999/06/29 10:22:55 1.44
+++ mod_rewrite.html 1999/10/27 09:14:32 1.45
@@ -1010,10 +1010,9 @@
CODE$N/CODE
/STRONG/BLOCKQUOTE
-(1 lt;= N lt;= 9) which provide access to the grouped parts (parenthesis!)
-of the
-pattern from the corresponding CODERewriteRule/CODE directive (the one
-following the current bunch of CODERewriteCond/CODE directives).
+(0 lt;= N lt;= 9) which provide access to the grouped parts (parenthesis!)
+of the pattern from the corresponding CODERewriteRule/CODE directive (the
+one following the current bunch of CODERewriteCond/CODE directives).
P
LISTRONGRewriteCond backreferences/STRONG: These are backreferences of
@@ -1431,7 +1430,7 @@
LIA HREF=#mapfuncmapping-function/A calls
(CODE${mapname:key|default}/CODE)
/OL
-Back-references are CODE$/CODESTRONGN/STRONG
(STRONGN/STRONG=1..9) identifiers which
+Back-references are CODE$/CODESTRONGN/STRONG
(STRONGN/STRONG=0..9) identifiers which
will be replaced by the contents of the STRONGN/STRONGth group of the
matched
EMPattern/EM. The server-variables are the same as for the
EMTestString/EM of a CODERewriteCond/CODE directive. The
cvs commit: apache-1.3/src/modules/standard mod_headers.c mod_usertrack.c
rse 99/10/27 02:26:56
Modified:src/modules/standard mod_headers.c mod_usertrack.c
Log:
Get rid of gcc's warning: file does not end in newline messages
caused by the recently comitted ugly NETWARE stuff..
Revision ChangesPath
1.22 +2 -1 apache-1.3/src/modules/standard/mod_headers.c
Index: mod_headers.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_headers.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_headers.c 1999/10/21 20:45:28 1.21
+++ mod_headers.c 1999/10/27 09:26:53 1.22
@@ -269,4 +269,5 @@
{
ExitThread(TSR_THREAD, 0);
}
-#endif
\ No newline at end of file
+#endif
+
1.41 +2 -1 apache-1.3/src/modules/standard/mod_usertrack.c
Index: mod_usertrack.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_usertrack.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mod_usertrack.c 1999/10/21 20:45:48 1.40
+++ mod_usertrack.c 1999/10/27 09:26:54 1.41
@@ -389,4 +389,5 @@
{
ExitThread(TSR_THREAD, 0);
}
-#endif
\ No newline at end of file
+#endif
+
cvs commit: apache-1.3/src Configure
rse 99/10/27 02:30:20 Modified:src Configure Log: Take over changes from OpenBSD's integrated httpd source to their OpenBSD entry in Configure in order to reduce their patching next time. Revision ChangesPath 1.373 +2 -0 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.372 retrieving revision 1.373 diff -u -r1.372 -r1.373 --- Configure 1999/09/09 20:14:33 1.372 +++ Configure 1999/10/27 09:30:19 1.373 @@ -478,6 +478,8 @@ *-openbsd*) OS='OpenBSD' DBM_LIB= + DB_LIB= + DEF_WANTHSREGEX=no ;; *-next-nextstep*) OS='NeXTStep'
cvs commit: apache-1.3/src/main alloc.c
rse 99/10/08 07:23:41
Modified:src/main alloc.c
Log:
fix typo
Revision ChangesPath
1.116 +1 -1 apache-1.3/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- alloc.c 1999/07/29 17:53:57 1.115
+++ alloc.c 1999/10/08 14:23:40 1.116
@@ -2145,7 +2145,7 @@
if (pipe_err) {
hStdErr = dup(fileno(stderr));
if(dup2(err_fds[1], fileno(stderr)))
- ap_log_error(APLOG_MARK, APLOG_ERR, NULL, dup2(stdin) failed);
+ ap_log_error(APLOG_MARK, APLOG_ERR, NULL, dup2(stderr)
failed);
close(err_fds[1]);
}
cvs commit: apache-2.0/src/lib/apr/lib apr_pools.c
rse 99/10/08 07:26:13
Modified:src/lib/apr/lib apr_pools.c
Log:
fix typo
Revision ChangesPath
1.13 +1 -1 apache-2.0/src/lib/apr/lib/apr_pools.c
Index: apr_pools.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apr_pools.c 1999/10/01 16:18:32 1.12
+++ apr_pools.c 1999/10/08 14:26:12 1.13
@@ -1286,7 +1286,7 @@
hStdErr = dup(fileno(stderr));
if (dup2(err_fds[1], fileno(stderr))) {
ap_log_error(APLOG_MARK, APLOG_ERR, NULL,
- dup2(stdin) failed);
+ dup2(stderr) failed);
}
close(err_fds[1]);
}
cvs commit: apache-2.0/src/lib/apr configure.in
rse 99/10/01 02:36:31 Modified:src/lib/apr configure.in Log: - remove bogus subshell usage and avoid test -z - remove FreeBSD hack: first SYS_SW is not set anywhere (same actually also for AIX) and second, -D__STR__ is useless on FreeBSD and -pthread should not be used always (think about Pth or other libs except FreeBSD uthread) Revision ChangesPath 1.12 +2 -6 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- configure.in 1999/09/12 12:12:00 1.11 +++ configure.in 1999/10/01 09:36:30 1.12 @@ -50,7 +50,7 @@ AC_C_INLINE # Use /bin/sh if it exists, otherwise go looking for sh in the path -if (test -z $SH -a -f /bin/sh); then +if test .$SH = . -a -f /bin/sh; then SH=/bin/sh fi AC_CHECK_PROG(SH, sh, sh) @@ -97,7 +97,7 @@ AC_CHECK_LIB(socket,socket) AC_CHECK_LIB(ufc,crypt) -if (test $SYS_SW = AIX); then +if test .$SYS_SW = .AIX; then CFLAGS=$CFLAGS -U__STR__ case $SYS_KV in [12]*) @@ -110,10 +110,6 @@ AC_DEFINE(NEED_RLIM_T) ;; esac -fi - -if (test $SYS_SW = FreeBSD); then -CFLAGS=$CFLAGS -pthread -U__STR__ fi dnl Checks for header files.
cvs commit: apache-2.0/src/lib/apr/misc/unix start.c
rse 99/09/12 05:12:05
Modified:src/lib/apr configure.in
src/lib/apr/include apr_config.h.in
src/lib/apr/misc/unix start.c
Log:
Make sure one can compile a server with MPM prefork if no pthread library is
used (even when it exists). Please be careful, never use a feature test macro
for a header to imply that one then can use a function usually defined in this
header. You explicitly have to test for the availability of the function.
Revision ChangesPath
1.11 +1 -0 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure.in 1999/09/11 11:49:31 1.10
+++ configure.in 1999/09/12 12:12:00 1.11
@@ -196,6 +196,7 @@
AC_MSG_RESULT([$msg])
dnl Checks for library functions.
+AC_CHECK_FUNCS(pthread_sigmask)
AC_CHECK_FUNCS(strcasecmp stricmp poll setsid)
AC_CHECK_FUNCS(sigaction writev)
AC_CHECK_FUNCS(getpass)
1.7 +3 -0 apache-2.0/src/lib/apr/include/apr_config.h.in
Index: apr_config.h.in
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_config.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_config.h.in 1999/09/01 19:01:58 1.6
+++ apr_config.h.in 1999/09/12 12:12:00 1.7
@@ -106,6 +106,9 @@
/* Define if you have the poll function. */
#undef HAVE_POLL
+/* Define if you have the pthread_sigmask function. */
+#undef HAVE_PTHREAD_SIGMASK
+
/* Define if you have the setsid function. */
#undef HAVE_SETSID
1.5 +1 -1 apache-2.0/src/lib/apr/misc/unix/start.c
Index: start.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- start.c 1999/09/12 11:12:53 1.4
+++ start.c 1999/09/12 12:12:03 1.5
@@ -161,7 +161,7 @@
*/
ap_status_t ap_initialize(void)
{
-#ifdef HAVE_PTHREAD_H
+#ifdef HAVE_PTHREAD_SIGMASK
sigset_t sigset;
sigfillset(sigset);
cvs commit: apache-1.3/htdocs/manual/vhosts index.html
rse 99/09/04 07:19:25 Modified:htdocs/manual/vhosts index.html Log: Fix hyperlink Revision ChangesPath 1.6 +1 -1 apache-1.3/htdocs/manual/vhosts/index.html Index: index.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/vhosts/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.html1999/01/15 00:59:12 1.5 +++ index.html1999/09/04 14:19:25 1.6 @@ -41,7 +41,7 @@ LIA HREF=examples.htmlVirtual Host examples for common setups/A LIA HREF=details.htmlIn-Depth Discussion of Virtual Host Matching/A LIA HREF=fd-limits.htmlFile Descriptor Limits/A -LIA HREF=mass.htmlDynamically Configured Mass Virtual Hosting with mod_rewrite/A +LIA HREF=mass.htmlDynamically Configured Mass Virtual Hosting/A /UL H2Configuration directives/H2
cvs commit: apache-2.0/src/lib/apr Makefile.in
rse 99/09/03 11:40:40 Modified:src/lib/apr Makefile.in Log: The distclean target has to remove some config.* files. Revision ChangesPath 1.6 +1 -0 apache-2.0/src/lib/apr/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.in 1999/08/28 08:05:42 1.5 +++ Makefile.in 1999/09/03 18:40:39 1.6 @@ -51,6 +51,7 @@ distclean: clean -$(RM) -f Makefile + -$(RM) -f config.log config.status config.cache subdirs: @for i in $(SUBDIRS); do \
cvs commit: apache-2.0/src/os/unix iol_socket.c
rse 99/08/28 05:22:12
Modified:src/main alloc.c buff.c http_connection.c http_main.c
http_protocol.c
src/os/unix iol_socket.c
Log:
Make ``configure --with-option=devel'' under
GCC 2.95.1 happy by avoiding various warnings...
Revision ChangesPath
1.7 +2 -0 apache-2.0/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-2.0/src/main/alloc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alloc.c 1999/08/27 22:57:05 1.6
+++ alloc.c 1999/08/28 12:22:09 1.7
@@ -201,7 +201,9 @@
static union block_hdr *block_freelist = NULL;
static ap_thread_mutex *alloc_mutex;
+#ifdef WIN32
static ap_thread_mutex *spawn_mutex; /* Added back in for WIN32... */
+#endif
#ifdef POOL_DEBUG
static char *known_stack_point;
1.3 +1 -1 apache-2.0/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buff.c1999/08/26 10:45:55 1.2
+++ buff.c1999/08/28 12:22:09 1.3
@@ -601,7 +601,7 @@
ap_assert(nbyte 0);
if (fb-outcnt) {
- vec[0].iov_base = fb-outbase;
+ vec[0].iov_base = (void *)fb-outbase;
vec[0].iov_len = fb-outcnt;
vec[1].iov_base = (void *)buf;
vec[1].iov_len = nbyte;
1.18 +1 -1 apache-2.0/src/main/http_connection.c
Index: http_connection.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- http_connection.c 1999/08/13 06:57:40 1.17
+++ http_connection.c 1999/08/28 12:22:09 1.18
@@ -67,7 +67,7 @@
HOOK_STRUCT(
HOOK_LINK(pre_connection)
HOOK_LINK(process_connection)
-);
+)
IMPLEMENT_HOOK_VOID(pre_connection,(conn_rec *c),(c))
IMPLEMENT_HOOK_RUN_FIRST(int,process_connection,(conn_rec *c),(c),DECLINED)
1.4 +3 -1 apache-2.0/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- http_main.c 1999/08/27 22:57:07 1.3
+++ http_main.c 1999/08/28 12:22:10 1.4
@@ -233,6 +233,9 @@
}
pool *g_pHookPool;
+
+extern char *optarg;
+
#ifdef WIN32
__declspec(dllexport)
int apache_main(int argc, char *argv[])
@@ -251,7 +254,6 @@
pool *plog; /* Pool for error-logging files */
pool *ptemp; /* Pool for temporart config stuff */
pool *pcommands; /* Pool for -C and -c switches */
-extern char *optarg;
/* TODO: PATHSEPARATOR should be one of the os defines */
#define PATHSEPARATOR '/'
1.12 +1 -1 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- http_protocol.c 1999/08/27 22:18:48 1.11
+++ http_protocol.c 1999/08/28 12:22:10 1.12
@@ -80,7 +80,7 @@
HOOK_LINK(log_transaction)
HOOK_LINK(http_method)
HOOK_LINK(default_port)
-);
+)
#define SET_BYTES_SENT(r) \
do { if (r-sent_bodyct) \
1.4 +1 -0 apache-2.0/src/os/unix/iol_socket.c
Index: iol_socket.c
===
RCS file: /home/cvs/apache-2.0/src/os/unix/iol_socket.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iol_socket.c 1999/08/13 15:52:01 1.3
+++ iol_socket.c 1999/08/28 12:22:12 1.4
@@ -58,6 +58,7 @@
#include httpd.h
#include ap_iol.h
+#include iol_socket.h
#include errno.h
#include sys/types.h
cvs commit: apache-2.0/src/modules/mpm/dexter acceptlock.c dexter.c
rse 99/08/28 06:00:56 Modified:src/modules/mpm/dexter acceptlock.c dexter.c Log: get rid of two additional warnings Revision ChangesPath 1.3 +2 -0 apache-2.0/src/modules/mpm/dexter/acceptlock.c Index: acceptlock.c === RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/acceptlock.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- acceptlock.c 1999/08/28 12:37:58 1.2 +++ acceptlock.c 1999/08/28 13:00:55 1.3 @@ -82,7 +82,9 @@ /* TODO: all these calls have to be ap_ prefixed, right? */ /* Number of cross-process locks we're managing */ +#ifndef NO_SERIALIZED_ACCEPT static int lock_count; +#endif /* Filename prefix for locks */ char *ap_lock_fname; 1.33 +1 -0 apache-2.0/src/modules/mpm/dexter/dexter.c Index: dexter.c === RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- dexter.c 1999/08/28 12:37:58 1.32 +++ dexter.c 1999/08/28 13:00:55 1.33 @@ -69,6 +69,7 @@ #include ap_listen.h #include acceptlock.h #include mpm_default.h +#include dexter.h #include poll.h #include netinet/tcp.h
cvs commit: apache-2.0 README.rse config.option
rse 99/08/27 03:11:31 Modified:.README.rse config.option Log: Update paths for new repository structure. Revision ChangesPath 1.8 +19 -18apache-2.0/README.rse Index: README.rse === RCS file: /home/cvs/apache-2.0/README.rse,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- README.rse1999/08/19 16:01:58 1.7 +++ README.rse1999/08/27 10:11:30 1.8 @@ -1,7 +1,7 @@ - Get the Apache/mpm beast running - Ralf S. Engelschall, 12-Aug-1999 - + Get the Apache 2.0 beast running + Ralf S. Engelschall, 27-Aug-1999 + These are my instructions for getting Apache/mpm running under various platforms. For some background details see apache-apr/pthread/README.rse, @@ -10,11 +10,11 @@ o FooBar/OS + prefork MPM [the portable preforking process model] - $ cd ROOT/apache-mpm/mpm/ + $ cd ROOT/apache-2.0/ $ ./configure \ --with-layout=GNU \ --target=apache \ - --prefix=/tmp/apache-mpm \ + --prefix=/tmp/apache-2.0 \ --set-rule=MPM_METHOD:prefork \ --disable-module=status \ --disable-module=include \ @@ -24,7 +24,7 @@ Alternative: - $ cd ROOT/apache-mpm/mpm/ + $ cd ROOT/apache-2.0/ $ ./configure --with-option=mpm-prefork $ make $ make install @@ -32,10 +32,11 @@ o FooBar/OS + Ralf S. Engelschall's GNU Pth + dexter MPM [the portable hybrid (preforking+prethreading) process model] - $ cd ROOT/apache-mpm + $ cd ROOT/apache-2.0/src/lib $ 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 + $ mv pth-1.1.X pth + $ cd pth $ ./configure \ --disable-shared \ --enable-pthread \ @@ -43,14 +44,14 @@ $ make $ make test - $ cd ROOT/apache-mpm/mpm - $ CFLAGS='-I\$(SRCDIR)/../pth-1.1.X -DPTHREAD_EVERYWHERE -DNO_SERIALIZED_ACCEPT' \ - LDFLAGS='-L\$(SRCDIR)/../pth-1.1.X/.libs' \ + $ cd ROOT/apache-2.0/ + $ CFLAGS='-I\$(SRCDIR)/lib/pth -DPTHREAD_EVERYWHERE -DNO_SERIALIZED_ACCEPT' \ + LDFLAGS='-L\$(SRCDIR)/lib/pth/.libs' \ LIBS=-lpthread \ ./configure \ --with-layout=GNU \ --target=apache \ - --prefix=/tmp/apache-mpm + --prefix=/tmp/apache-2.0 --set-rule=MPM_METHOD:dexter \ --disable-module=status \ --disable-module=include \ @@ -60,7 +61,7 @@ Alternative: - $ cd ROOT/apache-mpm/mpm/ + $ cd ROOT/apache-2.0/ $ ./configure --with-option=mpm-dexter-pth $ make $ make install @@ -72,16 +73,16 @@ $ ./configure $ make - $ cd ROOT/apache-mpm/mpm + $ cd ROOT/apache-2.0/ $ CC='cc' \ OPTIM='-O2' \ - CFLAGS='-pthread -I\$(SRCDIR)/../../../apache-apr/poll -DNO_SERIALIZED_ACCEPT' \ - LDFLAGS='-pthread -L\$(SRCDIR)/../../../apache-apr/poll' \ + CFLAGS='-pthread -I\$(SRCDIR)/../../apache-apr/poll -DNO_SERIALIZED_ACCEPT' \ + LDFLAGS='-pthread -L\$(SRCDIR)/../../apache-apr/poll' \ LIBS='-lpoll' \ ./configure \ --with-layout=GNU \ --target=apache \ - --prefix=/tmp/apache-mpm \ + --prefix=/tmp/apache-2.0 \ --set-rule=MPM_METHOD:dexter \ --disable-module=status \ --disable-module=include \ @@ -91,7 +92,7 @@ Alternative: - $ cd ROOT/apache-mpm/mpm/ + $ cd ROOT/apache-2.0/ $ ./configure --with-option=mpm-dexter-uthread $ make $ make install 1.5 +10 -10apache-2.0/config.option Index: config.option === RCS file: /home/cvs/apache-2.0/config.option,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config.option 1999/08/16 11:35:56 1.4 +++ config.option 1999/08/27 10:11:30 1.5 @@ -8,7 +8,7 @@ Option common OPTIM='-pipe -O2' --target=apache ---prefix=/tmp/apache-mpm +--prefix=/tmp/apache-2.0 --disable-module=status --disable-module=include --disable-module=cgi @@ -27,7 +27,7 @@ ## Hybrid Variants ## ## Assumptions for GNU Pth based variants: -## - Pth source tree was extracted to apache-mpm/pth/ +## - Pth source tree was extracted to apache-2.0/src/lib/pth/ ## - Pth was configured with ``--enable-pthread --enable-syscall-soft'' ## - Pth was already build (but needs not to be installed) ## Assumptions for FreeBSD uthread based variants
cvs commit: apache-2.0/src .cvsignore
rse 99/08/27 03:25:28 Modified:src .cvsignore Log: Since months I see... | cvs update: Updating src | ? src/apache ...because I also often use --target=apache and now it becomes boring. Revision ChangesPath 1.2 +1 -0 apache-2.0/src/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/08/24 05:34:11 1.1 +++ .cvsignore1999/08/27 10:25:27 1.2 @@ -13,6 +13,7 @@ CoreD CoreR httpd +apache libhttpd.* Makefile Makefile.config
cvs commit: apache-2.0/mpm/src/lib/apr Makefile.in
rse 99/08/18 23:48:10 Modified:mpm/src/lib/apr Makefile.in Log: Enhance directory step display to see what's going on... Revision ChangesPath 1.2 +7 -1 apache-2.0/mpm/src/lib/apr/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/08/17 15:59:34 1.1 +++ Makefile.in 1999/08/19 06:48:10 1.2 @@ -55,17 +55,23 @@ ( cd $$i $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' \ CC='$(CC)' AUX_CFLAGS='$(AUX_CFLAGS)' RANLIB='$(RANLIB)' ) \ || exit 1; \ - echo == $$i; \ + echo === $$i; \ done; subdirs_depend: @for i in $(SUBDIRS); do \ + echo === $$i; \ ( cd $$i $(MAKE) depend ) \ + || exit 1; \ + echo === $$i; \ done; subdirs_clean: @for i in $(SUBDIRS); do \ + echo === $$i; \ ( cd $$i $(MAKE) clean ) \ + || exit 1; \ + echo === $$i; \ done; # DO NOT REMOVE
cvs commit: apache-2.0/mpm README.rse
rse 99/08/19 09:02:10 Modified:mpm README.rse Log: Use Pth 1.1 release versions now Revision ChangesPath 1.7 +5 -7 apache-2.0/mpm/README.rse Index: README.rse === RCS file: /home/cvs/apache-2.0/mpm/README.rse,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- README.rse1999/08/13 16:01:11 1.6 +++ README.rse1999/08/19 16:01:58 1.7 @@ -33,11 +33,9 @@ [the portable hybrid (preforking+prethreading) process model] $ cd ROOT/apache-mpm - $ lynx ftp://alpha.gnu.org/gnu/pth/pth-1.1b4.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.1b4.tar.gz | tar xvf - - $ cd pth-1.1b4 + $ 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 \ @@ -46,8 +44,8 @@ $ make test $ cd ROOT/apache-mpm/mpm - $ CFLAGS='-I\$(SRCDIR)/../pth-1.1b4 -DPTHREAD_EVERYWHERE -DNO_SERIALIZED_ACCEPT' \ - LDFLAGS='-L\$(SRCDIR)/../pth-1.1b4/.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-apr/pthreads README.rse
rse 99/08/19 09:10:20 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: /home/cvs/apache-apr/pthreads/README.rse,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.rse1999/08/12 07:31:01 1.1 +++ README.rse1999/08/19 16:10:19 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-1.3/htdocs index.html.de
rse 99/08/18 05:00:58 Modified:htdocs index.html.de Log: adjustment Revision ChangesPath 1.2 +1 -1 apache-1.3/htdocs/index.html.de Index: index.html.de === RCS file: /home/cvs/apache-1.3/htdocs/index.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html.de 1999/08/18 11:35:34 1.1 +++ index.html.de 1999/08/18 12:00:56 1.2 @@ -28,7 +28,7 @@ BLOCKQUOTE Wenn Sie diese Seite an Stelle einer anderen erwarteten Web-Site sehen sollten, dann STRONGnehmen Sie bitte Kontakt mit dem - Eigentuuml;mer dieser Site auf/STRONG (Versuchen Sie, EMail + Eigentuuml;mer dieser Site auf/STRONG (Versuchen Sie, eine EMail an SAMPlt;Webmaster@EMdomauml;nenname/EMgt;/SAMP zu senden)!BR P
cvs commit: apache-1.3 configure
rse 99/08/12 23:36:16 Modified:src CHANGES .configure Log: Fixed generated AddModule adjustments in APACI's `configure' script in order to allow (new) modules like mod_vhost_alias to be handled correctly (which was touched by the adjustments for mod_alias). Revision ChangesPath 1.1418+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1417 retrieving revision 1.1418 diff -u -r1.1417 -r1.1418 --- CHANGES 1999/08/13 03:26:21 1.1417 +++ CHANGES 1999/08/13 06:36:14 1.1418 @@ -1,5 +1,10 @@ Changes with Apache 1.3.9 + *) Fixed generated AddModule adjustments in APACI's `configure' script in + order to allow (new) modules like mod_vhost_alias to be handled correctly + (which was touched by the adjustments for mod_alias). + [Ralf S. Engelschall] + *) For binary builds, add -R flag to apachectl to work around the lack of an absolute path to the ./libexec directory where libhttp.ep file is needed for SHARED_CORE architectures. 1.100 +11 -5 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- configure 1999/08/12 13:39:33 1.99 +++ configure 1999/08/13 06:36:16 1.100 @@ -1393,22 +1393,28 @@ fi # generate module directives +# (paths are modules/foo/mod_bar.ext and modules/foo/libbar.ext) OIFS=$IFS IFS=':' for module in $modules; do eval add=\$module_$module if [ x$add = xyes ]; then -echo $SEO s%^.*\\(AddModule.*[_b/]$module\\..*\\)%\\1%g $sedsubst -echo $SEO s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%\\1%g $sedsubst +echo $SEO s%^.*\\(AddModule.*mod_$module\\..*\\)%\\1%g $sedsubst +echo $SEO s%^.*\\(AddModule.*lib$module\\..*\\)%\\1%g $sedsubst +echo $SEO s%^.*\\(SharedModule.*mod_$module\\..*\\)%\\1%g $sedsubst +echo $SEO s%^.*\\(SharedModule.*lib$module\\..*\\)%\\1%g $sedsubst m=yes else -echo $SEO s%^.*\\(AddModule.*[_b/]$module\\..*\\)%# \\1%g $sedsubst -echo $SEO s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%# \\1%g $sedsubst +echo $SEO s%^.*\\(AddModule.*mod_$module\\..*\\)%# \\1%g $sedsubst +echo $SEO s%^.*\\(AddModule.*lib$module\\..*\\)%# \\1%g $sedsubst +echo $SEO s%^.*\\(SharedModule.*mod_$module\\..*\\)%# \\1%g $sedsubst +echo $SEO s%^.*\\(SharedModule.*lib$module\\..*\\)%# \\1%g $sedsubst m=no fi eval share=\$shared_$module if [ x$share = xyes ]; then -echo $SEO s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g $sedsubst +echo $SEO s%^\\(.*\\)AddModule\\(.*mod_$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g $sedsubst +echo $SEO s%^\\(.*\\)AddModule\\(.*lib$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g $sedsubst m=$m [shared] fi if [ x$verbose = xyes ]; then
cvs commit: apache-1.3/src CHANGES
rse 99/08/12 23:37:54 Modified:src CHANGES Log: fix indentation Revision ChangesPath 1.1419+10 -10apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1418 retrieving revision 1.1419 diff -u -r1.1418 -r1.1419 --- CHANGES 1999/08/13 06:36:14 1.1418 +++ CHANGES 1999/08/13 06:37:51 1.1419 @@ -5,17 +5,17 @@ (which was touched by the adjustments for mod_alias). [Ralf S. Engelschall] - *) For binary builds, add -R flag to apachectl to work around the -lack of an absolute path to the ./libexec directory where -libhttp.ep file is needed for SHARED_CORE architectures. -[Randy Terbush [EMAIL PROTECTED] + *) For binary builds, add -R flag to apachectl to work around the + lack of an absolute path to the ./libexec directory where + libhttp.ep file is needed for SHARED_CORE architectures. + [Randy Terbush [EMAIL PROTECTED] - *) Roll back (re)naming in the uuencode/decode section. The ap/ap_ -routines are now called ap_base64* and are 'plain'. I.e. no -pool access or anything clever. Inside apache the routines -acting like pstrdup are called ap_puuencode() and ap_uudecode(). -The odly named ap_uuencode(), ap_uudecode() is kept around for -now but depricated. [dirkx] + *) Roll back (re)naming in the uuencode/decode section. The ap/ap_ + routines are now called ap_base64* and are 'plain'. I.e. no + pool access or anything clever. Inside apache the routines + acting like pstrdup are called ap_puuencode() and ap_uudecode(). + The odly named ap_uuencode(), ap_uudecode() is kept around for + now but depricated. [dirkx] Changes with Apache 1.3.8
cvs commit: apache-2.0/mpm/conf httpd.conf-dist
rse 99/08/12 23:54:06 Modified:mpm/conf httpd.conf-dist Log: A few corrections to dexter default config. Thanks to Manoj for making it clear Revision ChangesPath 1.6 +6 -6 apache-2.0/mpm/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /home/cvs/apache-2.0/mpm/conf/httpd.conf-dist,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- httpd.conf-dist 1999/08/12 13:53:48 1.5 +++ httpd.conf-dist 1999/08/13 06:54:05 1.6 @@ -142,12 +142,12 @@ /IfModule # dexter MPM -# NumServers ... number of server processes to start -# StartThreads . number of worker threads to start in each server process -# MinSpareThreads .. minimum number of worker threads which are kept spare -# MaxSpareThreads .. maximum number of worker threads which are kept spare -# MaxThreadsPerChild ... maximum number of worker threads allowed to start -# MaxRequestsPerChild .. maximum number of requests a worker thread serves +# NumServers ... constant number of server processes +# StartThreads . initial number of worker threads in each server process +# MinSpareThreads .. minimum number of worker threads which are kept spare +# MaxSpareThreads .. maximum number of worker threads which are kept spare +# MaxThreadsPerChild ... maximum number of worker threads in each server process +# MaxRequestsPerChild .. maximum number of connections per server process (then it dies) IfModule dexter.c NumServers 5 StartThreads 5
cvs commit: apache-2.0/mpm/src/os/unix iol_socket.c
rse 99/08/13 08:52:03
Modified:mpm/src/os/unix iol_socket.c
Log:
Hell, what a subtle problem which caused me four hours this afternoon to find.
It's not exactly specified (even POSIX does it once this time and once this
time) whether read() returns EWOULDBLOCK or EAGAIN. SysV usually returns
EAGAIN, BSD usually EWOULDBLOCK. So we have to check for _both_ errno values,
of course. This occured for me the first time after I've tried ``ab -n 1000
en1:8080/index.txt'' where index.txt is a very large file (3MB). Then the
sockets block often even for write operations and then the return value was
not recognized correctly... :-(
Revision ChangesPath
1.3 +1 -1 apache-2.0/mpm/src/os/unix/iol_socket.c
Index: iol_socket.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/os/unix/iol_socket.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iol_socket.c 1999/06/28 19:00:50 1.2
+++ iol_socket.c 1999/08/13 15:52:01 1.3
@@ -176,7 +176,7 @@
if (rv = 0) { \
return rv; \
} \
- if (errno == EWOULDBLOCK iol-timeout != 0) { \
+ if ((errno == EWOULDBLOCK || errno == EAGAIN) iol-timeout != 0) { \
return unix_##name##_timeout(viol, arg1, arg2); \
} \
return -1; \
cvs commit: apache-2.0/mpm README.rse
rse 99/08/13 09:01:12 Modified:mpm README.rse Log: Ops, Pth 1.1b3 has broken writev() semantics under blocking mode and a broken select() in case of timeouts. This caused problems for large transfers with Apache/mpm-dexter-pth. With 1.1b4 it is now gone, so use this version. Revision ChangesPath 1.6 +5 -5 apache-2.0/mpm/README.rse Index: README.rse === RCS file: /home/cvs/apache-2.0/mpm/README.rse,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README.rse1999/08/12 13:25:26 1.5 +++ README.rse1999/08/13 16:01:11 1.6 @@ -33,11 +33,11 @@ [the portable hybrid (preforking+prethreading) process model] $ cd ROOT/apache-mpm - $ lynx ftp://alpha.gnu.org/gnu/pth/pth-1.1b3.tar.gz + $ lynx ftp://alpha.gnu.org/gnu/pth/pth-1.1b4.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 + $ gunzip pth-1.1b4.tar.gz | tar xvf - + $ cd pth-1.1b4 $ ./configure \ --disable-shared \ --enable-pthread \ @@ -46,8 +46,8 @@ $ make test $ cd ROOT/apache-mpm/mpm - $ CFLAGS='-I\$(SRCDIR)/../pth-1.1b3 -DPTHREAD_EVERYWHERE -DNO_SERIALIZED_ACCEPT' \ - LDFLAGS='-L\$(SRCDIR)/../pth-1.1b3/.libs' \ + $ CFLAGS='-I\$(SRCDIR)/../pth-1.1b4 -DPTHREAD_EVERYWHERE -DNO_SERIALIZED_ACCEPT' \ + LDFLAGS='-L\$(SRCDIR)/../pth-1.1b4/.libs' \ LIBS=-lpthread \ ./configure \ --with-layout=GNU \
cvs commit: apache-apr/pthreads/src/include ap_config.h
rse 99/08/12 00:23:21 Modified:pthreads/src/include ap_config.h Log: The additional thread support in ap_config.h: - NO_SERIALIZED_ACCEPT removes any USE_XXX_SERIALIZED_ACCEPT to allow one to force no accept serialization without having to patch the platform specific section. - A new PTHREAD_EVERYWHERE define which forces pthread.h to be included into _every_ source file. See the forthcoming README.rse for details. Revision ChangesPath 1.7 +25 -0 apache-apr/pthreads/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-apr/pthreads/src/include/ap_config.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ap_config.h 1999/06/10 06:25:54 1.6 +++ ap_config.h 1999/08/12 07:23:20 1.7 @@ -1361,6 +1361,31 @@ #define ap_wait_t int #endif +/* + * Special Support for User-Space Threading Environments [rse, 12-Aug-1999] + */ + +/* optionally make sure the Pthread environment is available in _EVERY_ source + by including the Pthread header already in this header file. This is + important for portable user-space threading environments which can only use + soft syscall wrapping (i.e. ``#define read _pthread_read'', etc.) */ +#ifdef PTHREAD_EVERYWHERE +#include pthread.h +#endif + +/* support for forcing no serialized accept situation. This has to be + used by user-space threading environments, because mostly all (except for + USE_PTHREAD_SERIALIZED_ACCEPT, but this only works on a few platforms) + variants of the inter-process accept lock would suspend the whole process + and not just the acceptor thread. */ +#ifdef NO_SERIALIZED_ACCEPT +#undef USE_FCNTL_SERIALIZED_ACCEPT +#undef USE_FLOCK_SERIALIZED_ACCEPT +#undef USE_USLOCK_SERIALIZED_ACCEPT +#undef USE_SYSVSEM_SERIALIZED_ACCEPT +#undef USE_PTHREAD_SERIALIZED_ACCEPT +#endif + #ifdef __cplusplus } #endif
cvs commit: apache-apr/pthreads .cvsignore
rse 99/08/12 00:40:44 Added: pthreads .cvsignore Log: Add a missing .cvsignore Revision ChangesPath 1.1 apache-apr/pthreads/.cvsignore Index: .cvsignore === Makefile config.status config.status.* Makefile.* src.*
cvs commit: apache-apr/poll .cvsignore
rse 99/08/12 00:44:27 Added: poll .cvsignore Log: Add .cvsignore now that the stuff is in CVS Revision ChangesPath 1.1 apache-apr/poll/.cvsignore Index: .cvsignore === Makefile config.cache config.log config.status
cvs commit: apache-apr/apr/time/unix .cvsignore
rse 99/08/12 00:56:41 Added: apr/file_io/unix .cvsignore apr/locks/unix .cvsignore apr/misc/unix .cvsignore apr/network_io/unix .cvsignore apr/signal/unix .cvsignore apr/test .cvsignore apr/threadproc/unix .cvsignore apr/time/unix .cvsignore Log: Add a bunch of .cvsignore files to APR for Unix Revision ChangesPath 1.1 apache-apr/apr/file_io/unix/.cvsignore Index: .cvsignore === Makefile 1.1 apache-apr/apr/locks/unix/.cvsignore Index: .cvsignore === Makefile 1.1 apache-apr/apr/misc/unix/.cvsignore Index: .cvsignore === Makefile 1.1 apache-apr/apr/network_io/unix/.cvsignore Index: .cvsignore === Makefile 1.1 apache-apr/apr/signal/unix/.cvsignore Index: .cvsignore === Makefile 1.1 apache-apr/apr/test/.cvsignore Index: .cvsignore === Makefile 1.1 apache-apr/apr/threadproc/unix/.cvsignore Index: .cvsignore === Makefile 1.1 apache-apr/apr/time/unix/.cvsignore Index: .cvsignore === Makefile
cvs commit: apache-2.0/mpm/src/modules/mpm MPM.NAMING
rse 99/08/12 01:20:07 Modified:mpm/src/modules/mpm MPM.NAMING Log: Try to find overview in the MPM mess. Is this correctly described or did I misunderstood anything? Feel free to fix me... Revision ChangesPath 1.2 +9 -0 apache-2.0/mpm/src/modules/mpm/MPM.NAMING Index: MPM.NAMING === RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/MPM.NAMING,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MPM.NAMING1999/06/24 01:57:51 1.1 +++ MPM.NAMING1999/08/12 08:20:07 1.2 @@ -20,3 +20,12 @@ The MPM_METHOD Rule will use the actual name (eg: prefork) to pick the correct method module to build. + +The following MPMs currently exist: + + prefork ... Multi Process Model with Preforking (Apache 1.3) + dexter Multi Process Model with Threading via Pthreads (v2) + mpmt_pthread .. Multi Process Model with Threading via Pthreads (v1 = Apache/pthread) + spmt_os2 .. Single Process Model with Threading on OS/2 + winnt . Single Process Model with Threading on Windows NT +
cvs commit: apache-2.0/mpm README.rse
rse 99/08/12 05:07:07 Modified:mpm README.rse Log: A little bit of benchmarking for dexter Revision ChangesPath 1.3 +77 -0 apache-2.0/mpm/README.rse Index: README.rse === RCS file: /home/cvs/apache-2.0/mpm/README.rse,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README.rse1999/08/12 11:25:17 1.2 +++ README.rse1999/08/12 12:07:06 1.3 @@ -98,3 +98,80 @@ $ make $ make install + Some quick tests with the dexter MPM and both GNU Pth and FreeBSD uthread + showed the following not too bad results with ApacheBench: + + o FooBar/OS + Ralf S. Engelschall's GNU Pth + dexter MPM + + - ``ps'' after startup + 69294 1 rse 0.0 1516 1008 288 Ss src/apache + 69295 69294 rse 0.0 3604 1532 288 Ssrc/apache + + - $ ab -n 5000 -c 10 en1:8080/index.html + This is ApacheBench, Version 1.3 + Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/ + Copyright (c) 1998-1999 The Apache Group, http://www.apache.org/ + + Server Software:Apache/mpm-dev + Server Hostname:en1 + Server Port:8080 + + Document Path: /index.html + Document Length:114 bytes + + Concurrency Level: 10 + Time taken for tests: 4.552 seconds + Complete requests: 5000 + Failed requests:0 + Total transferred: 1765000 bytes + HTML transferred: 57 bytes + Requests per second:1098.42 + Transfer rate: 387.74 kb/s received + + Connnection Times (ms) + min avg max + Connect:0 0 5 + Processing: 2 8 963 + Total: 2 8 968 + + - ``ps'' after benchmark + 69294 1 rse 0.0 1516 1008 288 Ss src/apache + 69295 69294 rse 7.8 3708 1692 288 Ssrc/apache + + o FreeBSD 3.1 + John Birrell's uthread + dexter MPM + + - ``ps'' after startup + 73364 1 rse 0.0 1472 960 264 Ss src/apache + 73365 73364 rse 0.0 4360 1332 264 Ssrc/apache + + - $ ab -n 5000 -c 10 en1:8080/index.html + This is ApacheBench, Version 1.3 + Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/ + Copyright (c) 1998-1999 The Apache Group, http://www.apache.org/ + + Server Software:Apache/mpm-dev + Server Hostname:en1 + Server Port:8080 + + Document Path: /index.html + Document Length:114 bytes + + Concurrency Level: 10 + Time taken for tests: 5.165 seconds + Complete requests: 5000 + Failed requests:0 + Total transferred: 1765000 bytes + HTML transferred: 57 bytes + Requests per second:968.05 + Transfer rate: 341.72 kb/s received + + Connnection Times (ms) + min avg max + Connect:0 010 + Processing: 21026 + Total: 21036 + + - ``ps'' after benchmark + 73364 1 rse 0.0 1472 960 264 Ss src/apache + 73365 73364 rse10.1 4428 1656 264 Ssrc/apache +
cvs commit: apache-2.0/mpm README.rse
rse 99/08/12 05:09:30 Modified:mpm README.rse Log: Ops, the config is important, too. Revision ChangesPath 1.4 +12 -1 apache-2.0/mpm/README.rse Index: README.rse === RCS file: /home/cvs/apache-2.0/mpm/README.rse,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README.rse1999/08/12 12:07:06 1.3 +++ README.rse1999/08/12 12:09:29 1.4 @@ -99,7 +99,18 @@ $ make install Some quick tests with the dexter MPM and both GNU Pth and FreeBSD uthread - showed the following not too bad results with ApacheBench: + showed the not too bad results with ApacheBench under the following config: + + NumServers 1 + StartThreads32 + MinSpareThreads 32 + MaxSpareThreads 32 + MaxThreadsPerChild 32 + MaxRequestsPerChild 0 + + With more processes the results are not such good. Then both user space + threading libs get only up to 400-500 req/sec. The reason seem to be the + unserialized acccept problem. o FooBar/OS + Ralf S. Engelschall's GNU Pth + dexter MPM
cvs commit: apache-2.0/mpm README.rse
rse 99/08/12 06:25:26 Modified:mpm README.rse Log: Give more details Revision ChangesPath 1.5 +3 -2 apache-2.0/mpm/README.rse Index: README.rse === RCS file: /home/cvs/apache-2.0/mpm/README.rse,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README.rse1999/08/12 12:09:29 1.4 +++ README.rse1999/08/12 13:25:26 1.5 @@ -98,8 +98,9 @@ $ make $ make install - Some quick tests with the dexter MPM and both GNU Pth and FreeBSD uthread - showed the not too bad results with ApacheBench under the following config: + Some quick tests with the dexter MPM and both GNU Pth and FreeBSD uthread on + a PII/400 under FreeBSD 3.1 showed the not too bad results with ApacheBench + under the following config: NumServers 1 StartThreads32
cvs commit: apache-2.0/mpm/conf httpd.conf-dist
rse 99/08/12 06:53:49 Modified:mpm/conf httpd.conf-dist Log: Add a little bit of info for the MPM directives, because dexters directives are confusing. My proposal for Manoj: NumServers = StartServers MaxThreadsPerChild = MaxThreadsPerServer or just MaxThreads MaxRequestsPerChild = MaxRequestsPerThread Revision ChangesPath 1.5 +13 -2 apache-2.0/mpm/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /home/cvs/apache-2.0/mpm/conf/httpd.conf-dist,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- httpd.conf-dist 1999/08/12 11:39:16 1.4 +++ httpd.conf-dist 1999/08/12 13:53:48 1.5 @@ -128,21 +128,32 @@ # # prefork MPM +# StartServers . number of server processes to start +# MinSpareServers .. minimum number of server processes which are kept spare +# MaxSpareServers .. maximum number of server processes which are kept spare +# MaxClients ... maximum number of server processes allowed to start +# MaxRequestsPerChild .. maximum number of requests a server process serves IfModule prefork.c StartServers 5 MinSpareServers 5 MaxSpareServers 10 -MaxClients 8 +MaxClients 20 MaxRequestsPerChild 0 /IfModule # dexter MPM +# NumServers ... number of server processes to start +# StartThreads . number of worker threads to start in each server process +# MinSpareThreads .. minimum number of worker threads which are kept spare +# MaxSpareThreads .. maximum number of worker threads which are kept spare +# MaxThreadsPerChild ... maximum number of worker threads allowed to start +# MaxRequestsPerChild .. maximum number of requests a worker thread serves IfModule dexter.c NumServers 5 StartThreads 5 MinSpareThreads 5 MaxSpareThreads 10 -MaxThreadsPerChild 8 +MaxThreadsPerChild 20 MaxRequestsPerChild 0 /IfModule
cvs commit: apache-1.3/src/main http_main.c
rse 99/08/10 06:54:49 Modified:src/support httpd.8 src/main http_main.c Log: Fix the -T stuff Revision ChangesPath 1.15 +11 -0 apache-1.3/src/support/httpd.8 Index: httpd.8 === RCS file: /home/cvs/apache-1.3/src/support/httpd.8,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- httpd.8 1999/07/13 15:19:48 1.14 +++ httpd.8 1999/08/10 13:54:47 1.15 @@ -92,6 +92,12 @@ [ .B \-S ] +[ +.B \-t +] +[ +.B \-T +] .SH DESCRIPTION .B httpd @@ -163,6 +169,11 @@ Run syntax tests for configuration files only. The program immediately exits after these syntax parsing with either a return code of 0 (Syntax OK) or return code not equal to 0 (Syntax Error). +.TP +.B \-T +Same as option +.B \-t +but does not check the configured document roots. .TP .B \-X Run in single-process mode, for internal debugging purposes only; the daemon 1.471 +3 -2 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.470 retrieving revision 1.471 diff -u -r1.470 -r1.471 --- http_main.c 1999/08/09 07:54:52 1.470 +++ http_main.c 1999/08/10 13:54:48 1.471 @@ -1034,7 +1034,7 @@ fprintf(stderr, Usage: %s [-D name] [-d directory] [-f file]\n, bin); #endif fprintf(stderr,%s [-C \directive\] [-c \directive\]\n, pad); -fprintf(stderr,%s [-v] [-V] [-h] [-l] [-L] [-S] [-t]\n, pad); +fprintf(stderr,%s [-v] [-V] [-h] [-l] [-L] [-S] [-t] [-T]\n, pad); #ifdef WIN32 fprintf(stderr,%s [-n service] [-k signal] [-i] [-u]\n, pad); #endif @@ -1053,7 +1053,8 @@ fprintf(stderr, -l : list compiled-in modules\n); fprintf(stderr, -L : list available configuration directives\n); fprintf(stderr, -S : show parsed settings (currently only vhost settings)\n); -fprintf(stderr, -t : run syntax test for configuration files only\n); +fprintf(stderr, -t : run syntax check for config files (with docroot check)\n); +fprintf(stderr, -T : run syntax check for config files (without docroot check)\n); #ifdef WIN32 fprintf(stderr, -n name : set service name and use its ServerConfigFile\n); fprintf(stderr, -k shutdown : tell running Apache to shutdown\n);
cvs commit: apache-1.3/src/modules/experimental mod_auth_digest.c
rse 99/08/10 07:05:05
Modified:src/modules/experimental mod_auth_digest.c
Log:
Fix conflict with original mod_digest related to the symbol of the module
dispatch list (which has to be unique for DSO _and_ follow the usual
conventions for the installation procedure).
Revision ChangesPath
1.3 +12 -12apache-1.3/src/modules/experimental/mod_auth_digest.c
Index: mod_auth_digest.c
===
RCS file: /home/cvs/apache-1.3/src/modules/experimental/mod_auth_digest.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_auth_digest.c 1999/08/09 06:15:26 1.2
+++ mod_auth_digest.c 1999/08/10 14:05:04 1.3
@@ -84,7 +84,7 @@
/* The section for the Configure script:
* MODULE-DEFINITION-START
- * Name: digest_module
+ * Name: digest_auth_module
* ConfigStart
RULE_DEV_RANDOM=`./helpers/CutRule DEV_RANDOM $file`
@@ -98,10 +98,10 @@
fi
fi
if [ $RULE_DEV_RANDOM = truerand ]; then
- echo (mod_digest) using truerand library for the random seed
+ echo (mod_auth_digest) using truerand library for the random
seed
LIBS=$LIBS -L/usr/local/lib -lrand
else
- echo (mod_digest) using $RULE_DEV_RANDOM for the random seed
+ echo (mod_auth_digest) using $RULE_DEV_RANDOM for the random
seed
CFLAGS=$CFLAGS -DDEV_RANDOM=$RULE_DEV_RANDOM
fi
@@ -233,7 +233,7 @@
static void *client_mm = NULL;
#endif /* HAVE_SHMEM_MM */
-module MODULE_VAR_EXPORT digest_module;
+module MODULE_VAR_EXPORT digest_auth_module;
/*
* initialization code
@@ -1074,7 +1074,7 @@
resp = ap_pcalloc(r-pool, sizeof(digest_header_rec));
resp-request_uri = r-parsed_uri;
resp-needed_auth = 0;
-ap_set_module_config(r-request_config, digest_module, resp);
+ap_set_module_config(r-request_config, digest_auth_module, resp);
res = get_digest_rec(r, resp);
resp-client = get_client(resp-opaque_num, r);
@@ -1626,14 +1626,14 @@
while (mainreq-main != NULL) mainreq = mainreq-main;
while (mainreq-prev != NULL) mainreq = mainreq-prev;
resp = (digest_header_rec *)
ap_get_module_config(mainreq-request_config,
- digest_module);
+ digest_auth_module);
resp-needed_auth = 1;
/* get our conf */
conf = (digest_config_rec *) ap_get_module_config(r-per_dir_config,
- digest_module);
+ digest_auth_module);
/* check for existence and syntax of Auth header */
@@ -1816,7 +1816,7 @@
{
const digest_config_rec *conf =
(digest_config_rec *) ap_get_module_config(r-per_dir_config,
-digest_module);
+digest_auth_module);
const char *user = r-connection-user;
int m = r-method_number;
int method_restricted = 0;
@@ -1886,7 +1886,7 @@
note_digest_auth_failure(r, conf,
(digest_header_rec *) ap_get_module_config(r-request_config,
-digest_module),
+digest_auth_module),
0);
return AUTH_REQUIRED;
}
@@ -1911,10 +1911,10 @@
{
const digest_config_rec *conf =
(digest_config_rec *) ap_get_module_config(r-per_dir_config,
-digest_module);
+digest_auth_module);
digest_header_rec *resp =
(digest_header_rec *) ap_get_module_config(r-request_config,
-digest_module);
+digest_auth_module);
const char *ai = NULL, *digest = NULL, *nextnonce = ;
if (resp == NULL || !resp-needed_auth || conf == NULL)
@@ -2046,7 +2046,7 @@
}
-module MODULE_VAR_EXPORT digest_module =
+module MODULE_VAR_EXPORT digest_auth_module =
{
STANDARD_MODULE_STUFF,
initialize_module, /* initializer */
cvs commit: apache-1.3/src/modules/experimental mod_auth_digest.c
rse 99/08/08 23:15:27
Modified:src/modules/experimental mod_auth_digest.c
Log:
Fix the following warnings (occured under FreeBSD 3.1, GCC 2.95):
| egcc -c -I../../os/unix -I../../include -funsigned-char
-DTARGET=\apache\
| -DDEV_RANDOM=/dev/random -DUSE_EXPAT -I../../lib/expat-lite -pipe -O2
| -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes
| -Wmissing-declarations -Wnested-externs -Winline `../../apaci`
| mod_auth_digest.c
| mod_auth_digest.c:1095: warning: declaration of `time' shadows global
| declaration
| mod_auth_digest.c: In function `gen_nonce_hash':
| mod_auth_digest.c:1098: warning: declaration of `time' shadows global
| declaration
| mod_auth_digest.c: In function `authenticate_digest_user':
| mod_auth_digest.c:1605: warning: `main' is usually a function
Revision ChangesPath
1.2 +7 -7 apache-1.3/src/modules/experimental/mod_auth_digest.c
Index: mod_auth_digest.c
===
RCS file: /home/cvs/apache-1.3/src/modules/experimental/mod_auth_digest.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_auth_digest.c 1999/08/08 22:34:24 1.1
+++ mod_auth_digest.c 1999/08/09 06:15:26 1.2
@@ -1092,7 +1092,7 @@
/* The hash part of the nonce is a SHA-1 hash of the time, realm, opaque,
* and our secret.
*/
-static void gen_nonce_hash(char *hash, const char *time, const char *opaque,
+static void gen_nonce_hash(char *hash, const char *timestr, const char
*opaque,
const server_rec *server,
const digest_config_rec *conf)
{
@@ -1106,7 +1106,7 @@
strlen(server-server_hostname));
ap_SHA1Update_binary(ctx, (const unsigned char *) server-port,
sizeof(server-port));
-ap_SHA1Update_binary(ctx, (const unsigned char *) time, strlen(time));
+ap_SHA1Update_binary(ctx, (const unsigned char *) timestr,
strlen(timestr));
if (opaque)
ap_SHA1Update_binary(ctx, (const unsigned char *) opaque,
strlen(opaque));
@@ -1602,7 +1602,7 @@
{
digest_config_rec *conf;
digest_header_rec *resp;
-request_rec *main;
+request_rec *mainreq;
conn_rec *conn = r-connection;
const char*t;
intres;
@@ -1622,10 +1622,10 @@
/* get the client response and mark */
-main = r;
-while (main-main != NULL) main = main-main;
-while (main-prev != NULL) main = main-prev;
-resp = (digest_header_rec *) ap_get_module_config(main-request_config,
+mainreq = r;
+while (mainreq-main != NULL) mainreq = mainreq-main;
+while (mainreq-prev != NULL) mainreq = mainreq-prev;
+resp = (digest_header_rec *)
ap_get_module_config(mainreq-request_config,
digest_module);
resp-needed_auth = 1;
cvs commit: apache-1.3/src/ap ap_base64.c
rse 99/08/08 10:38:47 Modified:src/ap ap_base64.c Log: typos while poking around Revision ChangesPath 1.2 +1 -1 apache-1.3/src/ap/ap_base64.c Index: ap_base64.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_base64.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ap_base64.c 1999/08/08 16:12:58 1.1 +++ ap_base64.c 1999/08/08 17:38:45 1.2 @@ -55,7 +55,7 @@ * */ -/* * base64 encoder/decoder. Origianly part of main/util.c +/* base64 encoder/decoder. Originally part of main/util.c * but moved here so that support/ab and ap_sha1.c could * use it. This mean (re)moving the ap_palloc()s. And adding * ugly 'len' functions. Which is quite a nasty cost.
cvs commit: apache-1.3/htdocs/manual/misc howto.html
rse 99/07/30 02:51:03 Modified:htdocs/manual/misc howto.html Log: Fix PR#4720 Revision ChangesPath 1.12 +3 -2 apache-1.3/htdocs/manual/misc/howto.html Index: howto.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/howto.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- howto.html1999/04/21 05:01:24 1.11 +++ howto.html1999/07/30 09:51:01 1.12 @@ -85,8 +85,9 @@ BLOCKQUOTEPRE #!/usr/local/bin/perl -print Status: 302 Moved Temporarily\r -Location: http://www.some.where.else.com/\r\n\r\n;; +print Status: 302 Moved Temporarily\r\n . + Location: http://www.some.where.else.com/\r\n; . + \r\n; /PRE/BLOCKQUOTE/P
cvs commit: apache-1.3 INSTALL
rse 99/07/30 02:53:08 Modified:.INSTALL Log: Typo. PR#4789 Revision ChangesPath 1.58 +1 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /home/cvs/apache-1.3/INSTALL,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- INSTALL 1999/06/23 06:55:25 1.57 +++ INSTALL 1999/07/30 09:53:07 1.58 @@ -326,7 +326,7 @@ this way implicitly enables them itself). Note 1: The --enable-shared option DOES NOT AUTOMATICALLY enable the - module because there are variants like `--enable-shared=all' + module because there are variants like `--enable-shared=max' which should not imply `--enable-module=all'. Note 2: Per default the DSO mechanism is globally disabled, i.e. no
cvs commit: apache-1.3 STATUS
rse 99/07/28 07:06:21 Modified:.STATUS Log: Updates Revision ChangesPath 1.726 +12 -7 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.725 retrieving revision 1.726 diff -u -r1.725 -r1.726 --- STATUS1999/07/27 18:48:51 1.725 +++ STATUS1999/07/28 14:06:20 1.726 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/07/27 18:48:51 $] + Last modified at [$Date: 1999/07/28 14:06:20 $] Release: @@ -67,6 +67,14 @@ RELEASE SHOWSTOPPERS: +* The Vary header field stuff is still broken (multiple + entries occur, etc.). The result is that some browsers (AFAIK at least + MSIE) are horribly confused by the responses. + Status: It should be fixed before 1.3.7 went out. For details + how it should be done, please look at new-httpd mailing list + archive: Ken, Ralf and Roy have already found consensus in the + past there. + RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * Graham Legget has found that if he uses the 1.3.7-dev core, and @@ -78,12 +86,9 @@ * mod_rewrite/3874: RewriteLock doesn't work for virtual hosts Status: (Ralf): When I find time, I can look at this. But I would appreciate when someone other already can dive into - this. My opinion is already appended to the PR. -rse - -* The Vary header field stuff is still broken (multiple - entries occur, etc.), for instance also in mod_rewrite. - Status: (Ralf): I've already started to work on this, but - I've not finished it. I've less time... + this. My opinion is already appended to the PR. It +should be not too hard to fix. But one has +to carefully look at the whole context again. -rse * long pathnames with many components and no AllowOverride None Workaround is to define Directory / with AllowOverride None,
cvs commit: apache-2.0/mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c
rse 99/07/16 03:27:05
Modified:mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c
Log:
Be careful, accept_mutex_child_init() has to be done _before_
unixd_setup_child() switches the process UID, because else under platforms
where the mutex is flock() based this fails...
Revision ChangesPath
1.9 +3 -2
apache-2.0/mpm/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===
RCS file:
/home/cvs/apache-2.0/mpm/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mpmt_pthread.c1999/07/16 07:15:48 1.8
+++ mpmt_pthread.c1999/07/16 10:27:03 1.9
@@ -992,12 +992,13 @@
/*stuff to do before we switch id's, so we have permissions.*/
reopen_scoreboard(pchild);
+SAFE_ACCEPT(intra_mutex_init(pchild, 1));
+SAFE_ACCEPT(accept_mutex_child_init(pchild));
+
if (unixd_setup_child()) {
clean_child_exit(APEXIT_CHILDFATAL);
}
-SAFE_ACCEPT(intra_mutex_init(pchild, 1));
-SAFE_ACCEPT(accept_mutex_child_init(pchild));
ap_child_init_hook(pchild, server_conf);
/*done with init critical section */
cvs commit: apache-2.0/mpm/src Configuration.tmpl
rse 99/07/04 01:45:24 Modified:mpm/src Configuration.tmpl Log: Add MPM_METHOD to make APACI working for apache-mpm, too. Revision ChangesPath 1.2 +6 -0 apache-2.0/mpm/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Configuration.tmpl1999/06/18 18:39:23 1.1 +++ Configuration.tmpl1999/07/04 08:45:23 1.2 @@ -193,6 +193,12 @@ Rule WANTHSREGEX=default +# MPM Support: +# Available MPM modules: prefork (default), mpmt_pthread + +Rule MPM_METHOD=default + + # Module configuration # # Modules are listed in reverse priority order --- the ones that come
cvs commit: apache-2.0/mpm/src/include httpd.h
rse 99/07/04 02:13:33
Modified:mpm configure
mpm/src Configuration.mpm Configuration.tmpl Configure
mpm/src/include httpd.h
Removed: mpm Makefile config.status
Log:
Some cleanups to the apache-mpm stuff and one major config change:
Rule's aren't intended to get a value other than yes/no/default assigned, so
it doesn't play nice with the existing config stuff. I suggest that we rename
Rule MPM_METHOD=default to a variable MPM_METHOD=default (which can then
get any value assigned) and for enabling the stuff we use a boolean Rule
MPM=default. This way one can configure apache-mpm for preforking via
$ ./configure --enable-rule=MPM
or explicitly
$ MPM_METHOD=prefork ./configure --enable-rule=MPM
and for threading via:
$ MPM_METHOD=mpmt_pthread ./configure --enable-rule=MPM
Dean, I hope it is ok for you. If not, just complain.
Revision ChangesPath
1.2 +2 -2 apache-2.0/mpm/configure
Index: configure
===
RCS file: /home/cvs/apache-2.0/mpm/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure 1999/06/18 18:39:12 1.1
+++ configure 1999/07/04 09:13:29 1.2
@@ -957,7 +957,7 @@
echo ## $configstatus
echo $configstatus
for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
- LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET; do
+ LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET MPM_METHOD;
do
eval val=\\$$var\
if [ x$val != x ]; then
echo $var=$val |\
@@ -1254,7 +1254,7 @@
OIFS=$IFS
IFS=$DIFS
for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
- LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET; do
+ LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET MPM_METHOD;
do
eval val=\\$$var\;
if [ x$val != x ]; then
case $var in
1.11 +3 -3 apache-2.0/mpm/src/Configuration.mpm
Index: Configuration.mpm
===
RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.mpm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Configuration.mpm 1999/06/23 00:42:25 1.10
+++ Configuration.mpm 1999/07/04 09:13:30 1.11
@@ -23,9 +23,9 @@
Rule PARANOID=no
Rule EXPAT=no
Rule WANTHSREGEX=default
-Rule MPM_METHOD=default
-#Rule MPM_METHOD=prefork
-#Rule MPM_METHOD=mpmt_pthread
+Rule MPM=default
+MPM_METHOD=prefork
+#MPM_METHOD=mpmt_pthread
#
# AddModule modules/experimental/mod_mmap_static.o
AddModule modules/standard/mod_env.o
1.3 +2 -1 apache-2.0/mpm/src/Configuration.tmpl
Index: Configuration.tmpl
===
RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Configuration.tmpl1999/07/04 08:45:23 1.2
+++ Configuration.tmpl1999/07/04 09:13:31 1.3
@@ -196,7 +196,8 @@
# MPM Support:
# Available MPM modules: prefork (default), mpmt_pthread
-Rule MPM_METHOD=default
+Rule MPM=default
+MPM_METHOD=default
# Module configuration
1.9 +21 -12apache-2.0/mpm/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-2.0/mpm/src/Configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Configure 1999/06/24 01:57:45 1.8
+++ Configure 1999/07/04 09:13:31 1.9
@@ -227,7 +227,7 @@
RULE_EXPAT=`./helpers/CutRule EXPAT $file`
RULE_SHARED_CORE=`./helpers/CutRule SHARED_CORE $file`
RULE_SHARED_CHAIN=`./helpers/CutRule SHARED_CHAIN $file`
-RULE_MPM_METHOD=`./helpers/CutRule MPM_METHOD $file`
+RULE_MPM=`./helpers/CutRule MPM $file`
## Rule SHARED_CORE implies required DSO support
@@ -810,13 +810,23 @@
## Now handle the MPM implementation. Default to 1.3 prefork
##
-if [ x$RULE_MPM_METHOD = xdefault ]; then
- if [ x$DEF_MPM_METHOD = x ]; then
- RULE_MPM_METHOD=prefork
- else
- RULE_MPM_METHOD=$DEF_MPM_METHOD
- fi
+if [ x$RULE_MPM = xdefault ]; then
+if [ x$DEF_MPM = x ]; then
+RULE_MPM=yes
+else
+RULE_MPM=$DEF_MPM
+fi
fi
+if [ x$RULE_MPM = xyes ]; then
+MPM_METHOD=`egrep '^MPM_METHOD=' Makefile.config | tail -1 | awk -F=
'{print $2}'`
+if [ x$MPM_METHOD = xdefault
cvs commit: apache-2.0/mpm 00README_FIRST_REALLY
rse 99/07/04 02:15:47 Modified:mpm 00README_FIRST_REALLY Log: Some hints Revision ChangesPath 1.2 +23 -1 apache-2.0/mpm/00README_FIRST_REALLY Index: 00README_FIRST_REALLY === RCS file: /home/cvs/apache-2.0/mpm/00README_FIRST_REALLY,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 00README_FIRST_REALLY 1999/06/18 19:00:16 1.1 +++ 00README_FIRST_REALLY 1999/07/04 09:15:45 1.2 @@ -3,4 +3,26 @@ Save yourself a headache and cd src and start working there. -Dean +- Dean + +You can build for 1.3 preforking via: + +$ MPM_METHOD=prefork \ + ./configure \ + --enable-rule=MPM + --disable-module=status + --disable-module=include + --disable-module=cgi + +and for the MPM pthreading stuff via: + +$ MPM_METHOD=mpmt_pthread \ + ./configure \ + --enable-rule=MPM + --disable-module=status + --disable-module=include + --disable-module=cgi + +(on some systems you also need ``CFLAGS=-pthread LDFLAGS=-pthread'' !!) + +- Ralf
cvs commit: apache-2.0/mpm/htdocs - New directory
rse 99/07/04 02:25:26 apache-2.0/mpm/htdocs - New directory
cvs commit: apache-2.0/mpm/htdocs index.html
rse 99/07/04 02:26:08 Added: mpm/htdocs index.html Log: Let make install work again Revision ChangesPath 1.1 apache-2.0/mpm/htdocs/index.html Index: index.html === html head titleSimple Page for Apache-MPM/title /head body Simple Page for Apache-MPM /body /html
cvs commit: apache-2.0/mpm/src/support apachectl.8 apachectl.1
rse 99/07/04 02:27:17 Added: mpm/src/support apachectl.8 Removed: mpm/src/support apachectl.1 Log: Ops, seems like something was messed up here: apachectl.8 was missing and instead an empty apachectl.1 exists. Fix this to let make install work also for apache-mpm. Revision ChangesPath 1.1 apache-2.0/mpm/src/support/apachectl.8 Index: apachectl.8 === .TH apachectl 1 September 1997 .\ Copyright (c) 1997-1999 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. Products derived from this software may not be called Apache .\nor may Apache appear in their names without prior written .\permission of the Apache Group. .\ .\ 6. 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/. .SH NAME apachectl \- Apache HTTP server control interface .SH SYNOPSIS .B apachectl \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 daemon. .PP .B NOTE: If your Apache installation uses non-standard paths, you will need to edit the .B apachectl script to set the appropriate paths to your PID file and your .B httpd binary. See the comments in the script for details. .PP The .B apachectl script returns a 0 exit value on success, and 0 if an error occurs. For more details, view the comments in the script. .PP Full documentation for Apache is available at .B http://www.apache.org/ . .SH 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. .TP .BI stop Stops the Apache daemon. .TP .BI restart Restarts the Apache daemon by sending it a SIGHUP. If the daemon is not running, it is started. This command automatically checks the configuration files via .BI configtest before initiating the restart to make sure Apache doesn't die. .TP .BI fullstatus 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 \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. .TP .BI status Displays a brief status
cvs commit: apache-2.0/mpm/conf httpd.conf-dist
rse 99/07/04 02:38:03 Modified:mpm/conf httpd.conf-dist Log: Make the config work for apache-mpm Revision ChangesPath 1.2 +1 -1 apache-2.0/mpm/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /home/cvs/apache-2.0/mpm/conf/httpd.conf-dist,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- httpd.conf-dist 1999/06/18 18:39:16 1.1 +++ httpd.conf-dist 1999/07/04 09:38:02 1.2 @@ -45,7 +45,7 @@ # ServerType is either inetd, or standalone. Inetd mode is only supported on # Unix platforms. # -ServerType standalone +#ServerType standalone # # ServerRoot: The top of the directory tree under which the server's
cvs commit: apache-1.3/htdocs/manual/mod mod_vhost_alias.html
rse 99/06/29 01:27:06 Modified:htdocs/manual/mod mod_vhost_alias.html Log: Fix hyperlink Revision ChangesPath 1.3 +1 -1 apache-1.3/htdocs/manual/mod/mod_vhost_alias.html Index: mod_vhost_alias.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_vhost_alias.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_vhost_alias.html 1999/06/23 18:24:03 1.2 +++ mod_vhost_alias.html 1999/06/29 08:27:05 1.3 @@ -28,7 +28,7 @@ override the behaviour of other modules that do filename translation, e.g. A HREF=mod_userdir.htmlCODEmod_userdir/CODE/A and A HREF=mod_alias.htmlCODEmod_alias/CODE/A. It provides -support for A HREF=../vhost/mass.htmldynamically configured mass +support for A HREF=../vhosts/mass.htmldynamically configured mass virtual hosting/A. /P
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 99/06/29 01:37:44
Modified:src/modules/standard mod_rewrite.c
Log:
typos
Revision ChangesPath
1.141 +2 -2 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- mod_rewrite.c 1999/06/22 00:51:37 1.140
+++ mod_rewrite.c 1999/06/29 08:37:43 1.141
@@ -158,9 +158,9 @@
{ RewriteBase, cmd_rewritebase, NULL, OR_FILEINFO, TAKE1,
the base URL of the per-directory context },
{ RewriteCond, cmd_rewritecond, NULL, OR_FILEINFO, RAW_ARGS,
- a input string and a to be applied regexp-pattern },
+ an input string and a to be applied regexp-pattern },
{ RewriteRule, cmd_rewriterule, NULL, OR_FILEINFO, RAW_ARGS,
- a URL-applied regexp-pattern and a substitution URL },
+ an URL-applied regexp-pattern and a substitution URL },
{ RewriteMap, cmd_rewritemap, NULL, RSRC_CONF, TAKE2,
a mapname and a filename },
{ RewriteLock, cmd_rewritelock, NULL, RSRC_CONF, TAKE1,
cvs commit: apache-1.3/htdocs/manual/mod mod_example.html
rse 99/06/29 05:06:36 Modified:htdocs/manual/mod mod_example.html Log: Fix description of Example directive. It just activates a demo flag and doesn't really enable the example contents handler. Revision ChangesPath 1.8 +7 -6 apache-1.3/htdocs/manual/mod/mod_example.html Index: mod_example.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_example.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_example.html 1998/01/26 16:54:11 1.7 +++ mod_example.html 1999/06/29 12:06:36 1.8 @@ -155,12 +155,13 @@ available in Apache 1.2 and later. /P P - The SAMPExample/SAMP directive activates the example module's - content handler - for a particular location or file type. It takes no arguments. If - you browse to an URL to which the example content-handler applies, you - will get a display of the routines within the module and how and in - what order they were called to service the document request. + The SAMPExample/SAMP directive just sets a demonstration flag which the + example module's content handler displays. It takes no arguments. If you + browse to an URL to which the example content-handler applies, you will get + a display of the routines within the module and how and in what order they + were called to service the document request. The effect of this directive + one can observe under the point SAMPExample directive declared + here: YES/NO/SAMP. /P !--#include virtual=footer.html -- /BODY
cvs commit: apache-1.3/src/helpers mkshadow.sh
rse 99/06/29 06:43:15 Modified:src/helpers mkshadow.sh Log: Merge in two robustness enhancements and a real bugfix from GNU shtool's mkshadow Revision ChangesPath 1.10 +3 -3 apache-1.3/src/helpers/mkshadow.sh Index: mkshadow.sh === RCS file: /home/cvs/apache-1.3/src/helpers/mkshadow.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mkshadow.sh 1999/04/21 14:32:29 1.9 +++ mkshadow.sh 1999/06/29 13:43:15 1.10 @@ -52,7 +52,7 @@ if [ ! -d $dst ]; then mkdir $dst fi -DIRS=`cd $src +DIRS=`cd $src; \ find . -type d -print |\ sed -e '/\/CVS/d' \ -e '/^\.$/d' \ @@ -64,7 +64,7 @@ IFS=$OIFS # fill directory tree with symlinks to files -FILES=`cd $src +FILES=`cd $src; \ find . -depth -print |\ sed -e '/\.o$/d' \ -e '/\.a$/d' \ @@ -81,7 +81,7 @@ OIFS=$IFS IFS=$DIFS for file in $FILES; do # don't use `-type f' above for find because of symlinks - if [ -d $file ]; then + if [ -d $src/$file ]; then continue fi basename=`echo $file | sed -e 's:^.*/::'`
cvs commit: apache-1.3/src/helpers buildinfo.sh
rse 99/06/29 06:49:14
Modified:src/helpers buildinfo.sh
Log:
Overtake also some fixes from GNU shtool for buildinfo.sh...
Revision ChangesPath
1.9 +6 -6 apache-1.3/src/helpers/buildinfo.sh
Index: buildinfo.sh
===
RCS file: /home/cvs/apache-1.3/src/helpers/buildinfo.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- buildinfo.sh 1999/04/21 14:30:26 1.8
+++ buildinfo.sh 1999/06/29 13:49:14 1.9
@@ -58,10 +58,10 @@
if [ x$username = x ]; then
username=$USER
if [ x$username = x ]; then
-username=`whoami 2/dev/null |\
+username=`(whoami) 2/dev/null |\
awk '{ printf(%s, $1); }'`
if [ x$username = x ]; then
-username=`who am i 2/dev/null |\
+username=`(who am i) 2/dev/null |\
awk '{ printf(%s, $1); }'`
if [ x$username = x ]; then
username='unknown'
@@ -73,10 +73,10 @@
#
# determine hostname and domainname
#
-hostname=`uname -n 2/dev/null |\
+hostname=`(uname -n) 2/dev/null |\
awk '{ printf(%s, $1); }'`
if [ x$hostname = x ]; then
-hostname=`hostname 2/dev/null |\
+hostname=`(hostname) 2/dev/null |\
awk '{ printf(%s, $1); }'`
if [ x$hostname = x ]; then
hostname='unknown'
@@ -115,8 +115,8 @@
if [ x$time_year = x ]; then
time_year=`date '+%y' | awk '{ printf(%s, $1); }'`
case $time_year in
-9[0-9]*) time_year=19$time_year ;;
- *) time_year=20$time_year ;;
+[5-9][0-9]) time_year=19$time_year ;;
+[0-4][0-9]) time_year=20$time_year ;;
esac
fi
case $time_month in
cvs commit: apache-1.3/src/main http_main.c
rse 99/06/29 07:27:43 Modified:src CHANGES src/main http_main.c Log: Fixed `httpd' usage display: -D was missing. PR: 4614 Revision ChangesPath 1.1389+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1388 retrieving revision 1.1389 diff -u -r1.1388 -r1.1389 --- CHANGES 1999/06/29 14:16:42 1.1388 +++ CHANGES 1999/06/29 14:27:39 1.1389 @@ -1,5 +1,8 @@ Changes with Apache 1.3.7 + *) Fixed `httpd' usage display: -D was missing. + [Ralf S. Engelschall] PR#4614 + *) Fix `make r' test procedure in src/regex/: ap_isprint was not found. [Ralf S. Engelschall] PR#4561, PR#4562 1.451 +2 -2 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.450 retrieving revision 1.451 diff -u -r1.450 -r1.451 --- http_main.c 1999/06/24 16:38:50 1.450 +++ http_main.c 1999/06/29 14:27:42 1.451 @@ -1028,9 +1028,9 @@ pad[i] = ' '; pad[i] = '\0'; #ifdef SHARED_CORE -fprintf(stderr, Usage: %s [-R directory] [-d directory] [-f file]\n, bin); +fprintf(stderr, Usage: %s [-R directory] [-D name] [-d directory] [-f file]\n, bin); #else -fprintf(stderr, Usage: %s [-d directory] [-f file]\n, bin); +fprintf(stderr, Usage: %s [-D name] [-d directory] [-f file]\n, bin); #endif fprintf(stderr,%s [-C \directive\] [-c \directive\]\n, pad); fprintf(stderr,%s [-v] [-V] [-h] [-l] [-L] [-S] [-t]\n, pad);
cvs commit: apache-1.3/htdocs/manual/mod mod_alias.html
rse 99/06/29 07:32:17 Modified:htdocs/manual/mod mod_alias.html Log: Fix context description of RedirectMatch. It's also useable in per-dir context - similar to Redirect. Submitted by: Klaus Johannes Rusch [EMAIL PROTECTED] PR: 4611 Revision ChangesPath 1.24 +2 -1 apache-1.3/htdocs/manual/mod/mod_alias.html Index: mod_alias.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_alias.html,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mod_alias.html1999/03/15 22:14:39 1.23 +++ mod_alias.html1999/06/29 14:32:15 1.24 @@ -221,7 +221,8 @@ A HREF=directive-dict.html#Context REL=Help -STRONGContext:/STRONG/A server config, virtual hostBR +STRONGContext:/STRONG/A server config, virtual host, directory, + .htaccessBR A HREF=directive-dict.html#Override REL=Help
