cvs commit: apachen/htdocs/manual/mod directive-dict.html directives.html mod_example.html mod_proxy.html
coar97/10/15 07:45:27 Modified:htdocs/manual/mod directives.html mod_example.html mod_proxy.html Added: htdocs/manual/mod directive-dict.html Log: Clean up some typos in the proxy documentation, and add a dictionary for the directive attributes (status, override, et cetera) - part of the directive-documentation-normalisation effort, and something I've wanted for a long time. Updated the mod_example page to use the links to the dictionary (as an example ;-). Revision ChangesPath 1.34 +9 -1 apachen/htdocs/manual/mod/directives.html Index: directives.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/directives.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- directives.html 1997/09/12 09:38:03 1.33 +++ directives.html 1997/10/15 14:45:24 1.34 @@ -14,7 +14,15 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Directives/H1 - +P +Each Apache directive available in the standard Apache distribution is +listed here. They are described using a consistent format, and there is +A + HREF=directive-dict.html + REL=Glossary +a dictionary/A +of the terms used in their descriptions available. +/P ul liA HREF=core.html#accessconfigAccessConfig/A liA HREF=core.html#accessfilenameAccessFileName/A 1.5 +33 -7 apachen/htdocs/manual/mod/mod_example.html Index: mod_example.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_example.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_example.html 1997/09/11 13:27:50 1.4 +++ mod_example.html 1997/10/15 14:45:25 1.5 @@ -117,20 +117,46 @@ Example /A/H2 P - STRONGSyntax:/STRONG Example + A + HREF=directive-dict.html#Syntax + REL=Help + STRONGSyntax:/STRONG/A Example BR - STRONGDefault:/STRONG None + A + HREF=directive-dict.html#Default + REL=Help + STRONGDefault:/STRONG/A None BR - STRONGContext:/STRONG server config, virtual host, directory, .htaccess + A + HREF=directive-dict.html#Context + REL=Help + STRONGContext:/STRONG/A server config, virtual host, directory, + .htaccess BR - STRONGOverride:/STRONG Options + A + HREF=directive-dict.html#Override + REL=Help + STRONGOverride:/STRONG/A Options BR - STRONGStatus:/STRONG Extension + A + HREF=directive-dict.html#Status + REL=Help + STRONGStatus:/STRONG/A Extension BR - STRONGModule:/STRONG mod_example + A + HREF=directive-dict.html#Module + REL=Help + STRONGModule:/STRONG/A mod_example + BR + A + HREF=directive-dict.html#Compatibility + REL=Help + STRONGCompatibility:/STRONG/A SAMPExample/SAMP is only + available in Apache 1.2 and later. /P P - The Example directive activates the example module's content handler + 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 1.29 +95 -33apachen/htdocs/manual/mod/mod_proxy.html Index: mod_proxy.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_proxy.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- mod_proxy.html1997/07/21 04:41:57 1.28 +++ mod_proxy.html1997/10/15 14:45:25 1.29 @@ -17,13 +17,15 @@ This module is contained in the codemod_proxy.c/code file for Apache 1.1.x, or the codemodules/proxy/code subdirectory for Apache 1.2, and -is not compiled in by default. It provides for an bHTTP 1.0/b caching proxy +is not compiled in by default. It provides for an STRONGHTTP +1.0/STRONG caching proxy server. It is only available in Apache 1.1 and later. Common configuration -questions are addressed a href=#configshere/a. +questions are addressed a href=#configsafter the directive +descriptions/a. h3Note:/h3 pThis module was experimental in Apache 1.1.x. As of Apache 1.2, mod_proxy -stability is igreatly/i improved.p +stability is EMgreatly/EM improved.p h2Summary/h2 @@ -61,18 +63,23 @@ strongSyntax:/strong ProxyRequests emon/off/embr strongDefault:/strong codeProxyRequests Off/codebr strongContext:/strong server config, virtual hostbr +strongOverride:/strong EMNot applicable/EMbr strongStatus:/strong Basebr strongModule:/strong mod_proxybr -strongCompatibility
cvs commit: apachen/src/modules/example mod_example.c
coar97/10/15 08:34:23 Modified:src/modules/example mod_example.c Log: Correct returns from auth/auth hooks so they don't interfere with *real* auth/auth activities by other modules. PR: 603 Revision ChangesPath 1.21 +2 -2 apachen/src/modules/example/mod_example.c Index: mod_example.c === RCS file: /export/home/cvs/apachen/src/modules/example/mod_example.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mod_example.c 1997/10/07 19:57:44 1.20 +++ mod_example.c 1997/10/15 15:34:22 1.21 @@ -940,7 +940,7 @@ * didn't actually do anything). */ trace_add(r-server, r, cfg, example_auth_checker()); -return OK; +return DECLINED; } /* @@ -959,7 +959,7 @@ cfg = our_dconfig(r); trace_add(r-server, r, cfg, example_access_checker()); -return OK; +return DECLINED; } /*
cvs commit: apachen/htdocs/manual man-template.html
coar97/10/15 19:14:42 Modified:htdocs/manual man-template.html Log: Oopsie. Forgot to include this when I check in the directive dictionary files this morning. Modified the template to include both the links to the dictionary and some missing standard directive attributes. Revision ChangesPath 1.9 +36 -7 apachen/htdocs/manual/man-template.html Index: man-template.html === RCS file: /export/home/cvs/apachen/htdocs/manual/man-template.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- man-template.html 1997/07/06 17:18:54 1.8 +++ man-template.html 1997/10/16 02:14:41 1.9 @@ -13,7 +13,7 @@ ALINK=#FF !--#include virtual=header.html -- - H1 ALIGN=CENTERModule mod_foobar/h1 + H1 ALIGN=CENTERModule mod_foobar/H1 BLOCKQUOTEEMAdd this file as a link in modules.html/EM/BLOCKQUOTE @@ -44,30 +44,59 @@ HR !-- the HR is part of the directive description -- H2A NAME=adirectiveADirective directive/A/H2 P - STRONGSyntax:/STRONG ADirective EMsome args/EM + A + HREF=directive-dict.html#Syntax + REL=Help + STRONGSyntax:/STRONG/A ADirective EMsome args/EM BR - STRONGDefault:/STRONG SAMPADirective default value/SAMP + A + HREF=directive-dict.html#Default + REL=Help + STRONGDefault:/STRONG/A SAMPADirective default value/SAMP BR - STRONGContext:/STRONG context-list + A + HREF=directive-dict.html#Context + REL=Help + STRONGContext:/STRONG/A context-list BR BLOCKQUOTEEMcontext-list is where this directive can appear; allowed: server config, virtual host, directory, .htaccess/EM/BLOCKQUOTE - STRONGOverride:/STRONG override + A + HREF=directive-dict.html#Override + REL=Help + STRONGOverride:/STRONG/A override BR BLOCKQUOTEEMrequired if the directive is allowed in .htaccess files; the AllowOverride option that allows the directive./EM/BLOCKQUOTE - STRONGStatus:/STRONG status + A + HREF=directive-dict.html#Status + REL=Help + STRONGStatus:/STRONG/A status BR BLOCKQUOTEEMCore if in core apache, Base if in one of the standard modules, Extension if in an extension module (not compiled in by default) or Experimental/EM/BLOCKQUOTE - STRONGModule:/STRONG mod_foobar + A + HREF=directive-dict.html#Module + REL=Help + STRONGModule:/STRONG/A mod_foobar + BR + A + HREF=directive-dict.html#Compatibility + REL=Help + STRONGCompatibility:/STRONG/A compatibility notes + +BLOCKQUOTE + EMDescribe any compatibility issues, such as Only available in Apache + 1.2 or later, or The Apache syntax for this directive is not + compatible with the NCSA directive of the same name./EM +/BLOCKQUOTE /P P
cvs commit: apachen/src/support split-logfile
coar97/10/18 06:07:44
Modified:src CHANGES
Added: src/support split-logfile
Log:
Bwahaha! Here it is, committed as threatened after the 1.3b2
tarbal: the sample access_log splitter.
Revision ChangesPath
1.468 +5 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- CHANGES 1997/10/17 13:37:27 1.467
+++ CHANGES 1997/10/18 13:07:42 1.468
@@ -1,5 +1,10 @@
Changes with Apache 1.3b3
+ *) New support tool: src/support/split-logfile, a sample Perl script which
+ splits up a combined access log into separate files based on the
+ name of the virtual host (listed first in the log records by %v).
+ [Ken Coar]
+
Changes with Apache 1.3b2 (there is no 1.3b1)
*) TestCompile was not passing $LIBS [Dean Gaudet]
1.1 apachen/src/support/split-logfile
Index: split-logfile
===
#!/usr/local/bin/perl
#
#
# Copyright (c) 1995-1997 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. For permission please contact
#[EMAIL PROTECTED]
#
# 5. Redistributions of any form whatsoever must retain the following
#acknowledgment:
#This product includes software developed by the Apache Group
#for use in the Apache HTTP server project (http://www.apache.org/).
#
# THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
# OF THE POSSIBILITY OF SUCH DAMAGE.
#
#
# This software consists of voluntary contributions made by many
# individuals on behalf of the Apache Group and was originally based
# on public domain software written at the National Center for
# Supercomputing Applications, University of Illinois, Urbana-Champaign.
# For more information on the Apache Group and the Apache HTTP server
# project, please see http://www.apache.org/.
#
#
# This script will take a combined Web server access
# log file and break its contents into separate files.
# It assumes that the first field of each line is the
# virtual host identity (put there by %v), and that
# the logfiles should be named that+.log in the current
# directory.
#
# The combined log file is read from stdin. Records read
# will be appended to any existing log files.
#
%is_open = ();
while ($log_line = STDIN) {
#
# Get the first token from the log record; it's the
# identity of the virtual host to which the record
# applies.
#
($vhost) = split (/\s/, $log_line);
#
# Normalize the virtual host name to all lowercase.
# If it's blank, the request was handled by the default
# server, so supply a default name. This shouldn't
# happen, but caution rocks.
#
$vhost = lc ($vhost) or access;
#
# If the log file for this virtual host isn't opened
# yet, do it now.
#
if (! $is_open{$vhost}) {
open $vhost
cvs commit: apache-site/dist - Imported sources
coar97/10/18 06:20:42 Log: Adding the /dist/ subdirectory from the Apache site to the appropriate CVS module tree. Status: Vendor Tag: VendorTag Release Tags: ReleaseTag No conflicts created by this import
cvs commit: apache-site/dist .cvsignore .message HEADER.html README.html
coar97/10/18 06:33:15 Added: dist .cvsignore .message HEADER.html README.html Log: Finally! Checking in the CVS-appropriate files from /dist. Submitted by: Jim Jagielski Revision ChangesPath 1.1 apache-site/dist/.cvsignore Index: .cvsignore === *.tar* CHANGES KEYS *.exe* binaries contrib old patches 1.1 apache-site/dist/.message Index: .message === Please try to use a mirror if at all possible. There is a complete list available at http://www.apache.org/, and a script which will attempt to find those close to you at http://www.apache.org/dyn/closer.cgi. 1.1 apache-site/dist/HEADER.html Index: HEADER.html === H2Make sure you're downloading from A HREF=http://www.apache.org/dyn/closer.cgi; a nearby mirror site!/A/H2 If you're having trouble accessing these files, there's probably a closer mirror to you.BR A HREF=http://www.apache.org/dyn/closer.cgi;Go here to find it./A 1.1 apache-site/dist/README.html Index: README.html === HTML HEAD TITLEApache HTTP Server Project Distribution/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF H2Apache 1.2.4 Released/H2 PThe fourth release in the 1.2 series is now available. Apache 1.2.4 is a maintenance release with numerous small bug fixes. For details, see the A HREF=CHANGESCHANGES/A file. PFor information about new features in 1.2, see the A HREF=../docs/documentation/A. H2FONT COLOR=redImportant Note:/FONT 1.2.3 and mod_proxy/H2 PThere is a bug in the mod_proxy distributed with 1.2.3 that causes it to fail when talking to most servers. A patch is available in the A HREF=patches/apply_to_1.2.3/1.2.3 patch directory/A. H2Apache 1.3b2 Now Available/H2 P Apache 1.3b2 is the first public beta of the forthcoming Apache 1.3 Server. Apache 1.3 includes several new enhancements, improvements and performance boosts, but the most visible addition is the ability to run under Microsoft Windows NT 4.0 and 95. At present it is available in source format only, so a compiler is neccessary to use it (Microsoft Visual C++ 5.0 for Windows). If you are using, or had previously tried the 1.3a1 release, please upgrade to 1.3b2 at your earliest convenience. pFONT COLOR=redImportant Note:/FONT Apache 1.3b1 was never formally released. Thus, the first public beta release is b2. Since this is the first beta release, it undoubtedly has it's share of warts and bugs. Although it has been tested somewhat strenuously, your milage may vary. PFor information about new features in 1.3, see the A HREF=../docs/documentation/A. H2IMPORTANT NOTE: 1.2.1 and Solaris/H2 If you are running 1.2.1 on any version of Solaris 2.x before 2.6, there is a bug in Solaris that causes Apache to fail when it trys to restart after receiving a HUP signal. For information on workarounds, please see A HREF=http://www.apache.org/bugdb.cgi/full/832; PR#832/A. H2Compilation note:/H2 Apache 1.2 uses regular expressions for several modules, such as mod_rewrite. Since system-level regex support isn't consistent across platforms, we have provided Henry Spencer's regex library as a part of the Apache distribution, but have taken pains to only use it if the platform requires it. Since we don't have access to all operating systems out there, we may not have correctly defined the WANTHSREGEX #define for a given platform. If you get a warning about a missing 'regex.h', set WANTHSREGEX=yes in the 'Configuration', and send a message to [EMAIL PROTECTED] indicating you needed to do this for your platform. Include the output of the command uname -a. Thanks! H2Binary Releases/H2 PAre available in the A HREF=binaries/binaries//A directory. H2PGP Signatures/H2 PMany of the distribution kits have been digitally signed (using PGP) by the Apache Group members that constructed them. If so, there will be an accompanying SAMPEMdistribution/EM.asc/SAMP file in the same directory as the distribution. The PGP keys can be found in the distribution directory at lt;A HREF=http://www.apache.org/dist/KEYS; SAMPhttp://www.apache.org/dist/KEYS/SAMP/Agt;, and in the SAMPKEYS/SAMP file after unpacking the distribution./P PREe.g. % pgp lt; KEYS % gunzip apache_1.2.1.tar.gz % pgp apache_1.2.1.tar.asc apache_1.2.1.tar /PRE H2Contributory Patches/Modules/Code/H2
cvs commit: apache-site HEADER.html README.html
coar97/10/18 06:35:29
Removed: .HEADER.html README.html
Log:
Getting rid of extraneous copies put here by a CVS command
typo. {blush}
cvs commit: apachen README
coar97/10/19 10:05:06 Modified:.README Log: Add a small blurb about upgrading an existing Apache environment. PR: 1036 Revision ChangesPath 1.12 +27 -3 apachen/README Index: README === RCS file: /export/home/cvs/apachen/README,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- README1997/07/31 16:26:42 1.11 +++ README1997/10/19 17:05:04 1.12 @@ -17,8 +17,8 @@ most up-to-date documentation, visit us on the WWW, at URL:http://www.apache.org/. -Installation - +New Installations +- NOTE: Windows users please see http://www.apache.org/docs/windows.html, or the htdocs/manual/windows.html file included with Apache. The @@ -61,6 +61,30 @@ specifically call them by other names, use the AccessConfig and ResourceConfig directives in httpd.conf. +Upgrading an Existing Apache Environment + + +Between releases of Apache, there are several files that are likely +to get changed (aside from the source, of course). These include: + + src/Makefile.tmpl + src/Configuration.tmpl + src/Configure + conf/*.conf-dist + conf/mime.types + +It's recommended that you unpack a new Apache version distribution +into a different directory than the existing one, and check these +files against the ones you already have for new or changed directives. +It's almost certain that the Configure, Configuration.tmpl, and +Makefile.tmpl files are going to change, so pay particular attention +to merging your existing Configuration settings with the ones in +the Configuration.tmpl file to make a new Configuration file in the +new Apache src directory. Then follow the steps for a new +installation to build and test the new server before replacing +the existing Apache directory tree with the one from the new +distribution. + The Latest Version -- @@ -90,4 +114,4 @@ Please see the file called src/regex/COPYRIGHT. The NT port was started with code provided to the Apache Group -by Ambarish Malpani of ValiCert, Inc. (www.valicert.com). +by Ambarish Malpani of ValiCert, Inc. (http://www.valicert.com/).
cvs commit: apachen/htdocs/manual new_features_1_3.html
coar97/10/20 09:27:48 Modified:htdocs/manual new_features_1_3.html Log: Add the LogFormat nickname stuff to the new for 1.3 document, fix some typos, and normalise some syntax. Plus imposing my personal view of HTML style in some places so Marc, Alexei, and Jim can gritch at me. g Revision ChangesPath 1.28 +68 -41apachen/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html === RCS file: /export/home/cvs/apachen/htdocs/manual/new_features_1_3.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- new_features_1_3.html 1997/10/15 00:24:01 1.27 +++ new_features_1_3.html 1997/10/20 16:27:47 1.28 @@ -41,7 +41,7 @@ mistyped characters. This catches the majority of mistyped requests. To make use of this module, it must be enabled in the server's CODEConfiguration/CODE file, and the - CODEA HREF=mod/mod_speling.html#checkspellingCheckSpelling/A/CODE + A HREF=mod/mod_speling.html#checkspellingSAMPCheckSpelling/SAMP/A directive must be set to CODEon/CODE. /LI LIA @@ -100,7 +100,7 @@ If a directory listing is displayed using A HREF=mod/mod_autoindex.html#indexoptions - FancyIndexing/A, + SAMPFancyIndexing/SAMP/A, clicking on a column title will now sort the listing in order by the values in that column. Selecting the column repeatedly will toggle between ascending and descending order. @@ -112,12 +112,12 @@ BR If a directory is marked for display with FancyIndexing, the listing page usually follows a predefined format using server-generated HTML. - STRONGIf/STRONG the IndexOptions directive for the directory + STRONGIf/STRONG the SAMPIndexOptions/SAMP directive for the directory includes the SAMPSuppressHTMLPreamble/SAMP option, STRONGand/STRONG a file specified by the A HREF=mod/mod_autoindex.html#headername - HeaderName/A + SAMPHeaderName/SAMP/A directive is found in the directory, STRONGand/STRONG the header file is recognized as containing HTML (determined by the file extension), STRONGthen/STRONG the module will assume that the @@ -134,7 +134,7 @@ the script. This allows CGI script to provide partial status reports during long processing operations. /LI -liba href=windows.htmlSupport for Windows NT/95/a/bbr +liSTRONGa href=windows.htmlSupport for Windows NT/95/a/STRONGbr Apache now supports the Windows NT and Windows 95 operating systems, as well as the Unix systems supported in previos releases. Although the Windows version of Apache may not be perform as well as on the Unix @@ -142,19 +142,19 @@ Windows gives Apache the ability to run on a large number of web servers it was not previously able to. -liba href=mod/mod_alias.htmlRegular Expression support for Alias -and Redirect/a/b +liSTRONGa href=mod/mod_alias.htmlRegular Expression support for +SAMPAlias/SAMP and SAMPRedirect/SAMP/a/STRONG br -New codea href=mod/mod_alias.html#aliasmatchAliasMatch/a/code, -codea -href=mod/mod_alias.html#scriptaliasmatchScriptAliasMatch/a/code, and -codea -href=mod/mod_alias.html#redirectmatchRedirectMatch/a/code +New a href=mod/mod_alias.html#aliasmatchSAMPAliasMatch/SAMP/a, +a href=mod/mod_alias.html#scriptaliasmatch +SAMPScriptAliasMatch/SAMP/a, and +a href=mod/mod_alias.html#redirectmatchSAMPRedirectMatch/SAMP/a directives allow for the use of regular expression matching. Additionally, new -codea href=mod/core.html#directorymatchlt;DirectoryMatchgt;/a/code, -codea href=mod/core.html#locationmatchlt;LocationMatchgt;/a/code, -and codea href=mod/core.html#filesmatchlt;FilesMatchgt;/a/code +a href=mod/core.html#directorymatchSAMPlt;DirectoryMatchgt;/SAMP/a, +a href=mod/core.html#locationmatchSAMPlt;LocationMatchgt;/SAMP/a, +and +a href=mod/core.html#filesmatchSAMPlt;FilesMatchgt;/SAMP/a sections provide a new syntax for regular expression sectioning. listronga href=mod/mod_mime_magic.htmlNew Magic MIME-typing @@ -191,27 +191,30 @@ pre-sized SAMPIMG/SAMP tags are used. This can substantially speed up the display of large directory listings. -listronga href=mod/core.html#accessfilenameAccessFileName +listronga href=mod/core.html#accessfilenameSAMPAccessFileName/SAMP Enhancement/a/strongbr -The lt;AccessFileNamegt; directive can now take more than one +The SAMPAccessFileName/SAMP directive can now take more than one filename. This lets sites serving pages from network file systems and more than one Apache web server, configure access based on the server through which shared pages are being served. -listrongHostNameLookups now defaults to Off/strongbr -The a href=mod/core.html#hostnamelookupsHostNameLookups/a +listrongSAMPHostNameLookups/SAMP now defaults
cvs commit: apachen/htdocs/manual/misc FAQ.html
coar97/10/20 18:10:28
Modified:htdocs/manual/misc FAQ.html
Log:
{Sigh} Add the suddenly FAQ about why virtual hosts don't
work after 1.3b2 upgrades..
PR: Too many to mention
Revision ChangesPath
1.90 +46 -1 apachen/htdocs/manual/misc/FAQ.html
Index: FAQ.html
===
RCS file: /export/home/cvs/apachen/htdocs/manual/misc/FAQ.html,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- FAQ.html 1997/09/18 13:00:15 1.89
+++ FAQ.html 1997/10/21 01:10:27 1.90
@@ -15,7 +15,7 @@
!--#include virtual=header.html --
H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1
P
- $Revision: 1.89 $ ($Date: 1997/09/18 13:00:15 $)
+ $Revision: 1.90 $ ($Date: 1997/10/21 01:10:27 $)
/P
P
The latest version of this FAQ is always available from the main
@@ -254,6 +254,9 @@
/LI
LIA HREF=#year2000Is Apache Year 2000 compliant?/A
/LI
+ LIA HREF=#namevhostI upgraded to Apache 1.3b2 and now my
+virtual hosts don't work!/A
+ /LI
/OL
/LI
/UL
@@ -2100,6 +2103,48 @@
the magic boundary to worry about is the year 2038 and not 2000.
But modern operating systems shouldn't cause any trouble
at all.
+ /P
+ HR
+ /LI
+ LIA NAME=namevhost
+ STRONGI upgraded to Apache 1.3b2 and now my virtual hosts don't
+ work!/STRONG
+ /A
+ P
+ In versions of Apache prior to 1.3b2, there was a lot of confusion
+ regarding address-based virtual hosts and (HTTP/1.1) name-based
+ virtual hosts, and the rules concerning how the server processed
+ SAMPlt;VirtualHostgt;/SAMP definitions were very complex and not
+ well documented.
+ /P
+ P
+ Apache 1.3b2 introduced a new directive,
+ A
+ HREF=http://www.apache.org/docs/mod/core.html#namevirtualhost;
+ SAMPNameVirtualHost/SAMP/A,
+ which simplifies the rules quite a bit. However, changing the rules
+ like this means that your existing name-based
+ SAMPlt;VirtualHostgt;/SAMP containers probably won't work
+ correctly immediately following the upgrade.
+ /P
+ P
+ To correct this problem, add the following line to the beginning of
+ your server configuration file, before defining any virtual hosts:
+ /P
+ DL
+ DDCODENameVirtualHost EMn.n.n.n/EM/CODE
+ /DD
+ /DL
+ P
+ Replace the quot;SAMPn.n.n.n/SAMPquot; with the IP address to
+ which the name-based virtual host names resolve; if you have multiple
+ name-based hosts on multiple addresses, repeat the directive for each
+ address.
+ /P
+ P
+ Make sure that your name-based SAMPlt;VirtualHostgt;/SAMP blocks
+ contain SAMPServerName/SAMP and possibly SAMPServerAlias/SAMP
+ directives so Apache can be sure to tell them apart correctly.
/P
HR
/LI
cvs commit: apachen/htdocs/manual/mod footer.html header.html
coar97/11/03 17:18:02 Modified:htdocs/manual footer.html header.html htdocs/manual/misc footer.html header.html htdocs/manual/mod footer.html header.html Log: Label the 1.3 documentation as being such in the header and footer. Hopefully (!) this will ease some of the confusion about 1.3 features described therein that people think apply to 1.2.. Reviewed by: Dean Gaudet Revision ChangesPath 1.3 +3 -0 apachen/htdocs/manual/footer.html Index: footer.html === RCS file: /export/home/cvs/apachen/htdocs/manual/footer.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- footer.html 1996/11/21 10:47:09 1.2 +++ footer.html 1997/11/04 01:17:57 1.3 @@ -1,3 +1,6 @@ HR + H3 ALIGN=CENTER + Apache HTTP Server Version 1.3 + /H3 A HREF=./IMG SRC=images/index.gif ALT=Index/A 1.3 +3 -0 apachen/htdocs/manual/header.html Index: header.html === RCS file: /export/home/cvs/apachen/htdocs/manual/header.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- header.html 1997/06/04 02:55:15 1.2 +++ header.html 1997/11/04 01:17:57 1.3 @@ -1,3 +1,6 @@ DIV ALIGN=CENTER IMG SRC=images/sub.gif ALT=[APACHE DOCUMENTATION] + H3 + Apache HTTP Server Version 1.3 + /H3 /DIV 1.3 +4 -0 apachen/htdocs/manual/misc/footer.html Index: footer.html === RCS file: /export/home/cvs/apachen/htdocs/manual/misc/footer.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- footer.html 1996/11/21 09:55:48 1.2 +++ footer.html 1997/11/04 01:17:58 1.3 @@ -1,4 +1,8 @@ HR +H3 ALIGN=CENTER + Apache HTTP Server Version 1.3 +/H3 + A HREF=./IMG SRC=../images/index.gif ALT=Index/A A HREF=../IMG SRC=../images/home.gif ALT=Home/A 1.3 +3 -0 apachen/htdocs/manual/misc/header.html Index: header.html === RCS file: /export/home/cvs/apachen/htdocs/manual/misc/header.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- header.html 1997/06/04 11:42:57 1.2 +++ header.html 1997/11/04 01:17:59 1.3 @@ -1,3 +1,6 @@ DIV ALIGN=CENTER IMG SRC=../images/sub.gif ALT=[APACHE DOCUMENTATION] + H3 + Apache HTTP Server Version 1.3 + /H3 /DIV 1.3 +4 -0 apachen/htdocs/manual/mod/footer.html Index: footer.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/footer.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- footer.html 1996/11/21 10:30:35 1.2 +++ footer.html 1997/11/04 01:18:00 1.3 @@ -1,4 +1,8 @@ HR +H3 ALIGN=CENTER + Apache HTTP Server Version 1.3 +/H3 + A HREF=./IMG SRC=../images/index.gif ALT=Index/A A HREF=../IMG SRC=../images/home.gif ALT=Home/A 1.3 +3 -0 apachen/htdocs/manual/mod/header.html Index: header.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/header.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- header.html 1997/06/04 16:14:14 1.2 +++ header.html 1997/11/04 01:18:00 1.3 @@ -1,3 +1,6 @@ DIV ALIGN=CENTER IMG SRC=../images/sub.gif ALT=[APACHE DOCUMENTATION] + H3 + Apache HTTP Server Version 1.3 + /H3 /DIV
cvs commit: apache/htdocs/manual/mod footer.html header.html
coar97/11/03 17:22:49 Modified:htdocs/manual Tag: APACHE_1_2_X footer.html header.html htdocs/manual/misc Tag: APACHE_1_2_X footer.html header.html htdocs/manual/mod Tag: APACHE_1_2_X footer.html header.html Log: Add the version (1.2) to the header and footer include files, just to make things clear. Revision ChangesPath No revision No revision 1.2.2.1 +3 -0 apache/htdocs/manual/footer.html Index: footer.html === RCS file: /export/home/cvs/apache/htdocs/manual/footer.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- footer.html 1996/11/21 10:47:09 1.2 +++ footer.html 1997/11/04 01:22:45 1.2.2.1 @@ -1,3 +1,6 @@ HR +H3 ALIGN=CENTER + Apache HTTP Server Version 1.2 +/H3 A HREF=./IMG SRC=images/index.gif ALT=Index/A 1.2.2.1 +3 -0 apache/htdocs/manual/header.html Index: header.html === RCS file: /export/home/cvs/apache/htdocs/manual/header.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- header.html 1997/06/04 02:55:15 1.2 +++ header.html 1997/11/04 01:22:45 1.2.2.1 @@ -1,3 +1,6 @@ DIV ALIGN=CENTER IMG SRC=images/sub.gif ALT=[APACHE DOCUMENTATION] + H3 + Apache HTTP Server Version 1.2 + /H3 /DIV No revision No revision 1.2.2.1 +3 -0 apache/htdocs/manual/misc/footer.html Index: footer.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/footer.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- footer.html 1996/11/21 09:55:48 1.2 +++ footer.html 1997/11/04 01:22:46 1.2.2.1 @@ -1,4 +1,7 @@ HR +H3 ALIGN=CENTER + Apache HTTP Server Version 1.2 +/H3 A HREF=./IMG SRC=../images/index.gif ALT=Index/A A HREF=../IMG SRC=../images/home.gif ALT=Home/A 1.2.2.1 +3 -0 apache/htdocs/manual/misc/header.html Index: header.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/header.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- header.html 1997/06/04 11:42:57 1.2 +++ header.html 1997/11/04 01:22:47 1.2.2.1 @@ -1,3 +1,6 @@ DIV ALIGN=CENTER IMG SRC=../images/sub.gif ALT=[APACHE DOCUMENTATION] + H3 + Apache HTTP Server Version 1.2 + /H3 /DIV No revision No revision 1.2.2.1 +3 -0 apache/htdocs/manual/mod/footer.html Index: footer.html === RCS file: /export/home/cvs/apache/htdocs/manual/mod/footer.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- footer.html 1996/11/21 10:30:35 1.2 +++ footer.html 1997/11/04 01:22:48 1.2.2.1 @@ -1,4 +1,7 @@ HR +H3 ALIGN=CENTER + Apache HTTP Server Version 1.2 +/H3 A HREF=./IMG SRC=../images/index.gif ALT=Index/A A HREF=../IMG SRC=../images/home.gif ALT=Home/A 1.2.2.1 +3 -0 apache/htdocs/manual/mod/header.html Index: header.html === RCS file: /export/home/cvs/apache/htdocs/manual/mod/header.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- header.html 1997/06/04 16:14:14 1.2 +++ header.html 1997/11/04 01:22:48 1.2.2.1 @@ -1,3 +1,6 @@ DIV ALIGN=CENTER IMG SRC=../images/sub.gif ALT=[APACHE DOCUMENTATION] + H3 + Apache HTTP Server Version 1.2 + /H3 /DIV
cvs commit: apachen/src/main http_config.c
coar97/11/06 12:40:43
Modified:src/main http_config.c
Log:
Set errno to something reasonable when reporting an invalid
directive.
Reviewed by: Dean Gaudet, Jim Jagielski, Martin Kraemer
Revision ChangesPath
1.85 +8 -4 apachen/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apachen/src/main/http_config.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- http_config.c 1997/10/26 20:19:37 1.84
+++ http_config.c 1997/11/06 20:40:42 1.85
@@ -803,7 +803,9 @@
do {
if (!(cmd = find_command_in_modules(cmd_name, mod))) {
- return pstrcat(parms-pool, Invalid command , cmd_name, NULL);
+errno = EINVAL;
+return pstrcat(parms-pool, Invalid command ', cmd_name, ',
+ NULL);
}
else {
void *mconfig = get_module_config(config, mod);
@@ -835,9 +837,10 @@
while (!(cfg_getline(l, MAX_STRING_LEN, parms-config_file))) {
const char *errmsg = handle_command(parms, config, l);
- if (errmsg)
+if (errmsg) {
return errmsg;
}
+}
return NULL;
}
@@ -980,8 +983,9 @@
cfg_closefile(f);
if (errmsg) {
- aplog_error(APLOG_MARK, APLOG_ALERT, r-server, %s: %s, filename,
errmsg);
- return SERVER_ERROR;
+aplog_error(APLOG_MARK, APLOG_ALERT, r-server, %s: %s,
+filename, errmsg);
+return HTTP_INTERNAL_SERVER_ERROR;
}
*result = dc;
cvs commit: apachen/src CHANGES
coar97/11/06 14:00:36
Modified:src CHANGES
Log:
Forgot to update CHANGES again. {sigh}
Revision ChangesPath
1.490 +4 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -r1.489 -r1.490
--- CHANGES 1997/11/06 21:57:36 1.489
+++ CHANGES 1997/11/06 22:00:35 1.490
@@ -1,5 +1,9 @@
Changes with Apache 1.3b3
+ *) When a configuration parse complained about a bad directive,
+ the logger would use whatever (unrelated) value was in errno.
+ errno is now forced to EINVAL first in this case. [Ken Coar]
+
*) A sed command in the Configure script pushed the edge of POSIXness,
breaking on some systems. [Bhaba R.Misra [EMAIL PROTECTED]] PR#1368
cvs commit: apache-site bugdb.cgi
coar97/11/09 09:04:59
Modified:.bugdb.cgi
Log:
Go back to having the category list lexically sorted. Make
general the default category on new PRs, and non-critical
the default severity.
Revision ChangesPath
1.16 +19 -4 apache-site/bugdb.cgi
Index: bugdb.cgi
===
RCS file: /export/home/cvs/apache-site/bugdb.cgi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bugdb.cgi 1997/10/19 16:53:13 1.15
+++ bugdb.cgi 1997/11/09 17:04:58 1.16
@@ -52,6 +52,8 @@
#to a particular PR from the main menu (prompted by Dean Gaudet).
# 8/13/1997 Ken Coar - fix problem causing check for any keyword to
#occlude things like mod_auth-any.
+# 11/9/1997 Ken Coar - Make general the default category on new PRs,
+#and non-critical the default severity.
#
### End Modification log
@@ -121,6 +123,9 @@
State,
);
+$new_default_category = general;
+$new_default_severity = non-critical;
+
Main routine
# Main Program
@@ -186,7 +191,7 @@
### Main menu
} elsif ($PATH_INFO eq ) {
main_menu();
-print HRSMALLVersion: 13 August 1997BRAuthors: ,
+print HRSMALLVersion: 9 November 1997BRAuthors: ,
A HREF=\http://alumni.caltech.edu/~dank/gnats.html\;Dan Kegel ,
and Huy Le/A, BR ,
with revamp work by ,
@@ -471,7 +476,11 @@
TDSELECT NAME=Category
EOM
foreach $option (@nCategory) {
- print OPTION $option\n if ($option);
+ if ($option) {
+ printf OPTION;
+ printf SELECTED if ($option =~ /$new_default_category/i);
+ print $option\n;
+ }
}
print /SELECT\n;
@@ -480,8 +489,14 @@
print TRTD align=right$_:\n;
print TDSELECT NAME=\$_\\n;
foreach $option (eval [EMAIL PROTECTED]) {
- print OPTION, $_ eq Severity $option eq Serious ?
-SELECTED : , $option\n if ($option);
+ if ($option) {
+ print OPTION;
+ if (($_ eq Severity)
+ ($option =~ /$new_default_severity/i)) {
+ print SELECTED;
+ }
+ print $option\n;
+ }
}
print /SELECT\n;
}
cvs commit: apachen/src/modules/standard mod_autoindex.c mod_include.c
coar97/11/09 12:40:36
Modified:htdocs/manual new_features_1_3.html
src CHANGES
src/modules/standard mod_autoindex.c mod_include.c
Log:
Make mod_autoindex and mod_include default date formats Y2K-safe.
Also add the SuppressColumnSorting keyword to the new-features
document.
Reviewed by: Ben Laurie, Dean Gaudet
Revision ChangesPath
1.30 +19 -0 apachen/htdocs/manual/new_features_1_3.html
Index: new_features_1_3.html
===
RCS file: /export/home/cvs/apachen/htdocs/manual/new_features_1_3.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- new_features_1_3.html 1997/10/24 09:44:17 1.29
+++ new_features_1_3.html 1997/11/09 20:40:28 1.30
@@ -104,6 +104,11 @@
clicking on a column title will now sort the listing in
order by the values in that column. Selecting the column
repeatedly will toggle between ascending and descending order.
+ This feature can be disabled with the SAMPSuppressColumnSorting/SAMP
+ A
+ HREF=mod/mod_autoindex.html#indexoptions
+ IndexOptions/A
+ keyword.
/LI
LIA
HREF=mod/mod_autoindex.html#indexoptions
@@ -433,6 +438,20 @@
/ul
+ LISTRONGYear-2000 Improvements/STRONG
+ BR
+ The default SAMPtimefmt/SAMP string used by
+ A
+ HREF=mod/mod_include.html
+ SAMPmod_include/SAMP/A
+ has been modified todisplay the year using four digits rather than the
+ two-digit format used previously. The
+ A
+ HREF=mod/mod_autoindex.html
+ SAMPmod_autoindex/SAMP/A
+ module has also been modified to display years using four digits in
+ FancyIndexed directory listings.
+ /LI
/ul
!--#include virtual=footer.html --
1.501 +3 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -r1.500 -r1.501
--- CHANGES 1997/11/09 05:49:24 1.500
+++ CHANGES 1997/11/09 20:40:30 1.501
@@ -1,5 +1,8 @@
Changes with Apache 1.3b3
+ *) Change mod_include and mod_autoindex to use Y2K-safe date formats
+ by default. [Ken Coar]
+
*) Add a SuppressColumnSorting option to the IndexOptions list,
which will keep the column heading from beling links for sorting
the display. [Ken Coar, suggested by Brian Tiemann [EMAIL PROTECTED]]
1.55 +3 -3 apachen/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mod_autoindex.c 1997/11/09 05:49:21 1.54
+++ mod_autoindex.c 1997/11/09 20:40:33 1.55
@@ -707,7 +707,7 @@
register int x;
if (autoindex_opts SUPPRESS_LAST_MOD)
- maxsize += 17;
+ maxsize += 19;
if (autoindex_opts SUPPRESS_SIZE)
maxsize += 7;
@@ -800,7 +800,7 @@
if (!(autoindex_opts SUPPRESS_LAST_MOD)) {
emit_link(r, Last modified, K_LAST_MOD, keyid, direction,
static_columns);
- rputs( , r);
+ rputs( , r);
}
if (!(autoindex_opts SUPPRESS_SIZE)) {
emit_link(r, Size, K_SIZE, keyid, direction, static_columns);
@@ -881,7 +881,7 @@
if (ar[x]-lm != -1) {
char time_str[MAX_STRING_LEN];
struct tm *ts = localtime(ar[x]-lm);
- strftime(time_str, MAX_STRING_LEN, %d-%b-%y %H:%M , ts);
+ strftime(time_str, MAX_STRING_LEN, %d-%b-%Y %H:%M , ts);
rputs(time_str, r);
}
else {
1.58 +1 -1 apachen/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_include.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mod_include.c 1997/10/22 20:30:22 1.57
+++ mod_include.c 1997/11/09 20:40:34 1.58
@@ -92,7 +92,7 @@
#define STARTING_SEQUENCE !--#
#define ENDING_SEQUENCE --
#define DEFAULT_ERROR_MSG [an error occurred while processing this
directive]
-#define DEFAULT_TIME_FORMAT %A, %d-%b-%y %H:%M:%S %Z
+#define DEFAULT_TIME_FORMAT %A, %d-%b-%Y %H:%M:%S %Z
#define SIZEFMT_BYTES 0
#define SIZEFMT_KMG 1
cvs commit: apache-site bugdb.cgi
coar97/11/10 14:23:24
Modified:.bugdb.cgi
Log:
Added two canned-response buttons alongside the Edit button.
Editors can now one-step-close a PR with canned text about it
being a duplicate (read the FAQ and search the db), or about
it being a CGI/basic configuration issue (read the FAQ, search
the db, and check the newsgroups).
Revision ChangesPath
1.17 +60 -5 apache-site/bugdb.cgi
Index: bugdb.cgi
===
RCS file: /export/home/cvs/apache-site/bugdb.cgi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bugdb.cgi 1997/11/09 17:04:58 1.16
+++ bugdb.cgi 1997/11/10 22:23:23 1.17
@@ -54,6 +54,8 @@
#occlude things like mod_auth-any.
# 11/9/1997 Ken Coar - Make general the default category on new PRs,
#and non-critical the default severity.
+# 11/10/1997 Ken Coar - Added some canned response buttons on the
+#full display page seen by authorised editors.
#
### End Modification log
@@ -191,7 +193,7 @@
### Main menu
} elsif ($PATH_INFO eq ) {
main_menu();
-print HRSMALLVersion: 9 November 1997BRAuthors: ,
+print HRSMALLVersion: 10 November 1997BRAuthors: ,
A HREF=\http://alumni.caltech.edu/~dank/gnats.html\;Dan Kegel ,
and Huy Le/A, BR ,
with revamp work by ,
@@ -1376,11 +1378,64 @@
print $err\n;
} else {
if ($ENV{'REMOTE_USER'}) {
+ local ($timestamp) = timestamp($fullpr);
print EOM;
-FORM ACTION=$SCRIPT_NAME/edit_pr
-INPUT TYPE=submit VALUE=Click here to edit
-INPUT NAME=pr TYPE=hidden VALUE=$pr
-/FORM
+TABLE
+ TR ALIGN=LEFT VALIGN=MIDDLE
+ TD
+ FORM ACTION=$SCRIPT_NAME/edit_pr
+INPUT TYPE=submit VALUE= Edit
+INPUT NAME=pr TYPE=hidden VALUE=$pr
+ /FORM
+ /TD
+ TDSTRONGEdit this problem report/STRONG
+ /TD
+ /TR
+ TR ALIGN=LEFT VALIGN=MIDDLE
+ TD
+ FORM METHOD=POST
ACTION=$SCRIPT_NAME/handle_edit_pr/$pr$fieldvalues{'State'}$timestamp
+INPUT TYPE=submit VALUE=Close
+
+INPUT TYPE=hidden NAME=Editor VALUE=$ENV{'REMOTE_USER'}
+INPUT TYPE=hidden NAME=Synopsis VALUE=
+INPUT TYPE=hidden NAME=Originator
VALUE=$fieldvalues{'Originator'}
+INPUT TYPE=hidden NAME=Class VALUE=duplicate
+INPUT TYPE=hidden NAME=Release VALUE=$fieldvalues{'Release'}
+INPUT TYPE=hidden NAME=Severity VALUE=$fieldvalues{'Severity'}
+INPUT TYPE=hidden NAME=State VALUE=closed
+INPUT TYPE=hidden NAME=StateReason VALUE=[This is a standard
response.]\nThis issue has been reported before;\nplease search the FAQ and the
bug database.\nThanks for using Apache!
+INPUT TYPE=hidden NAME=Category VALUE=$fieldvalues{'Category'}
+INPUT TYPE=hidden NAME=Responsible
VALUE=$fieldvalues{'Responsible'}
+INPUT TYPE=hidden NAME=ResponsibleReason VALUE=
+ /FORM
+ /TD
+ TDSTRONGClose as being a duplicate report. (Refers submitter to bugdb
+ and the FAQ.)/STRONG
+ /TR
+ TR ALIGN=LEFT VALIGN=MIDDLE
+ TD
+ FORM METHOD=POST
ACTION=$SCRIPT_NAME/handle_edit_pr/$pr$fieldvalues{'State'}$timestamp
+INPUT TYPE=submit VALUE=Close
+
+INPUT TYPE=hidden NAME=Editor VALUE=$ENV{'REMOTE_USER'}
+INPUT TYPE=hidden NAME=Synopsis VALUE=
+INPUT TYPE=hidden NAME=Originator
VALUE=$fieldvalues{'Originator'}
+INPUT TYPE=hidden NAME=Class VALUE=mistaken
+INPUT TYPE=hidden NAME=Release VALUE=$fieldvalues{'Release'}
+INPUT TYPE=hidden NAME=Severity VALUE=non-critical
+INPUT TYPE=hidden NAME=State VALUE=closed
+INPUT TYPE=hidden NAME=StateReason VALUE=[This is a standard
response.]\nThis is a CGI programming or basic configuration issue.\nAs
mentioned on the main bug database page, we must refer\nall such basic or
non-Apache-related questions to the\ncomp.infosystems.www.servers.unix and
related newsgroups.\nPlease ask your question there.\nPlease also search the
FAQ and the bug database.\nThanks for using Apache!
+INPUT TYPE=hidden NAME=Category VALUE=$fieldvalues{'Category'}
+INPUT TYPE=hidden NAME=Responsible
VALUE=$fieldvalues{'Responsible'}
+INPUT TYPE=hidden NAME=ResponsibleReason VALUE=
+ /FORM
+ /TD
+ TDSTRONGClose as concerning CGI, basic configuration, or something else
+ with which we say we don't provide assistance. (Refers submitter to
+ newsgroups and FAQ.)/STRONG
+ /TD
+ /TR
+/TABLE
EOM
}
print H2Full text of PR number $pr:/H2\npre\n;
cvs commit: apachen/htdocs/manual/mod mod_expires.html
coar97/11/11 13:35:10
Modified:htdocs/manual/mod mod_expires.html
Log:
Add documentation for alternate mod_expires time syntax.
PR: 1238
Revision ChangesPath
1.5 +89 -1 apachen/htdocs/manual/mod/mod_expires.html
Index: mod_expires.html
===
RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_expires.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_expires.html 1997/06/04 16:14:20 1.4
+++ mod_expires.html 1997/11/11 21:35:08 1.5
@@ -154,6 +154,13 @@
ExpiresDefault/A
directive.
/P
+ P
+ You can also specify the expiration time calculation using an
+ A
+ HREF=#AltSyn
+ alternate syntax/A,
+ described later in this document.
+ /P
HR
H2A NAME=expiresdefault
ExpiresDefault directive
@@ -178,8 +185,89 @@
HREF=#expiresbytype
ExpiresByType/A
directive. See the description of that directive for details about
- the syntax of the argument.
+ the syntax of the argument, and the
+ A
+ HREF=#AltSyn
+ alternate syntax/A
+ description as well.
+ /P
+ HR
+ H2
+ A NAME=AltSynAlternate Interval Syntax/A
+ /H2
+ P
+ The
+ A
+ HREF=#expiresdefault
+ SAMPExpiresDefault/SAMP/A
+ and
+ A
+ HREF=#expiresbytype
+ SAMPExpiresByType/SAMP/A
+ directives can also be defined in a more readable syntax of the form:
+ /P
+ DL
+ DDCODEExpiresDefault lt;basegt; [plus] {lt;numgt; lt;typegt;}*
+BR
+ExpiresByType type/encoding lt;basegt; [plus] {lt;numgt;
lt;typegt;}*/CODE
+ /DD
+ /DL
+ P
+ where lt;basegt; is one of:
+ /P
+ MENU
+ LISAMPaccess/SAMP
+ /LI
+ LISAMPnow/SAMP (equivalent to 'SAMPaccess/SAMP')
+ /LI
+ LISAMPmodification/SAMP
+ /LI
+ /MENU
+ /P
+ P
+ The 'SAMPplus/SAMP' keyword is optional. lt;numgt; should be an
+ integer value [acceptable to SAMPatoi()/SAMP], and lt;typegt;
+ is one of:
+ /P
+ MENU
+ LISAMPyears/SAMP
+ /LI
+ LISAMPmonths/SAMP
+ /LI
+ LISAMPweeks/SAMP
+ /LI
+ LISAMPdays/SAMP
+ /LI
+ LISAMPhours/SAMP
+ /LI
+ LISAMPminutes/SAMP
+ /LI
+ LISAMPseconds/SAMP
+ /LI
+ /MENU
+ P
+ For example, any of the following directives can be used to make
+ documents expire 1 month after being accessed, by default:
+ /P
+ DL
+ DDCODEExpiresDefault access plus 1 month
+BR
+ExpiresDefault access plus 4 weeks
+BR
+ExpiresDefault access plus 30 days
+ /DD
+ /DL
+ P
+ The expiry time can be fine-tuned by adding several 'lt;numgt;
lt;typegt;'
+ clauses:
/P
+ DL
+ DDCODEExpiresByType text/html access plus 1 month 15 days 2 hours
+BR
+ExpiresByType image/gif modification plus 5 hours 3 minutes
+ /DD
+ /DL
+
!--#include virtual=footer.html --
/BODY
/HTML
cvs commit: apache-site bugdb.cgi
coar97/11/11 14:12:30
Modified:.bugdb.cgi
Log:
Change the subject of mail sent after an edit to use the new
PR category. If it was changed as part of the edit, the mail
used to be unreplyable because it would no longer match the
PR's category.
Revision ChangesPath
1.18 +6 -2 apache-site/bugdb.cgi
Index: bugdb.cgi
===
RCS file: /export/home/cvs/apache-site/bugdb.cgi,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bugdb.cgi 1997/11/10 22:23:23 1.17
+++ bugdb.cgi 1997/11/11 22:12:29 1.18
@@ -56,6 +56,10 @@
#and non-critical the default severity.
# 11/10/1997 Ken Coar - Added some canned response buttons on the
#full display page seen by authorised editors.
+# 11/11/1997 Ken Coar - Change the subject of edit mail sent to match the
+#actual PR category; if it was changed as part of the edit, the message
+#would be unreplyable because of a category mismatch between the
+#new database value and the old subject line.
#
### End Modification log
@@ -193,7 +197,7 @@
### Main menu
} elsif ($PATH_INFO eq ) {
main_menu();
-print HRSMALLVersion: 10 November 1997BRAuthors: ,
+print HRSMALLVersion: 11 November 1997BRAuthors: ,
A HREF=\http://alumni.caltech.edu/~dank/gnats.html\;Dan Kegel ,
and Huy Le/A, BR ,
with revamp work by ,
@@ -815,7 +819,7 @@
$msg =
To: $mail_to
From: $input{'Editor'}
-Subject: Re: $semipr: $oldsyn
+Subject: Re: $input{'Category'}/$pr: $oldsyn
Synopsis: $oldsyn
cvs commit: apachen/src/modules/standard mod_autoindex.c
coar97/11/12 13:37:46
Modified:src CHANGES
src/modules/standard mod_autoindex.c
Log:
Fix mod_autoindex so it displays the ReadmeName file under all
circumstances, as it already handled the HeaderName file that
way.
PR: 1373
Reviewed by: Dean Gaudet, Martin Kraemer
Revision ChangesPath
1.506 +6 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -r1.505 -r1.506
--- CHANGES 1997/11/12 20:42:06 1.505
+++ CHANGES 1997/11/12 21:37:43 1.506
@@ -1,5 +1,11 @@
Changes with Apache 1.3b3
+ *) mod_autoindex wasn't displaying the ReadmeName file at the bottom
+ unless it was also doing FancyIndexes, but it displayed the
+ HeaderName file at the top under all circumstances. It now shows
+ the ReadmeName file for simple indices, too, as it should. PR#1373
+ [Ken Coar]
+
*) http_core was mmap()ing even in cases where it wasn't going to
read the file. [Ben Hyde [EMAIL PROTECTED]]
1.56 +4 -6 apachen/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mod_autoindex.c 1997/11/09 20:40:33 1.55
+++ mod_autoindex.c 1997/11/12 21:37:45 1.56
@@ -1100,12 +1100,10 @@
direction);
pclosedir(r-pool, d);
-if (autoindex_opts FANCY_INDEXING) {
- if ((tmp = find_readme(autoindex_conf, r)))
- insert_readme(name, tmp, , HRULE, END_MATTER, r);
- else {
- rputs(/UL, r);
- }
+if ((tmp = find_readme(autoindex_conf, r))) {
+ insert_readme(name, tmp, ,
+ ((autoindex_opts FANCY_INDEXING) ? HRULE : NO_HRULE),
+ END_MATTER, r);
}
rputs(/BODY/HTML\n, r);
cvs commit: apachen/src/main http_core.c
coar97/11/13 07:00:11
Modified:src CHANGES
src/main http_core.c
Log:
Correct an invalid assumption about where AllowOverrides may appear.
Reviewed by: Dean Gaudet, Martin Kraemer
Revision ChangesPath
1.509 +5 -1 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -r1.508 -r1.509
--- CHANGES 1997/11/12 23:26:12 1.508
+++ CHANGES 1997/11/13 15:00:08 1.509
@@ -1,5 +1,9 @@
Changes with Apache 1.3b3
+ *) Directives owned by http_core can now use the new check_cmd_context()
+ routine to ensure that they're not being used within a container
+ (e.g., Directory) where they're invalid. [Martin Kraemer]
+
*) PORT: SUNOS now always defines SUNOS_LIB_PROTOTYPES because a
recent change elsewhere left us without definitions for fgetc()
and fgets() breaking compilation. [Martin Kraemer, Ben Hyde]
@@ -21,7 +25,7 @@
*) http_core was mmap()ing even in cases where it wasn't going to
read the file. [Ben Hyde [EMAIL PROTECTED]]
- *) Complete rewrite ;_) of mod_rewrite's URL rewriting engine:
+ *) Complete rewrite ;-) of mod_rewrite's URL rewriting engine:
Now the rewriting engine (the heart of mod_rewrite) is organized more
straight-forward, first time well documented and reduced to the really
essential parts. All redundant cases were stripped off and processing
now
1.139 +4 -2 apachen/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- http_core.c 1997/11/12 20:42:09 1.138
+++ http_core.c 1997/11/13 15:00:10 1.139
@@ -667,8 +667,10 @@
{
char *w;
-const char *err = check_cmd_context(cmd,
NOT_IN_VIRTUALHOST|NOT_IN_LIMIT);
-if (err != NULL) return err;
+const char *err = check_cmd_context(cmd, NOT_IN_LIMIT);
+if (err != NULL) {
+return err;
+}
d-override = OR_NONE;
while(l[0]) {
cvs commit: apache-site bugdb.cgi
coar97/11/13 09:02:07
Modified:.bugdb.cgi
Log:
Add another canned button, this time for no response, assuming
closed.
Revision ChangesPath
1.19 +23 -0 apache-site/bugdb.cgi
Index: bugdb.cgi
===
RCS file: /export/home/cvs/apache-site/bugdb.cgi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bugdb.cgi 1997/11/11 22:12:29 1.18
+++ bugdb.cgi 1997/11/13 17:02:06 1.19
@@ -1407,6 +1407,28 @@
INPUT TYPE=hidden NAME=Release VALUE=$fieldvalues{'Release'}
INPUT TYPE=hidden NAME=Severity VALUE=$fieldvalues{'Severity'}
INPUT TYPE=hidden NAME=State VALUE=closed
+INPUT TYPE=hidden NAME=StateReason VALUE=[This is a standard
response.]\nNo response from submitter, assuming issue has been resolved.
+INPUT TYPE=hidden NAME=Category VALUE=$fieldvalues{'Category'}
+INPUT TYPE=hidden NAME=Responsible
VALUE=$fieldvalues{'Responsible'}
+INPUT TYPE=hidden NAME=ResponsibleReason VALUE=
+ /FORM
+ /TD
+ TDSTRONGClose due to no response from the submitter; assuming issue
+ has been resolved./STRONG
+ /TD
+ /TR
+ TR ALIGN=LEFT VALIGN=MIDDLE
+ TD
+ FORM METHOD=POST
ACTION=$SCRIPT_NAME/handle_edit_pr/$pr$fieldvalues{'State'}$timestamp
+INPUT TYPE=submit VALUE=Close
+
+INPUT TYPE=hidden NAME=Editor VALUE=$ENV{'REMOTE_USER'}
+INPUT TYPE=hidden NAME=Synopsis VALUE=
+INPUT TYPE=hidden NAME=Originator
VALUE=$fieldvalues{'Originator'}
+INPUT TYPE=hidden NAME=Class VALUE=duplicate
+INPUT TYPE=hidden NAME=Release VALUE=$fieldvalues{'Release'}
+INPUT TYPE=hidden NAME=Severity VALUE=$fieldvalues{'Severity'}
+INPUT TYPE=hidden NAME=State VALUE=closed
INPUT TYPE=hidden NAME=StateReason VALUE=[This is a standard
response.]\nThis issue has been reported before;\nplease search the FAQ and the
bug database.\nThanks for using Apache!
INPUT TYPE=hidden NAME=Category VALUE=$fieldvalues{'Category'}
INPUT TYPE=hidden NAME=Responsible
VALUE=$fieldvalues{'Responsible'}
@@ -1415,6 +1437,7 @@
/TD
TDSTRONGClose as being a duplicate report. (Refers submitter to bugdb
and the FAQ.)/STRONG
+ /TD
/TR
TR ALIGN=LEFT VALIGN=MIDDLE
TD
cvs commit: apachen/src INSTALL
coar97/11/13 10:22:56 Modified:src INSTALL Log: Added prominent notice about the ANSI C requirement. PR: 1044 Revision ChangesPath 1.19 +10 -0 apachen/src/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apachen/src/INSTALL,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- INSTALL 1997/08/27 01:12:19 1.18 +++ INSTALL 1997/11/13 18:22:55 1.19 @@ -1,3 +1,13 @@ +*** +*** Building the Apache Web server absolutely REQUIRES an ANSI C-compliant +*** compiler. If your compiler does not meet this requirement, don't +*** even bother trying to build the server; it won't work. +*** +*** The server may or may not build correctly with a C++ compiler. Making +*** it compilable with C++ is not a goal at this point, so if it doesn't +*** work please use a normal ANSI C compiler instead. +*** + This release of Apache supports the notion of optional modules. However, the server has to know which modules are compiled into it, in order for those modules to be effective; this requires generation of a
cvs commit: apachen/src/ap - New directory
coar97/11/13 10:47:30 apachen/src/ap - New directory
cvs commit: apache-site bugdb.cgi
coar97/11/13 13:56:40
Modified:.bugdb.cgi
Log:
A couple of minor tweaks/fixes.
Revision ChangesPath
1.20 +4 -2 apache-site/bugdb.cgi
Index: bugdb.cgi
===
RCS file: /export/home/cvs/apache-site/bugdb.cgi,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bugdb.cgi 1997/11/13 17:02:06 1.19
+++ bugdb.cgi 1997/11/13 21:56:39 1.20
@@ -60,6 +60,8 @@
#actual PR category; if it was changed as part of the edit, the message
#would be unreplyable because of a category mismatch between the
#new database value and the old subject line.
+# 11/13/1997 Ken Coar - Add another button for closing due to no response,
+#and fix a mis-set Class value from one of the other buttons.
#
### End Modification log
@@ -197,7 +199,7 @@
### Main menu
} elsif ($PATH_INFO eq ) {
main_menu();
-print HRSMALLVersion: 11 November 1997BRAuthors: ,
+print HRSMALLVersion: 13 November 1997BRAuthors: ,
A HREF=\http://alumni.caltech.edu/~dank/gnats.html\;Dan Kegel ,
and Huy Le/A, BR ,
with revamp work by ,
@@ -1403,7 +1405,7 @@
INPUT TYPE=hidden NAME=Editor VALUE=$ENV{'REMOTE_USER'}
INPUT TYPE=hidden NAME=Synopsis VALUE=
INPUT TYPE=hidden NAME=Originator
VALUE=$fieldvalues{'Originator'}
-INPUT TYPE=hidden NAME=Class VALUE=duplicate
+INPUT TYPE=hidden NAME=Class VALUE=$fieldvalues{'Class'}
INPUT TYPE=hidden NAME=Release VALUE=$fieldvalues{'Release'}
INPUT TYPE=hidden NAME=Severity VALUE=$fieldvalues{'Severity'}
INPUT TYPE=hidden NAME=State VALUE=closed
cvs commit: apachen/htdocs/manual/mod core.html
coar97/11/13 20:02:45 Modified:htdocs/manual/mod core.html Log: Include directive isn't a container.. Revision ChangesPath 1.84 +1 -1 apachen/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/core.html,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- core.html 1997/11/11 23:47:17 1.83 +++ core.html 1997/11/14 04:02:44 1.84 @@ -43,7 +43,7 @@ liA HREF=#hostnamelookupsHostNameLookups/A liA HREF=#identitycheckIdentityCheck/A liA HREF=#ifmodulelt;IfModulegt;/A -liA HREF=#includelt;Includegt;/A +liA HREF=#includeInclude/A liA HREF=#keepaliveKeepAlive/A liA HREF=#keepalivetimeoutKeepAliveTimeout/A liA HREF=#limitlt;Limitgt;/A
cvs commit: apache-site bugdb.cgi
coar97/11/14 14:18:37
Modified:.bugdb.cgi
Log:
Add a 30-minute Expires: response header field, and include some
instructions about how to get replies into the bugdb in mail
sent on updates.
Submitted by: Dirk-Willem van Gulik
Revision ChangesPath
1.21 +38 -2 apache-site/bugdb.cgi
Index: bugdb.cgi
===
RCS file: /export/home/cvs/apache-site/bugdb.cgi,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bugdb.cgi 1997/11/13 21:56:39 1.20
+++ bugdb.cgi 1997/11/14 22:18:36 1.21
@@ -3,6 +3,7 @@
# Thanks to Larry Wall, CERN, and NCSA for Perl, WWW, and Mosaic!
require /usr/local/lib/gnats/libgnats.pl;
+use POSIX;
Configuration begins here
@@ -11,6 +12,15 @@
$databasetitle = $software Problem Report Database;
$EDITOR_FILE = $GNATS_LIB/gnats-db/gnats-adm/responsible;
+# Lifetime (in seconds) of displayed info before it expires.
+$life_time = 30 * 60;
+$CCNOTE = EOT;
+[In order for any reply to be added to the PR database, ]
+[you need to include [EMAIL PROTECTED] in the Cc line ]
+[and leave the subject line UNCHANGED. This is not done]
+[automatically because of the potential for mail loops. ]
+EOT
+
# Outside commands
$MAILER = /usr/sbin/sendmail -oi -t;
$DATEPROG= /bin/date;
@@ -62,6 +72,9 @@
#new database value and the old subject line.
# 11/13/1997 Ken Coar - Add another button for closing due to no response,
#and fix a mis-set Class value from one of the other buttons.
+# 11/14/1997 Ken Coar - Add a note to mail messages about how to get
+#replies to go into the database. Also add an Expires: header field
+#(Dirk-Willem van Gulik).
#
### End Modification log
@@ -222,6 +235,24 @@
exit(0);
Miscellaneous functions
+# Format a date according to RFC 822 rules.
+sub RFC822_date
+{
+local ($s) = @_;
+local (@fdate) = gmtime ($s);
+local (@MNAME) = (Jan, Feb, Mar, Apr, May, Jun,
+ Jul, Aug, Sep, Oct, Nov, Dec);
+local (@WDAY) = (Sun, Mon, Tue, Wed, Thu, Fri, Sat);
+
+$fdate[5] += ($fdate[5] 90) ? 1900 : 2000;
+return sprintf (%s, %02d %s %04d %02d:%02d:%02d GMT,
+ $WDAY[$fdate[6]],
+ $fdate[3],
+ $MNAME[$fdate[4]],
+ $fdate[5], $fdate[2], $fdate[1],
+ $fdate[0]);
+}
+
# Dumps the environment
sub dumpenv
{
@@ -234,7 +265,7 @@
}
#
-# Emits either a rredirect or the preamble to some HTML.
+# Emits either a redirect or the preamble to some HTML.
#
sub emit_preamble {
local ($redirect, $target, $oldsel) = @_;
@@ -244,7 +275,8 @@
if ($redirect) {
print Location: $target\n\n;
} else {
- print Content-type: text/html\n\n;
+ print Content-type: text/html\n;
+ print Expires: . RFC822_date (time + $life_time) . \n\n;
print HTML\n;
}
$| = 0;
@@ -377,6 +409,8 @@
Reply-To: $fieldvalues{emailaddr}
X-send-pr-version: $GNATS_VER
+$CCNOTE
+
$prtext
EOM
close(MAIL);
@@ -822,6 +856,8 @@
To: $mail_to
From: $input{'Editor'}
Subject: Re: $input{'Category'}/$pr: $oldsyn
+
+$CCNOTE
Synopsis: $oldsyn
cvs commit: apachen/src/support Makefile.tmpl
coar97/11/15 11:04:54 Modified:htdocs/manual new_features_1_3.html src CHANGES Configure Makefile.tmpl src/main http_main.c src/support Makefile.tmpl Added: src/ap .cvsignore Makefile.tmpl ap_signal.c Log: Create new src/ap sibdirectory for the ap_*() routines, and tweak things to use it. So far only ap_signal() has been moved here, but that's enough to get htdigest to build. Other functions can move here over time. PR: 512, 905, 1252, 1308 Reviewed by: Dean Gaudet, Roy Fielding Revision ChangesPath 1.34 +13 -0 apachen/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html === RCS file: /export/home/cvs/apachen/htdocs/manual/new_features_1_3.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- new_features_1_3.html 1997/11/12 23:29:18 1.33 +++ new_features_1_3.html 1997/11/15 19:04:44 1.34 @@ -469,6 +469,19 @@ module has also been modified to display years using four digits in FancyIndexed directory listings. /LI + + LISTRONGSAMPap_*()/SAMP Routines Moving to a Separate Library/STRONG + BR + There are a number of functions and routines that have been developed + for the Apache project that supplement or supersede library routines + that differ from one operating system to another. While most of these + are used only by the Apache server itself, some are referenced by + supporting applications (such as SAMPhtdigest/SAMP), and these + other applications would fail to build because the routines were built + only into the server. These routines are now being migrated to a + separate subdirectory and library so they can be used by other + applications than just the server. + /LI /ul !--#include virtual=footer.html -- 1.513 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.512 retrieving revision 1.513 diff -u -r1.512 -r1.513 --- CHANGES 1997/11/15 03:29:55 1.512 +++ CHANGES 1997/11/15 19:04:46 1.513 @@ -1,5 +1,9 @@ Changes with Apache 1.3b3 + *) Start separating the ap_*() routines into their own library, so they + can be used by items in src/support among other things. PR#512, 905, + 1252, 1308 [Ken Coar] + *) Give a more informative error when no AuthType is set. [Lars Eilebrecht] 1.171 +2 -2 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- Configure 1997/11/08 21:47:33 1.170 +++ Configure 1997/11/15 19:04:47 1.171 @@ -26,7 +26,7 @@ tmpfile2=$tmpfile.2 tmpfile3=$tmpfile.3 awkfile=$tmpfile.4 -SUBDIRS='$(OSDIR) main modules' +SUBDIRS='$(OSDIR) main ap modules' ## Now handle any arguments, which, for now, is -file @@ -1031,7 +1031,7 @@ # # directories to create makefiles in # -MAKEDIRS=support main regex $OSDIR +MAKEDIRS=support main ap regex $OSDIR for dir in $MAKEDIRS ; do echo Creating Makefile in $dir cat Makefile.config $dir/Makefile.tmpl $dir/Makefile 1.72 +2 -1 apachen/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- Makefile.tmpl 1997/11/13 22:25:44 1.71 +++ Makefile.tmpl 1997/11/15 19:04:47 1.72 @@ -12,7 +12,8 @@ modules.o \ $(MODULES) \ main/libmain.a \ - $(OSDIR)/libos.a + $(OSDIR)/libos.a \ + ap/libap.a .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $ 1.1 apachen/src/ap/.cvsignore Index: .cvsignore === Makefile 1.1 apachen/src/ap/Makefile.tmpl Index: Makefile.tmpl === CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) LIBS=$(EXTRA_LIBS) $(LIBS1) INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES) LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) INCDIR=../main LIB=libap.a OBJS=ap_signal.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $ all: $(LIB) clean: rm -f *.o *.a $(OBJS): Makefile $(LIB): $(OBJS) ar cr $(LIB) $(OBJS) # dependencies
cvs commit: apachen/src PORTING
coar97/11/16 08:12:09 Modified:src PORTING Log: Remove incorrect case on email address, and change bugdb location to the new improved one. Revision ChangesPath 1.17 +2 -2 apachen/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apachen/src/PORTING,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- PORTING 1997/10/28 06:47:24 1.16 +++ PORTING 1997/11/16 16:12:09 1.17 @@ -26,8 +26,8 @@ family); the source basically uses ANSI function prototyping but no other specific ANSIisms. Thus, an ANSI-to-KR filter _may_ work, although as far as we know it has not yet been tried. If you -attempt this, let the Apache team know (send mail to [EMAIL PROTECTED] -or make a suggestion report at http://www.apache.org/bugdb.cgi). +attempt this, let the Apache team know (send mail to [EMAIL PROTECTED] +or make a suggestion report at http://bugs.apache.org/). --- The Starting Point:
cvs commit: apache-site/dist README.html
coar97/11/20 08:34:35 Modified:.index.html dist README.html Log: Update Apache site pages for 1.3b3 availability. Revision ChangesPath 1.46 +7 -7 apache-site/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/index.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- index.html1997/11/08 23:35:43 1.45 +++ index.html1997/11/20 16:34:33 1.46 @@ -75,29 +75,29 @@ PHR -H2 ALIGN=CENTERApache 1.3b2 Now Available: -BRThe first official beta release of Apache 1.3 +H2 ALIGN=CENTERApache 1.3b3 Now Available: +BRThe second official beta release of Apache 1.3 BRwith Microsoft Windows Support/H2 PBLOCKQUOTE -Apache 1.3b2 is the first public beta of the forthcoming Apache 1.3 Server. +Apache 1.3b3 is the second public beta of the forthcoming Apache 1.3 Server. Apache 1.3 includes several new enhancements, improvements and performance boosts, but the most visible addition is the ability to run under Microsoft Windows NT 4.0 and 95. At present it is available in source format only, so a compiler is neccessary to use it (Microsoft Visual C++ 5.0 for Windows). If you are using, or had previously tried the -1.3a1 release, please upgrade to 1.3b2 at your earliest convenience. +1.3a1 or 1.3b2 releases, please upgrade to 1.3b3 at your earliest convenience. pFONT COLOR=redImportant Note:/FONT Apache 1.3b1 was never formally -released. Thus, the first public beta release is b2. Since this is -the first beta release, it undoubtedly has its share of warts and bugs. +released. Thus, the first public beta release was 1.3b2. Since 1.3b3 is +still a beta release, it undoubtedly has its share of warts and bugs. Although it has been tested somewhat strenuously, your mileage may vary. /BLOCKQUOTE P ALIGN=CENTER -a href=dist/Download Apache 1.3b2/a | +a href=dist/Download Apache 1.3b3/a | a href=docs/windows.htmlApache for Windows/a | a href=docs/new_features_1_3.htmlNew Features in Apache 1.3/a 1.5 +6 -6 apache-site/dist/README.html Index: README.html === RCS file: /export/home/cvs/apache-site/dist/README.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README.html 1997/10/19 19:14:59 1.4 +++ README.html 1997/11/20 16:34:34 1.5 @@ -7,27 +7,27 @@ PFor information about new features in 1.2, see the A HREF=../docs/documentation/A. -H2Apache 1.3b2 Now Available/H2 +H2Apache 1.3b3 Now Available/H2 P -Apache 1.3b2 is the first public beta of the forthcoming Apache 1.3 Server. +Apache 1.3b3 is the second public beta of the forthcoming Apache 1.3 Server. Apache 1.3 includes several new enhancements, improvements and performance boosts, but the most visible addition is the ability to run under Microsoft Windows NT 4.0 and 95. At present it is available in source format only, so a compiler is necessary to use it (Microsoft Visual C++ 5.0 for Windows). If you are using, or had previously tried the -1.3a1 release, please upgrade to 1.3b2 at your earliest convenience. +1.3a1 or 1.3b2 releases, please upgrade to 1.3b3 at your earliest convenience. A summary of the more important changes is available in the A HREF=CHANGESCHANGES/A file. pFONT COLOR=redImportant Note:/FONT Apache 1.3b1 was never formally -released. Thus, the first public beta release is b2. Since this is -the first beta release, it undoubtedly has it's share of warts and bugs. +released. Thus, the first public beta release was 1.3b2. Since 1.3b3 is +still a beta release, it undoubtedly has its share of warts and bugs. Although it has been tested somewhat strenuously, your milage may vary. PFor information about new features in 1.3, see the A HREF=../docs/documentation/A. For information about some of -the known issues in 1.3b2, see the A HREF=../docs/misc/known_bugs.html +the known issues in 1.3b3, see the A HREF=../docs/misc/known_bugs.html known bugs/A page. H2Compilation note:/H2
cvs commit: apache-site/info apache_books.html index.html
coar97/11/26 09:59:11 Modified:info index.html Added: info apache_books.html Log: Somehow, Lars' page of book titles didn't get committed. Revision ChangesPath 1.2 +3 -1 apache-site/info/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/info/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html1997/07/01 20:53:13 1.1 +++ index.html1997/11/26 17:59:10 1.2 @@ -14,9 +14,11 @@ P Below is a list of miscellaneous information related to the Apache - web server development project. + Web server development project. /P DL + DTA HREF=apache_books.htmlApache Books/A/DT + DDA list of books written about the Apache Web server./DD DTA HREF=aol-http.htmlAOL and HTTP/1.1/A/DT DDA description of AOL's poorly thought out decision to try to force their own standards on the web./DD 1.1 apache-site/info/apache_books.html Index: apache_books.html === !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTML HEAD TITLEBooks written about Apache/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF DIV ALIGN=CENTER IMG SRC=../images/apache_sub.gif ALT=[APACHE BOOKS] /DIV H1 ALIGN=CENTERBooks written about Apache/H1 PThis is a list of all known books about Apache sorted by the year when they where published and in alphabetical order./P HR H21997/H2 UL LI DL DTSTRONGApache Server for Dummies/STRONG (EMnot yet published/EM) /DT DDAuthor: Ken Coar BR Published by: IDG Books Worldwide BR ISBN: 0-7645-0291-3 BR Language: English BR Note: includes CD-ROM /DD /DL /LI LI DL DTA HREF=http://www.oreilly.com/catalog/apache/; STRONGApache: The Definitive Guide/STRONG/A /DT DDAuthors: Ben Laurie, Peter Laurie BR Published by: O'Reilly amp; Associates BR ISBN: 1-56592-250-6 BR Language: English BR Note: includes CD-ROM /DD /DL /LI LI DL DTA HREF=http://www.itp.de/online/0347/0347.html; STRONGApache Web-Server/STRONG/A /DT DDAuthor: Lars Eilebrecht BR Published by: International Thomson Publishing BR ISBN: 3-8266-0347-8 BR Language: german BR Note: includes CD-ROM /DD /DL /LI /UL HR H21996/H2 UL LI DL DTA HREF=http://www.superlibrary.com/que/et/webapache/; STRONGRunning a Perfect Web Site With Apache/STRONG/A /DT DDAuthors: Brian Behlendorf, David M. Chandler, Lee Brintle, Rich Casselberry BR Published by: Que Education Training BR ISBN: 0-7897-0745-4 BR Language: English BR Note: includes CD-ROM /DD /DL /LI LI DL DTA HREF=http://www.mcp.com/sams/books/175-0/175-0.html; STRONGApache Server Survival Guide/STRONG/A /DT DDAuthor: Manuel Alberto Ricart BR Published by: Sams BR ISBN: 1-5752-1175-0 BR Language: English BR Note: includes CD-ROM /DD /DL /LI /UL HR PSend additions to A HREF=mailto:[EMAIL PROTECTED]Lars Eilebrecht/A./P HR P ALIGN=CENTER A HREF=/IMG SRC=../images/apache_home.gif ALT=Home/A /P /BODY /HTML
cvs commit: apachen/src/main http_config.c
coar97/11/27 08:10:46
Modified:src/main http_config.c
Log:
Enhance the unknown directive error message to indicate some
reasons *why* it might be invalid.
PR: 1479, 1480, and lots of others
Reviewed by: Dean Gaudet, Martin Kraemer
Revision ChangesPath
1.86 +3 -2 apachen/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apachen/src/main/http_config.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- http_config.c 1997/11/06 20:40:42 1.85
+++ http_config.c 1997/11/27 16:10:45 1.86
@@ -804,8 +804,9 @@
do {
if (!(cmd = find_command_in_modules(cmd_name, mod))) {
errno = EINVAL;
-return pstrcat(parms-pool, Invalid command ', cmd_name, ',
- NULL);
+return pstrcat(parms-pool, Invalid command ', cmd_name,
+ ', perhaps mis-spelled or defined by a module
+ not included in the server configuration, NULL);
}
else {
void *mconfig = get_module_config(config, mod);
cvs commit: apachen/src Configure
coar97/12/01 08:51:49 Modified:src Configure Log: Enhance the message Configure emits when it can't find the Configuration file; now it tells the user how to make it. Reviewed by: Jim Jagielski, Paul Sutton Revision ChangesPath 1.174 +2 -0 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- Configure 1997/11/30 19:17:22 1.173 +++ Configure 1997/12/01 16:51:48 1.174 @@ -49,6 +49,8 @@ if [ ! -r $file ]; then echo Can't see or read \$file\ + echo Please copy Configuration.tmpl to $file, edit it for your platform, + echo and re-run $0 again. exitcode=1 exit 1 fi
cvs commit: apachen/htdocs/manual/misc FAQ.html
coar97/12/01 20:45:56 Modified:htdocs/manual/misc FAQ.html Log: Recommend removal of Limit containers rather than adding methods to them. Submitted by: Marc Slemko Revision ChangesPath 1.95 +10 -4 apachen/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apachen/htdocs/manual/misc/FAQ.html,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- FAQ.html 1997/11/11 23:47:15 1.94 +++ FAQ.html 1997/12/02 04:45:55 1.95 @@ -15,7 +15,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.94 $ ($Date: 1997/11/11 23:47:15 $) + $Revision: 1.95 $ ($Date: 1997/12/02 04:45:55 $) /P P The latest version of this FAQ is always available from the main @@ -1003,13 +1003,19 @@ /P P DL - DDCODElt;Limit GETgt;BRnbsp;nbsp;nbsp;nbsp;:/CODE + DDCODElt;Limit GETgt; +BRnbsp;nbsp;nbsp;nbsp;:/CODE /DD /DL /P P - Change that to CODElt;Limit GET POSTgt;/CODE and the problem - will probably go away. + Change that to CODElt;Limitnbsp;GETnbsp;POSTgt;/CODE and the problem + will probably go away. Better yet, remove the + CODElt;Limitgt;/CODE and CODElt;/Limitgt;/CODE lines + altogether unless you're EMspecifically/EM trying to limit by + method (SAMPGET/SAMP, SAMPPUT/SAMP, EMet cetera/EM). If + you don't have a CODElt;Limitgt;/CODE container, the + restrictions apply equally to EMall/EM methods. /P HR /LI
cvs commit: apachen/htdocs/manual/mod mod_alias.html
coar97/12/07 15:03:46 Modified:htdocs/manual/mod mod_alias.html Log: Correct missing keyword on ScriptAliasMatch example. PR: 1512 Submitted by: Ronnie Brunner [EMAIL PROTECTED] Revision ChangesPath 1.14 +1 -1 apachen/htdocs/manual/mod/mod_alias.html Index: mod_alias.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_alias.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mod_alias.html1997/10/25 22:35:13 1.13 +++ mod_alias.html1997/12/07 23:03:45 1.14 @@ -248,7 +248,7 @@ matches into the given string and use it as a filename. For example, to activate the standard code/cgi-bin/code, one might use: pre -ScriptAlias ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1 +ScriptAliasMatch ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1 /pre /p
cvs commit: apache-site info.html
coar97/12/12 21:41:11 Modified:.info.html Log: Fix some bugdb pointers, some excessively long lines, and some HTML style issues. Revision ChangesPath 1.9 +27 -14apache-site/info.html Index: info.html === RCS file: /export/home/cvs/apache-site/info.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- info.html 1997/08/03 10:11:06 1.8 +++ info.html 1997/12/13 05:41:10 1.9 @@ -41,7 +41,7 @@ DDAllows you to set up files, or even CGI scripts, which are returned by the server in response to errors and problems, e.g. setup a script to intercept - B500 Server Error/Bs and perform on-the-fly diagnostics for + STRONG500 Server Error/STRONGs and perform on-the-fly diagnostics for both users and yourself. /DD DT Multiple DirectoryIndex directives /DT DD Allows you to say codeDirectoryIndex index.html @@ -72,7 +72,7 @@ H2Why switch to Apache?/H2 -PBSpeed, features, stability./B/P +PSTRONGSpeed, features, stability./STRONG/P PThe Apache Group will allow everyone to use and redistribute Apache without charge. /P @@ -85,19 +85,28 @@ take./P PSome existing prominent web servers have already switched to -Apache code and are actively helping with development of Apache. These include A HREF=http://www.hotwired.com/;Hotwired/A, A HREF=http://www.ai.mit.edu/;MIT AI Lab/A, The Internet Movie Database at A HREF=http://us.imdb.com/Movies/;US/A and - A HREF=http://uk.imdb.com/Movies/;UK/A, and A HREF=http://www.hyperreal.org/;Hyperreal/A, as well as many other sites running various services and OSes./P - -PAn incomplete A HREF=info/apache_users.htmllist of sites/A running Apache is being maintained./P +Apache code and are actively helping with development of Apache. These +include A HREF=http://www.hotwired.com/;Hotwired/A, +A HREF=http://www.ai.mit.edu/;MIT AI Lab/A, The Internet Movie +Database at A HREF=http://us.imdb.com/Movies/;US/A and +A HREF=http://uk.imdb.com/Movies/;UK/A, and +A HREF=http://www.hyperreal.org/;Hyperreal/A, as well as many +other sites running various services and OSes./P + +PAn incomplete +A HREF=info/apache_users.htmllist of sites/A running +Apache is being maintained./P H2When will Apache be available?/H2 -PApache version 1.2.0 is currently available to everyone, and is +PApache version 1.2.4 is currently available to everyone, and is the most stable version. H2Will Apache be supported?/H2 -PSupport for Apache will be via the A -HREF=news:comp.infosystems.www.servers.unix;comp.infosystems.www.servers.unix/A +PSupport for Apache will be EMvia/EM the +A + HREF=news:comp.infosystems.www.servers.unix; +comp.infosystems.www.servers.unix/A newsgroup. Our policy will be for complete openness, with the exception of reports of security holes. @@ -107,8 +116,8 @@ PBug reports and suggestions should be submitted by filling out a report form at A - HREF=http://www.apache.org/bugdb.cgi; -SAMPhttp://www.apache.org/bugdb.cgi/SAMP/A. + HREF=http://bugs.apache.org/; +SAMPhttp://bugs.apache.org//SAMP/A. If your browser is not forms-capable, or you can't access the form for some other reason, you can submit information by sending a mail message to A @@ -124,13 +133,17 @@ questions that need answering./P H2Why is it called Apache?/H2 -PThe Apache group was formed around a number of people who provided Ipatch/I files that had been written for NCSA httpd 1.3. The result after combining them was BA PA/BtBCH/By server./P +PThe Apache group was formed around a number of people who provided +EMpatch/EM files that had been written for NCSA httpd 1.3. The +result after combining them was +STRONGA PA/STRONGtSTRONGCH/STRONGy server./P H2How do I get Apache?/H2 PThe Apache httpd server is available in the form of source code: ul -livia http from various places listed on the A HREF=./main Apache -page/A/ul +liEMvia/EM http from various places listed on the + A HREF=./main Apache page/A +/ul HR SIZE=3
cvs commit: apache-site/info apache_books.html
coar97/12/13 05:36:27 Modified:info apache_books.html Log: Fix some book linkages. Submitted by: Lars Eilebrecht [EMAIL PROTECTED] Revision ChangesPath 1.2 +2 -2 apache-site/info/apache_books.html Index: apache_books.html === RCS file: /export/home/cvs/apache-site/info/apache_books.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apache_books.html 1997/11/26 17:59:09 1.1 +++ apache_books.html 1997/12/13 13:36:27 1.2 @@ -84,7 +84,7 @@ UL LI DL - DTA HREF=http://www.superlibrary.com/que/et/webapache/; + DTA HREF=http://merchant.superlibrary.com:8000/catalog/hg/PRODUCT/PAGE/07897/bud/0789707454.html; STRONGRunning a Perfect Web Site With Apache/STRONG/A /DT DDAuthors: Brian Behlendorf, David M. Chandler, Lee Brintle, Rich @@ -102,7 +102,7 @@ /LI LI DL - DTA HREF=http://www.mcp.com/sams/books/175-0/175-0.html; + DTA HREF=http://merchant.superlibrary.com:8000/catalog/hg/PRODUCT/PAGE/15752/bud/1575211750.html; STRONGApache Server Survival Guide/STRONG/A /DT DDAuthor: Manuel Alberto Ricart
cvs commit: apache-site/contributors index.html
coar97/12/15 08:53:16 Modified:.ABOUT_APACHE.html contributors index.html Log: Bring my info up-to-date. Revision ChangesPath 1.10 +1 -1 apache-site/ABOUT_APACHE.html Index: ABOUT_APACHE.html === RCS file: /export/home/cvs/apache-site/ABOUT_APACHE.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ABOUT_APACHE.html 1997/11/09 21:04:54 1.9 +++ ABOUT_APACHE.html 1997/12/15 16:53:14 1.10 @@ -150,7 +150,7 @@ TR TDKen Coarnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD - TDProcess Software Corporation, New England, USA + TDMeepZor Consulting, New England, USA /TD /TR TR 1.22 +2 -2 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- index.html1997/12/03 07:28:54 1.21 +++ index.html1997/12/15 16:53:15 1.22 @@ -160,8 +160,8 @@ BName:/B A NAME=coarKen Coar/ABR BEmail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR BURL:/B A HREF=http://www.golux.com/coar/;http://www.golux.com/coar//ABR -BOrganization:/B A HREF=http://www.process.com/;Process Software Corporation/ABR -BOccupation:/B Principal Software EngineerBR +BOrganization:/B MeepZor ConsultingBR +BOccupation:/B Software amp; Web developmentBR BLocation:/B Mostly in New England, USABR BComments:/B HTML pedant, FAQ editor, UI perfectionist, bugdb script hackerBR
cvs commit: apachen/htdocs/manual/mod mod_auth.html
coar97/12/16 12:57:39 Modified:htdocs/manual/mod mod_auth.html Log: Correct some misstatements about the Auth*File directives; they're ServerRoot-relative if not absolute. PR: 1511 Revision ChangesPath 1.9 +15 -9 apachen/htdocs/manual/mod/mod_auth.html Index: mod_auth.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_auth.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mod_auth.html 1997/06/04 16:14:15 1.8 +++ mod_auth.html 1997/12/16 20:57:38 1.9 @@ -38,12 +38,14 @@ strongModule:/strong mod_authp The AuthGroupFile directive sets the name of a textual file containing the list -of user groups for user authentication. emFilename/em is the absolute path -to the group file.p +of user groups for user authentication. emFilename/em is the path +to the group file. If it is not absolute (EMi.e./EM, if it +doesn't begin with a slash), it is treated as relative to the ServerRoot. +P Each line of the group file contains a groupname followed by a colon, followed by the member usernames separated by spaces. Example: blockquotecodemygroup: bob joe anne/code/blockquote -Note that searching large groups files is emvery/em inefficient; +Note that searching large text files is emvery/em inefficient; A HREF=mod_auth_dbm.html#authdbmgroupfileAuthDBMGroupFile/A should be used instead.p @@ -65,13 +67,17 @@ The AuthUserFile directive sets the name of a textual file containing the list of users and passwords for user -authentication. emFilename/em is the absolute path to the user -file.p Each line of the user file file contains a username followed +authentication. emFilename/em is the path to the user +file. If it is not absolute (EMi.e./EM, if it doesn't begin with a +slash), it is treated as relative to the ServerRoot. +p Each line of the user file file contains a username followed by a colon, followed by the crypt() encrypted password. The behavior -of multiple occurrences of the same user is undefined.p Note that -searching user groups files is inefficient; A -HREF=mod_auth_dbm.html#authdbmuserfileAuthDBMUserFile/A should be -used instead.p +of multiple occurrences of the same user is undefined. +p Note that +searching large text files is EMvery/EM inefficient; +A HREF=mod_auth_dbm.html#authdbmuserfileAuthDBMUserFile/A should be +used instead. +p Security: make sure that the AuthUserFile is stored outside the document tree of the web-server; do emnot/em put it in the directory that
cvs commit: apachen STATUS
coar97/12/23 11:55:55 Modified:.STATUS Log: Update some votes on patches.. Revision ChangesPath 1.19 +3 -3 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- STATUS1997/12/23 02:03:51 1.18 +++ STATUS1997/12/23 19:55:54 1.19 @@ -55,11 +55,11 @@ * Dean's [PATCH] more useful warning message for fcntl() lock failure [EMAIL PROTECTED] - Status: Dean +1, Jim +1 + Status: Dean +1, Jim +1, Ken +1 * Dean's [PATCH] ap_snprintf should be more sane (fwd) [EMAIL PROTECTED] - Status: Dean +1, Jim +1 + Status: Dean +1, Jim +1, Ken +1 * Dean's [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs [EMAIL PROTECTED] @@ -67,7 +67,7 @@ * Dean's [PATCH] fix Rasmus' chunking error [EMAIL PROTECTED] - Status: Dean +1 + Status: Dean +1, Rasmus +1 * Dean's [PATCH] mod_status cleanups [EMAIL PROTECTED]
cvs commit: apachen STATUS
coar97/12/23 15:03:38 Modified:.STATUS Log: Record the ap_snprintf() move concept discussion. Revision ChangesPath 1.22 +5 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- STATUS1997/12/23 20:36:15 1.21 +++ STATUS1997/12/23 23:03:37 1.22 @@ -142,6 +142,11 @@ Needs patch: +* Jim's/Ken's move of main/util_snprintf.c to ap/ap_snprintf.c + [EMAIL PROTECTED] + (Concept only) + Status: Jim +1, Ken +1, Dean +1 + * Dean's locale project See [EMAIL PROTECTED] Status: Jim'll look into it
cvs commit: apachen STATUS
coar97/12/23 16:54:22 Modified:.STATUS Log: Add the record of the patch to move ap_snprintf() to libap. Revision ChangesPath 1.23 +4 -5 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- STATUS1997/12/23 23:03:37 1.22 +++ STATUS1997/12/24 00:54:21 1.23 @@ -55,6 +55,10 @@ Available: +* Jim's/Ken's move of main/util_snprintf.c to ap/ap_snprintf.c + [EMAIL PROTECTED] + Status: Ken +1, Jim +1 (concept), Dean +1 (concept) + * Dean's [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs [EMAIL PROTECTED] Status: Dean +1, Martin +1 @@ -141,11 +145,6 @@ * Ben's ASP work... All agree it sounds cool. Needs patch: - -* Jim's/Ken's move of main/util_snprintf.c to ap/ap_snprintf.c - [EMAIL PROTECTED] - (Concept only) - Status: Jim +1, Ken +1, Dean +1 * Dean's locale project See [EMAIL PROTECTED]
cvs commit: apachen STATUS
coar97/12/24 08:43:15 Modified:.STATUS Log: Add the PR#1195 fix patch to the list. Revision ChangesPath 1.26 +4 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- STATUS1997/12/24 04:36:10 1.25 +++ STATUS1997/12/24 16:43:14 1.26 @@ -56,6 +56,10 @@ Available: +* Ken's [PATCH] for PR#1195 ( in realm names) + [EMAIL PROTECTED] + Status: Ken +1 + * Dean's [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs [EMAIL PROTECTED] Status: Dean +1, Martin +1
cvs commit: apachen/src/main http_core.c
coar97/12/27 20:51:03 Modified:.STATUS src CHANGES src/ap Makefile.tmpl src/main http_core.c Added: src/ap ap_strings.c Log: Correct handling of quotation marks in AuthName realm names. PR: 1195 Reviewed by: Dean Gaudet, Jim Jagielski Revision ChangesPath 1.38 +5 -6 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- STATUS1997/12/27 23:08:20 1.37 +++ STATUS1997/12/28 04:50:57 1.38 @@ -57,7 +57,9 @@ * Dean's [PATCH] fix Rasmus' chunking error * [PATCH] PR#1366: fix result of send_fd_length * Ben Hyde's [PATCH] Finish suite of mutex ops for non-threaded platforms -* Ben Hyde's [PATCH] Serialize the update to pool.sub_* in destroy_pool (take 2) +* Ben Hyde's [PATCH] Serialize the update to pool.sub_* in destroy_pool + (take 2) +* Ken's [PATCH] for PR#1195 ( in realm names) Available Patches: @@ -65,13 +67,10 @@ [EMAIL PROTECTED] Status: Jim +1, Dirk +1, Marc wants to think about the name, Dean +1 -* [PATCH] mod_digest/1599: proxy authentication using the digest auth scheme never succeeds (fwd) +* [PATCH] mod_digest/1599: proxy authentication using the digest auth + scheme never succeeds (fwd) [EMAIL PROTECTED] Status: Dean +1, Jim +1 - -* Ken's [PATCH] for PR#1195 ( in realm names) - [EMAIL PROTECTED] - Status: Ken +1, Dean +1, Jim +1 * Dean's [PATCH] mod_status cleanups [EMAIL PROTECTED] 1.550 +3 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.549 retrieving revision 1.550 diff -u -r1.549 -r1.550 --- CHANGES 1997/12/28 04:23:41 1.549 +++ CHANGES 1997/12/28 04:50:59 1.550 @@ -1,5 +1,8 @@ Changes with Apache 1.3b4 + *) Correct handling of quotation marks in AuthName realm names; as a + byproduct, a new function: ap_escape_quotes(). [Ken Coar] PR#1195 + *) WIN32: Work around optimiser bug that killed ISAPI in release versions. [Ben Laurie] PR#1533 1.5 +2 -1 apachen/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/ap/Makefile.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.tmpl 1997/12/24 04:36:15 1.4 +++ Makefile.tmpl 1997/12/28 04:51:01 1.5 @@ -6,7 +6,7 @@ LIB=libap.a -OBJS=ap_signal.o ap_slack.o ap_snprintf.o +OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $ @@ -27,3 +27,4 @@ ap_signal.o: $(INCDIR)/httpd.h ap_slack.o: $(INCDIR)/httpd.h $(INCDIR)/http_log.h ap_snprintf.o: $(INCDIR)/conf.h +ap_strings.o: $(INCDIR)/httpd.h 1.1 apachen/src/ap/ap_strings.c Index: ap_strings.c === /* * Copyright (c) 1995-1997 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. For written permission, please contact *[EMAIL PROTECTED] * * 5. Redistributions of any form whatsoever must retain the following *acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES
cvs commit: apachen STATUS
coar97/12/29 07:09:48 Modified:.STATUS Log: Some rearrangement, format changes, and a new issue. Revision ChangesPath 1.39 +31 -24apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- STATUS1997/12/28 04:50:57 1.38 +++ STATUS1997/12/29 15:09:47 1.39 @@ -131,18 +131,28 @@ Concepts: * Jim's [CONCEPT] platform.h header file. Instead of lumping - all OS stuff in conf.h, create a ./platforms/ sub-dir - and have Configure copy and modify platform.h as needed. + all OS stuff in conf.h, create a ./platforms/ sub-dir + and have Configure copy and modify platform.h as needed. [EMAIL PROTECTED] In progress: * Martin Kraemer's [PATCH] Parsing URI into its components - This has evolved into a new module: util_uri. Martin - will post when it's at a state where he's happy with it. + This has evolved into a new module: util_uri. Martin + will post when it's at a state where he's happy with it. + Ken would like to see it in libap instead of libmain. * Ben's ASP work... All agree it sounds cool. - + +* DDA's adding a tray application to the Windoze version for ease of + status/management. + [EMAIL PROTECTED] + [EMAIL PROTECTED] + Status: Ken +1, Sameer +1, Martin +1, Ben +1 (as long as + we get a single executable) + Paul: No like Win95 specific stuff + Ken: What's W95-specific about it? + Needs patch: * Dean's locale project @@ -158,8 +168,8 @@ Open issues: * Paul would like to see a 'gdbm' option because he uses - it a lot. Dean notes that 'gdbm' include 'db' support - so we need to watch the library ordering. + it a lot. Dean notes that 'gdbm' include 'db' support + so we need to watch the library ordering. Dean notes: Check rev 1.72 - rev 1.73 of src/Configuration.tmpl. I re-ordered mod_auth_dbm and @@ -168,23 +178,25 @@ troubles if I automatically looked for gdbm. * What do we call the binary: apache or httpd? Under UNIX - it's httpd, under Win32 it's apache. Maybe rename it - to apache-httpd? + it's httpd, under Win32 it's apache. Maybe rename it + to apache-httpd? + apache-httpd: Ken +1 * Maybe a http_paths.h file? See [EMAIL PROTECTED] * Release builds: Should we provide Configuration or not? - Should we 'make all suexec' in src/support? - + Should we 'make all suexec' in src/support? + Ken +1 (possible suexec path issue, though) + * root's environment is inherited by the Apache server. Jim, Ken - Dean thinks we should recommend using 'env' to build the - appropriate environment. Marc and Alexei don't see any - big deal. + Dean thinks we should recommend using 'env' to build the + appropriate environment. Marc and Alexei don't see any + big deal. * Ken suggests that new check_cmd_context() and related defines - should be non-static and in util_* so modules can use 'em. (He - didn't notice this flaw during the review.) + should be non-static and in util_* so modules can use 'em. (He + didn't notice this flaw during the review.) * Sameer's mod_so implemetation See [EMAIL PROTECTED] @@ -200,14 +212,9 @@ * Marc's socket options like source routing (kill them?) Marc, Dean, Martin say Yes -* DDA's adding a tray application to the Windoze version for ease of - status/management. - [EMAIL PROTECTED] - [EMAIL PROTECTED] - Status: Ken +1, Sameer +1, Martin +1, Ben +1 (as long as - we get a single executable) - Paul: No like Win95 specific stuff - * Marc's [BUG] include virtual and SCRIPT_NAME w/path_info [EMAIL PROTECTED] +* Ken's PR#1053: an error when accessing a negotiated document + explicitly names the variant selected. Should it do so, or should + the base input name be referenced?
cvs commit: apachen STATUS
coar98/01/02 09:03:16 Modified:.STATUS Log: Add notice of the patch to update the copyright years. Revision ChangesPath 1.44 +5 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- STATUS1998/01/02 13:58:44 1.43 +++ STATUS1998/01/02 17:03:16 1.44 @@ -66,6 +66,11 @@ Available Patches: +* Ken's [PATCH] for copyright year update + [EMAIL PROTECTED] + Status: Ken +1, Jim +1 + Gregory Lundberg says it's legally invalid + * [PATCH] mod_digest/1599: proxy authentication using the digest auth scheme never succeeds (fwd) [EMAIL PROTECTED]
cvs commit: apachen STATUS
coar98/01/06 21:04:17 Modified:.STATUS Log: Wrap a too-long line. Revision ChangesPath 1.53 +2 -1 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- STATUS1998/01/06 23:42:04 1.52 +++ STATUS1998/01/07 05:04:16 1.53 @@ -66,7 +66,8 @@ * Paul/Ben's [PATCH] 1.3: spaces in NT spawn* arguments * Dean's [PATCH] mod_info minor cleanups (take 2) * Dean's [PATCH] mod_status cleanups -* [PATCH] mod_digest/1599: proxy authentication using the digest auth scheme never succeeds (fwd) +* [PATCH] mod_digest/1599: proxy authentication using the digest auth + scheme never succeeds (fwd) * Paul's [PATCH] a bundle of multithreading changes Available Patches:
cvs commit: apachen STATUS
coar98/01/07 04:50:43 Modified:.STATUS Log: More updates.. Revision ChangesPath 1.54 +2 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- STATUS1998/01/07 05:04:16 1.53 +++ STATUS1998/01/07 12:50:43 1.54 @@ -85,6 +85,7 @@ Status: Doug +1, Randy +1, Dean would really prefer Ben's proposal of httpd -M config file directive if it works. Jim would prefer Ben's solution as well. + So would Ken (does it obviate -d and -f if present?) * Martin's [PATCH] Location within .htaccess? [EMAIL PROTECTED] @@ -98,6 +99,7 @@ [EMAIL PROTECTED] Status: Ken +1, Jim +1 Gregory Lundberg says it's legally invalid + Alexei disagrees, citing past practice and investigation * Martin's [PATCH] 36kB: Make apache compile run on an EBCDIC mainframe [EMAIL PROTECTED]
cvs commit: apachen/src/support apachectl apachectl.1 dbmmanage htpasswd.1 httpd.8 log_server_status split-logfile suexec.c suexec.h
coar98/01/07 08:47:17 Modified:.LICENSE htdocs/manual LICENSE expand.pl src/ap ap_cpystrn.c ap_signal.c ap_slack.c ap_snprintf.c ap_strings.c src/main alloc.c alloc.h buff.c buff.h conf.h http_conf_globals.h http_config.c http_config.h http_core.c http_core.h http_log.c http_log.h http_main.c http_main.h http_protocol.c http_protocol.h http_request.c http_request.h http_vhost.c http_vhost.h httpd.h md5.h md5c.c rfc1413.c rfc1413.h scoreboard.h util.c util_date.c util_date.h util_md5.c util_md5.h util_script.c util_script.h src/modules/example mod_example.c src/modules/proxy mod_proxy.c mod_proxy.h proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c proxy_util.c src/modules/standard mod_access.c mod_actions.c mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_autoindex.c mod_cern_meta.c mod_cgi.c mod_digest.c mod_dir.c mod_dld.c mod_env.c mod_expires.c mod_headers.c mod_imap.c mod_include.c mod_info.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_mime.c mod_mime_magic.c mod_negotiation.c mod_rewrite.c mod_rewrite.h mod_setenvif.c mod_speling.c mod_status.c mod_unique_id.c mod_userdir.c mod_usertrack.c src/os/win32 mod_dll.c mod_isapi.c src/support apachectl apachectl.1 dbmmanage htpasswd.1 httpd.8 log_server_status split-logfile suexec.c suexec.h Log: Update the copyright year of all the various HEAD files to include 1998. Reviewed by: Jim Jagielski, Martin Kraemer Revision ChangesPath 1.8 +1 -1 apachen/LICENSE Index: LICENSE === RCS file: /export/home/cvs/apachen/LICENSE,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- LICENSE 1997/10/15 20:22:47 1.7 +++ LICENSE 1998/01/07 16:45:53 1.8 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1997 The Apache Group. All rights reserved. + * Copyright (c) 1995-1998 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions 1.5 +1 -1 apachen/htdocs/manual/LICENSE Index: LICENSE === RCS file: /export/home/cvs/apachen/htdocs/manual/LICENSE,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- LICENSE 1997/10/15 20:22:48 1.4 +++ LICENSE 1998/01/07 16:45:53 1.5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1997 The Apache Group. All rights reserved. + * Copyright (c) 1995-1998 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions 1.4 +1 -1 apachen/htdocs/manual/expand.pl Index: expand.pl === RCS file: /export/home/cvs/apachen/htdocs/manual/expand.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- expand.pl 1997/01/01 18:32:14 1.3 +++ expand.pl 1998/01/07 16:45:54 1.4 @@ -11,7 +11,7 @@ # Nov 30, 1996 - Alexei Kosut [EMAIL PROTECTED] # -# Copyright (c) 1996,1997 The Apache Group. All rights reserved. +# Copyright (c) 1996-1998 The Apache Group. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions 1.3 +1 -1 apachen/src/ap/ap_cpystrn.c Index: ap_cpystrn.c === RCS file: /export/home/cvs/apachen/src/ap/ap_cpystrn.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ap_cpystrn.c 1997/12/30 16:42:32 1.2 +++ ap_cpystrn.c 1998/01/07 16:45:55 1.3 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1997
cvs commit: apachen STATUS
coar98/01/07 09:04:02 Modified:.STATUS Log: Note application of copyright year update. Revision ChangesPath 1.56 +1 -6 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- STATUS1998/01/07 13:52:03 1.55 +++ STATUS1998/01/07 17:04:02 1.56 @@ -69,6 +69,7 @@ * [PATCH] mod_digest/1599: proxy authentication using the digest auth scheme never succeeds (fwd) * Paul's [PATCH] a bundle of multithreading changes +* Ken's [PATCH] for copyright year update Available Patches: @@ -94,12 +95,6 @@ * Brian Havard's [Patch] OS/2 - fix up shut down [EMAIL PROTECTED] Status: Dean +1 - -* Ken's [PATCH] for copyright year update - [EMAIL PROTECTED] - Status: Ken +1, Jim +1, Martin +1 - Gregory Lundberg says it's legally invalid - Alexei disagrees, citing past practice and investigation * Martin's [PATCH] 36kB: Make apache compile run on an EBCDIC mainframe [EMAIL PROTECTED]
cvs commit: apachen STATUS
coar98/01/10 07:23:34 Modified:.STATUS Log: Add a couple of Marc's patches that were sent by mail but accidentally not recorded here. Revision ChangesPath 1.66 +8 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- STATUS1998/01/10 08:25:24 1.65 +++ STATUS1998/01/10 15:23:33 1.66 @@ -77,6 +77,14 @@ Available Patches: +* Marc's [PATCH] mod_status warnings + [EMAIL PROTECTED] + Status: Marc +1, Paul +1 + +* Marc's [PATCH] a couple of casts for msvc warnings + [EMAIL PROTECTED] + Status: Marc +1, Paul +1 + * Dean's [PATCH] OSF/1 serialized accept [EMAIL PROTECTED] Status: Dean +1
cvs commit: apachen STATUS
coar98/01/11 08:15:39 Modified:.STATUS Log: These aren't directly related to the software, but are definitely related to the process by which it's developed. Calling for votes on commit-then-review and a patches-for-voting directory. Revision ChangesPath 1.71 +13 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- STATUS1998/01/11 15:58:35 1.70 +++ STATUS1998/01/11 16:15:38 1.71 @@ -188,6 +188,19 @@ Open issues: +* Ken's [POLL] apachen/patches directory + Shall we experiment with allowing patches to be distributed for + voting through cvs, by creating a directory under the source tree + and putting them there? Please vote. + [EMAIL PROTECTED] + Status: Ken +1 + +* Ken's [POLL] experiment with commit-then-review + Shall we permit unreviewed commits to the source tree? (Details + of when it's [in]appropriate to be worked out later.) Vote, please. + [EMAIL PROTECTED] + Status: Ken +1 + * Paul would like to see a 'gdbm' option because he uses it a lot. Dean notes that 'gdbm' include 'db' support so we need to watch the library ordering.
cvs commit: apache-devsite index.html
coar98/01/12 13:02:53 Modified:.index.html Log: Add a note about R/W access to the bugdb requiring an account, and more details about what's in /from-cvs/. Revision ChangesPath 1.14 +8 -7 apache-devsite/index.html Index: index.html === RCS file: /export/home/cvs/apache-devsite/index.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- index.html1998/01/12 20:34:28 1.13 +++ index.html1998/01/12 21:02:53 1.14 @@ -23,9 +23,9 @@ be waiting for someone to get around to updating them. /BLOCKQUOTE UL TYPE=SQUARE - LIA href=http://bugs.apache.org/;Read-only/a, or -a href=http://bugs.apache.org/private/;read-write/a access to the -bug database. + LIA HREF=http://bugs.apache.org/;Read-only/A, or +A HREF=http://bugs.apache.org/private/;read-write/A access to the +bug database. (Read-write access requires authorisation.) /LI LIArchives of the A @@ -87,13 +87,14 @@ (last modified on !--#flastmod virtual=todo.html --) /LI LIThe A HREF=from-cvs/latest source tree/A pulled from the - CVS repository. Not guaranteed to do anything, especially not - compile or work. + CVS repository, packaged with SAMPtar/SAMP, and compressed + with SAMPgzip/SAMP. Not guaranteed + to do anything, especially not compile or work. /LI - LIa href=anoncvs.txtInstructions/a + LIA HREF=anoncvs.txtInstructions/A on using anonymous CVS to access the development repository. /LI - LIa href=http://www.engelschall.com/pw/apache/cvsguide/;Instructions/a + LIA HREF=http://www.engelschall.com/pw/apache/cvsguide/;Instructions/A on developer access to the repository via CVSup. /LI LIA Web-based view of the
cvs commit: apachen STATUS
coar98/01/14 07:38:39 Modified:.STATUS Log: Clear and sunny, though cold. Revision ChangesPath 1.90 +3 -2 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- STATUS1998/01/14 14:34:28 1.89 +++ STATUS1998/01/14 15:38:38 1.90 @@ -176,13 +176,14 @@ voting through cvs, by creating a directory under the source tree and putting them there? Please vote. [EMAIL PROTECTED] - Status: Ken +1 + Status: Ken +1, Randy 0, Dean 0, Jim +1, Paul 0 * Ken's [POLL] experiment with commit-then-review Shall we permit unreviewed commits to the source tree? (Details of when it's [in]appropriate to be worked out later.) Vote, please. [EMAIL PROTECTED] - Status: Ken +1 + Status: Ken +1, Randy +1, Ben +1, Martin +1, Dean +1, Brian +1, + Jim +1, Rob +1, Paul 0, Ralf +1 * Paul would like to see a 'gdbm' option because he uses it a lot. Dean notes that 'gdbm' include 'db' support
cvs commit: apachen STATUS
coar98/01/14 08:41:36 Modified:.STATUS Log: Add update on the status of the great commit/review debate. Revision ChangesPath 1.91 +8 -7 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- STATUS1998/01/14 15:38:38 1.90 +++ STATUS1998/01/14 16:41:34 1.91 @@ -169,21 +169,22 @@ Ken says he'll try to maintain it, since there are people/places who need it +* The decision has been made to experiment with allowing code + changes to be committed without prior review. Specific guidelines + and implementation date to be worked out. + Open issues: +* Guidelines for when prior review is required if commit-then-review + is the normal mode of operation. Roy has started covering the + whole process in http://dev.apache.org/guidelines.html. + * Ken's [POLL] apachen/patches directory Shall we experiment with allowing patches to be distributed for voting through cvs, by creating a directory under the source tree and putting them there? Please vote. [EMAIL PROTECTED] Status: Ken +1, Randy 0, Dean 0, Jim +1, Paul 0 - -* Ken's [POLL] experiment with commit-then-review - Shall we permit unreviewed commits to the source tree? (Details - of when it's [in]appropriate to be worked out later.) Vote, please. - [EMAIL PROTECTED] - Status: Ken +1, Randy +1, Ben +1, Martin +1, Dean +1, Brian +1, - Jim +1, Rob +1, Paul 0, Ralf +1 * Paul would like to see a 'gdbm' option because he uses it a lot. Dean notes that 'gdbm' include 'db' support
cvs commit: apachen STATUS
coar98/01/17 01:58:46 Modified:.STATUS Log: Add notification of patch for PR#1667 (mod_autoindex emitting a PRE in the wrong place). Revision ChangesPath 1.93 +5 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- STATUS1998/01/14 21:01:03 1.92 +++ STATUS1998/01/17 09:58:45 1.93 @@ -85,6 +85,11 @@ Available Patches: +* John Van Essen [EMAIL PROTECTED]'s fix for mod_autoindex PRE + misplacement. + [EMAIL PROTECTED] + Status: Ken +1 + * Dean's [PATCH] MONCONTROL for profiling children [EMAIL PROTECTED] Status: Dean +1
cvs commit: apache-devsite guidelines.html
coar98/01/19 17:06:08 Modified:.guidelines.html Log: And a little more refinement.. Revision ChangesPath 1.6 +4 -2 apache-devsite/guidelines.html Index: guidelines.html === RCS file: /export/home/cvs/apache-devsite/guidelines.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- guidelines.html 1998/01/19 23:59:35 1.5 +++ guidelines.html 1998/01/20 01:06:07 1.6 @@ -234,17 +234,19 @@ LIAdvance notice of ideas and features will be given. No advance notice is required to do bug fixes. LIThe CVS tree should compile at all times. It's permitted to break -platforms (i.e. win32) when adding new files to the distribution. +platforms (EMe.g./EM, Win32) if the probability is mentioned in +the commit log. LIThe committer is responsible for the quality of the third-party code they bring into the code. LIRelated changes should be posted at once, or very closely together; -no half-baked projects in the code. +no half-committed projects in the code. LIAny changes: BR UL LIwhich affect semantics of arguments to directives LIwhich significantly add to the runtime size of the program + LIwhich change the semantics of existing API functions /UL need to be discussed on the mailing list before it gets committed.
cvs commit: apachen/src/modules/standard mod_cgi.c
coar98/01/20 07:17:40
Modified:src/modules/standard mod_cgi.c
Log:
Bracket some one-line statements (residue of indenting)
Revision ChangesPath
1.66 +10 -5 apachen/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cgi.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mod_cgi.c 1998/01/07 16:46:46 1.65
+++ mod_cgi.c 1998/01/20 15:17:39 1.66
@@ -483,8 +483,9 @@
char *location, sbuf[MAX_STRING_LEN];
int ret;
- if ((ret = scan_script_header_err_buff(r, script_in, sbuf)))
+ if ((ret = scan_script_header_err_buff(r, script_in, sbuf))) {
return log_script(r, conf, ret, dbuf, sbuf, script_in, script_err);
+ }
location = table_get(r-headers_out, Location);
@@ -492,10 +493,12 @@
/* Soak up all the script output */
hard_timeout(read from script, r);
- while (bgets(argsbuffer, HUGE_STRING_LEN, script_in) 0)
+ while (bgets(argsbuffer, HUGE_STRING_LEN, script_in) 0) {
continue;
- while (bgets(argsbuffer, HUGE_STRING_LEN, script_err) 0)
+ }
+ while (bgets(argsbuffer, HUGE_STRING_LEN, script_err) 0) {
continue;
+ }
kill_timeout(r);
@@ -522,13 +525,15 @@
}
send_http_header(r);
- if (!r-header_only)
+ if (!r-header_only) {
send_fb(script_in, r);
+ }
bclose(script_in);
soft_timeout(soaking script stderr, r);
- while (bgets(argsbuffer, HUGE_STRING_LEN, script_err) 0)
+ while (bgets(argsbuffer, HUGE_STRING_LEN, script_err) 0) {
continue;
+ }
kill_timeout(r);
bclose(script_err);
}
cvs commit: apachen/src/main http_protocol.c
coar98/01/20 07:28:39
Modified:src/main http_protocol.c
Log:
Fix a couple of indents.
Revision ChangesPath
1.177 +3 -3 apachen/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- http_protocol.c 1998/01/20 00:33:12 1.176
+++ http_protocol.c 1998/01/20 15:28:38 1.177
@@ -2045,18 +2045,18 @@
char *h1 = 4 + status_lines[idx];
bvputs(fd, HTMLHEAD\nTITLE, title,
- /TITLE\n/HEADBODY\nH1, h1, /H1\n,
+ /TITLE\n/HEADBODY\nH1, h1, /H1\n,
NULL);
switch (status) {
case REDIRECT:
case MOVED:
bvputs(fd, The document has moved A HREF=\,
- escape_html(r-pool, location), \here/A.P\n, NULL);
+ escape_html(r-pool, location), \here/A.P\n,
NULL);
break;
case HTTP_SEE_OTHER:
bvputs(fd, The answer to your request is located A HREF=\,
- escape_html(r-pool, location), \here/A.P\n, NULL);
+ escape_html(r-pool, location), \here/A.P\n,
NULL);
break;
case HTTP_USE_PROXY:
bvputs(fd, This resource is only accessible through the
proxy\n,
cvs commit: apachen/src/modules/standard mod_autoindex.c
coar98/01/20 10:48:44
Modified:src/modules/standard mod_autoindex.c
Log:
Move the PRE prefix for plaintext header files to before
the header file emission, rather than before the page preamble.
PR: 1667
Submitted by: John Van Essen [EMAIL PROTECTED]
Reviewed by: Dean Gaudet, Ken Coar, Jim Jagielski
Revision ChangesPath
1.62 +1 -1 apachen/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mod_autoindex.c 1998/01/07 16:46:45 1.61
+++ mod_autoindex.c 1998/01/20 18:48:42 1.62
@@ -544,7 +544,6 @@
plaintext = 1;
if (hrule)
rputs(HR\n, r);
- rputs(PRE\n, r);
}
else if (hrule)
rputs(HR\n, r);
@@ -570,6 +569,7 @@
else {
char buf[IOBUFSIZE + 1];
int i, n, c, ch;
+ rputs(PRE\n, r);
while (!feof(f)) {
do
n = fread(buf, sizeof(char), IOBUFSIZE, f);
cvs commit: apachen/src CHANGES
coar98/01/20 10:56:53 Modified:.STATUS src CHANGES Log: Note the fix for PR#1667, and that moving to commit-then-review has received the requisite number of votes and is now in effect. Revision ChangesPath 1.108 +7 -8 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- STATUS1998/01/20 18:28:35 1.107 +++ STATUS1998/01/20 18:56:49 1.108 @@ -11,7 +11,7 @@ Current Modes: -o Review-Then-Commit +o Commit-Then-Review o NO lazy voting Plan: @@ -88,20 +88,19 @@ * Martin's [PATCH] mod_speling [300] Multiple Choices bug (Take 2) * Dean's [PATCH] protect the environment * general/1666: Apache uses a case sensitive match for Basic auth scheme -* mod_rewrite/1684: RewriteLog directive does the equivalent of HostnameLookups on +* mod_rewrite/1684: RewriteLog directive does the equivalent of + HostnameLookups on * protocol/1683: The Connection header may contain multiple close tokens * some of Marc's 1.2.5 security patches (minus proxy fixes) +* John Van Essen [EMAIL PROTECTED]'s fix for mod_autoindex PRE + misplacement. Available Patches: -* Martin's [PATCH] Improve implementation of -c/-C directive reading (take 2) +* Martin's [PATCH] Improve implementation of -c/-C directive reading + (take 2) [EMAIL PROTECTED] Status: Martin +1, Doug +1, Dean +1, Jim +1 - -* John Van Essen [EMAIL PROTECTED]'s fix for mod_autoindex PRE - misplacement. - [EMAIL PROTECTED] - Status: Ken +1, Dean +1, Jim +1 * Dean's [PATCH] MONCONTROL for profiling children [EMAIL PROTECTED] 1.571 +5 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.570 retrieving revision 1.571 diff -u -r1.570 -r1.571 --- CHANGES 1998/01/20 01:50:42 1.570 +++ CHANGES 1998/01/20 18:56:51 1.571 @@ -1,5 +1,10 @@ Changes with Apache 1.3b4 + *) mod_autoindex with a plaintext header file would emit the PRE + start-tag before the HTML preamble, rather than after the preamble + but before the header file contents. [John Van Essen [EMAIL PROTECTED]] + PR#1667 + *) SECURITY: Fix a possible buffer overflow in logresolve. This is only an issue on systems without a MAXDNAME define or where the resolver returns domain names longer than MAXDNAME. [Marc Slemko]
cvs commit: apachen/src/ap ap.h
coar98/01/21 09:12:41
Modified:src Configure
Added: src/ap ap.h
Log:
Add header file for httpd-independent (libap) routines, and
awareness of src/ap as an include directory.
Revision ChangesPath
1.177 +1 -1 apachen/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- Configure 1998/01/13 23:11:04 1.176
+++ Configure 1998/01/21 17:12:34 1.177
@@ -991,7 +991,7 @@
echo CFLAGS1=$CFLAGS Makefile.config
echo INCLUDES1=$INCLUDES Makefile.config
-INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH $OSDIR main
+INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH $OSDIR main ap
incprefix=-I
for depth in 0 1 2; do
incvar=INCLUDES_DEPTH${depth}=
1.1 apachen/src/ap/ap.h
Index: ap.h
===
/*
* Copyright (c) 1995-1998 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. All advertising materials mentioning features or use of this
*software must display the following acknowledgment:
*This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/).
*
* 4. The names Apache Server and Apache Group must not be used to
*endorse or promote products derived from this software without
*prior written permission. For written permission, please contact
*[EMAIL PROTECTED]
*
* 5. Redistributions of any form whatsoever must retain the following
*acknowledgment:
*This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/).
*
* THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Group and was originally based
* on public domain software written at the National Center for
* Supercomputing Applications, University of Illinois, Urbana-Champaign.
* For more information on the Apache Group and the Apache HTTP server
* project, please see http://www.apache.org/.
*
* This code is based on, and used with the permission of, the
* SIO stdio-replacement strx_* functions by Panos Tsirigotis
* [EMAIL PROTECTED] for xinetd.
*/
#ifndef _AP_H
#define _AP_H
API_EXPORT(char *) ap_cpystrn(char *, const char *, size_t);
int ap_slack(int, int);
API_EXPORT(char *) ap_escape_quotes(pool *, const char *);
API_EXPORT(int) ap_snprintf(char *, size_t, const char *, ...);
API_EXPORT(int) ap_vsnprintf(char *, size_t, const char *, va_list ap);
#endif
cvs commit: apachen/src/main alloc.h buff.h conf.h http_conf_globals.h http_config.h http_core.h http_log.h http_main.h http_protocol.h http_request.h http_vhost.h httpd.h md5.h multithread.h rfc1413.h scoreboard.h util_date.h util_md5.h util_script.h
coar98/01/21 10:24:03 Modified:src CHANGES src/ap ap.h src/main alloc.h buff.h conf.h http_conf_globals.h http_config.h http_core.h http_log.h http_main.h http_protocol.h http_request.h http_vhost.h httpd.h md5.h multithread.h rfc1413.h scoreboard.h util_date.h util_md5.h util_script.h Log: Add #ifndef wrappers to src/main/*.h files to insulate them against multiple inclusions. httpd.h now includes ap.h for the ap_*() routines. Reviewed by: Commit-then-review rules Revision ChangesPath 1.572 +8 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.571 retrieving revision 1.572 diff -u -r1.571 -r1.572 --- CHANGES 1998/01/20 18:56:51 1.571 +++ CHANGES 1998/01/21 18:23:42 1.572 @@ -1,5 +1,13 @@ Changes with Apache 1.3b4 + *) The src/main/*.h header files have had #ifndef wrappers added to + insulate them against duplicate calls if they get included through + multiple paths (e.g., in .c files as well as other .h files). + [Ken Coar] + + *) The libap routines now have a header file for their prototypes, + src/ap/ap.h, to ease their use in non-httpd applications. [Ken Coar] + *) mod_autoindex with a plaintext header file would emit the PRE start-tag before the HTML preamble, rather than after the preamble but before the header file contents. [John Van Essen [EMAIL PROTECTED]] 1.2 +3 -3 apachen/src/ap/ap.h Index: ap.h === RCS file: /export/home/cvs/apachen/src/ap/ap.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ap.h 1998/01/21 17:12:40 1.1 +++ ap.h 1998/01/21 18:23:46 1.2 @@ -54,8 +54,8 @@ * [EMAIL PROTECTED] for xinetd. */ -#ifndef _AP_H -#define _AP_H +#ifndef _APACHE_AP_H +#define _APACHE_AP_H API_EXPORT(char *) ap_cpystrn(char *, const char *, size_t); int ap_slack(int, int); @@ -63,4 +63,4 @@ API_EXPORT(int) ap_snprintf(char *, size_t, const char *, ...); API_EXPORT(int) ap_vsnprintf(char *, size_t, const char *, va_list ap); -#endif +#endif /* !_APACHE_AP_H */ 1.39 +5 -0 apachen/src/main/alloc.h Index: alloc.h === RCS file: /export/home/cvs/apachen/src/main/alloc.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- alloc.h 1998/01/07 16:45:59 1.38 +++ alloc.h 1998/01/21 18:23:47 1.39 @@ -52,6 +52,9 @@ * */ +#ifndef _APACHE_ALLOC_H +#define _APACHE_ALLOC_H + /* * Resource allocation routines... * @@ -276,3 +279,5 @@ API_EXPORT(long) bytes_in_pool(pool *p); API_EXPORT(long) bytes_in_free_blocks(void); + +#endif /* !_APACHE_ALLOC_H */ 1.31 +5 -0 apachen/src/main/buff.h Index: buff.h === RCS file: /export/home/cvs/apachen/src/main/buff.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- buff.h1998/01/16 14:22:54 1.30 +++ buff.h1998/01/21 18:23:47 1.31 @@ -51,6 +51,9 @@ * */ +#ifndef _APACHE_BUFF_H +#define _APACHE_BUFF_H + #ifdef B_SFIO #include sfio.h #endif @@ -189,3 +192,5 @@ /* bflush() if a read now would block, but don't actually read anything */ API_EXPORT(void) bhalfduplex(BUFF *fb); + +#endif /* !_APACHE_BUFF_H */ 1.167 +5 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- conf.h1998/01/13 23:11:08 1.166 +++ conf.h1998/01/21 18:23:48 1.167 @@ -51,6 +51,9 @@ * */ +#ifndef _APACHE_CONF_H +#define _APACHE_CONF_H + /* * conf.h: system-dependant #defines and includes... * See README for a listing of what they mean @@ -1047,3 +1050,5 @@ #ifdef NEED_DIFFTIME extern double difftime(time_t time1, time_t time0); #endif + +#endif /* !_APACHE_CONF_H */ 1.23 +5 -0 apachen/src/main/http_conf_globals.h Index: http_conf_globals.h === RCS file: /export/home/cvs/apachen/src/main/http_conf_globals.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- http_conf_globals.h 1998/01/11 20:25:01
cvs commit: apachen STATUS
coar98/01/21 10:25:27 Modified:.STATUS Log: Note a couple of patches applied under c-t-r rules. Revision ChangesPath 1.109 +2 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- STATUS1998/01/20 18:56:49 1.108 +++ STATUS1998/01/21 18:25:24 1.109 @@ -94,6 +94,8 @@ * some of Marc's 1.2.5 security patches (minus proxy fixes) * John Van Essen [EMAIL PROTECTED]'s fix for mod_autoindex PRE misplacement. +* Ken's addition of src/ap/ap.h for prototypes of routines in libap.a +* Ken's addition of #ifndef wrappers to src/main/*.h header files Available Patches:
cvs commit: apachen/src/modules/standard mod_imap.c
coar98/01/21 11:06:13
Modified:.STATUS
src CHANGES
src/modules/standard mod_imap.c
Log:
Another patch (consts in mod_imap.c) noted.
Revision ChangesPath
1.110 +1 -0 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- STATUS1998/01/21 18:25:24 1.109
+++ STATUS1998/01/21 19:06:09 1.110
@@ -96,6 +96,7 @@
misplacement.
* Ken's addition of src/ap/ap.h for prototypes of routines in libap.a
* Ken's addition of #ifndef wrappers to src/main/*.h header files
+* Ken's removal of problem-causing consts from mod_imap.c
Available Patches:
1.573 +4 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- CHANGES 1998/01/21 18:23:42 1.572
+++ CHANGES 1998/01/21 19:06:11 1.573
@@ -1,5 +1,9 @@
Changes with Apache 1.3b4
+ *) Some const declarations in mod_imap.c that were added for debugging
+ purposes caused some compilers heartburn without adding any
+ significant value, so they've been removed. [Ken Coar]
+
*) The src/main/*.h header files have had #ifndef wrappers added to
insulate them against duplicate calls if they get included through
multiple paths (e.g., in .c files as well as other .h files).
1.38 +4 -4 apachen/src/modules/standard/mod_imap.c
Index: mod_imap.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_imap.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_imap.c1998/01/07 22:23:33 1.37
+++ mod_imap.c1998/01/21 19:06:13 1.38
@@ -157,7 +157,7 @@
{NULL}
};
-static int pointinrect(const double point[2], const double
coords[MAXVERTS][2])
+static int pointinrect(const double point[2], double coords[MAXVERTS][2])
{
double max[2], min[2];
if (coords[0][X] coords[1][X]) {
@@ -182,7 +182,7 @@
(point[Y] = min[1] point[Y] = max[1]));
}
-static int pointincircle(const double point[2], const double
coords[MAXVERTS][2])
+static int pointincircle(const double point[2], double coords[MAXVERTS][2])
{
double radius1, radius2;
@@ -195,7 +195,7 @@
return (radius2 = radius1);
}
-static int pointinpoly(const double point[2], const double pgon[MAXVERTS][2])
+static int pointinpoly(const double point[2], double pgon[MAXVERTS][2])
{
int i, numverts, inside_flag, xflag0;
int crossings;
@@ -270,7 +270,7 @@
}
-static int is_closer(const double point[2], const double
coords[MAXVERTS][2], double *closest)
+static int is_closer(const double point[2], double coords[MAXVERTS][2],
double *closest)
{
double dist_squared = ((point[X] - coords[0][X]) * (point[X] -
coords[0][X]))
+ ((point[Y] - coords[0][Y]) * (point[Y] - coords[0][Y]));
cvs commit: apache STATUS
coar98/01/22 08:36:41
Modified:src Tag: APACHE_1_2_X mod_imap.c
.Tag: APACHE_1_2_X STATUS
Log:
Remove extraneous consts which caused some compilers to complain.
PR: 1650 (et al.)
Revision ChangesPath
No revision
No revision
1.21.2.4 +5 -4 apache/src/mod_imap.c
Index: mod_imap.c
===
RCS file: /export/home/cvs/apache/src/mod_imap.c,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -r1.21.2.3 -r1.21.2.4
--- mod_imap.c1998/01/05 20:48:58 1.21.2.3
+++ mod_imap.c1998/01/22 16:36:39 1.21.2.4
@@ -157,7 +157,7 @@
{NULL}
};
-static int pointinrect(const double point[2], const double
coords[MAXVERTS][2])
+static int pointinrect(const double point[2], double coords[MAXVERTS][2])
{
double max[2], min[2];
if (coords[0][X] coords[1][X]) {
@@ -182,7 +182,7 @@
(point[Y] = min[1] point[Y] = max[1]));
}
-static int pointincircle(const double point[2], const double
coords[MAXVERTS][2])
+static int pointincircle(const double point[2], double coords[MAXVERTS][2])
{
double radius1, radius2;
@@ -195,7 +195,7 @@
return (radius2 = radius1);
}
-static int pointinpoly(const double point[2], const double pgon[MAXVERTS][2])
+static int pointinpoly(const double point[2], double pgon[MAXVERTS][2])
{
int i, numverts, inside_flag, xflag0;
int crossings;
@@ -270,7 +270,8 @@
}
-static int is_closer(const double point[2], const double
coords[MAXVERTS][2], double *closest)
+static int is_closer(const double point[2], double coords[MAXVERTS][2],
+ double *closest)
{
double dist_squared = ((point[X] - coords[0][X]) * (point[X] -
coords[0][X]))
+ ((point[Y] - coords[0][Y]) * (point[Y] - coords[0][Y]));
No revision
No revision
1.1.2.22 +1 -0 apache/Attic/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache/Attic/STATUS,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- STATUS1998/01/20 01:06:16 1.1.2.21
+++ STATUS1998/01/22 16:36:40 1.1.2.22
@@ -19,6 +19,7 @@
* PR#1366: send_fd_length did not calculate total_bytes_sent properly
* PR#1604: table_{set,unset} didn't deal correctly with multiple keys
* PR#1599: Digest auth token should be tested case-insensitive
+* PR#1650 (et alia): const in mod_imap causing pointer mismatches
Available:
cvs commit: apachen/src/modules/standard mod_imap.c
coar98/01/22 15:18:08
Modified:src/modules/standard mod_imap.c
Log:
Clean up (marginally) some longer-than-80-character lines, and
do some other indenting.
Revision ChangesPath
1.39 +186 -106 apachen/src/modules/standard/mod_imap.c
Index: mod_imap.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_imap.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_imap.c1998/01/21 19:06:13 1.38
+++ mod_imap.c1998/01/22 23:18:07 1.39
@@ -136,7 +136,8 @@
imap_conf_rec *add = (imap_conf_rec *) addv;
new-imap_menu = add-imap_menu ? add-imap_menu : base-imap_menu;
-new-imap_default = add-imap_default ? add-imap_default :
base-imap_default;
+new-imap_default = add-imap_default ? add-imap_default
+ : base-imap_default;
new-imap_base = add-imap_base ? add-imap_base : base-imap_base;
return new;
@@ -215,9 +216,11 @@
p = (double *) pgon + 1;
if ((y = ty) != (*p = ty)) {
-if ((xflag0 = (pgon[numverts - 1][X] = tx)) == (*(double *) pgon =
tx)) {
-if (xflag0)
+ xflag0 = (pgon[numverts - 1][X] = tx);
+if (xflag0 == (*(double *) pgon = tx)) {
+if (xflag0) {
crossings++;
+ }
}
else {
crossings += (pgon[numverts - 1][X] - (y - ty) *
@@ -232,15 +235,18 @@
if (y = ty) {
-while ((p stop) (*p = ty))
+while ((p stop) (*p = ty)) {
p += 2;
+ }
-if (p = stop)
+if (p = stop) {
break;
-if ((xflag0 = (*(p - 3) = tx)) == (*(p - 1) = tx)) {
+}
+ if ((xflag0 = (*(p - 3) = tx)) == (*(p - 1) = tx)) {
-if (xflag0)
+if (xflag0) {
crossings++;
+ }
}
else {
crossings += (*(p - 3) - (*(p - 2) - ty) *
@@ -248,15 +254,18 @@
}
}
else {
-while ((p stop) (*p ty))
+while ((p stop) (*p ty)) {
p += 2;
+ }
-if (p = stop)
+if (p = stop) {
break;
+ }
if ((xflag0 = (*(p - 3) = tx)) == (*(p - 1) = tx)) {
-if (xflag0)
+if (xflag0) {
crossings++;
+ }
}
else {
crossings += (*(p - 3) - (*(p - 2) - ty) *
@@ -270,21 +279,25 @@
}
-static int is_closer(const double point[2], double coords[MAXVERTS][2],
double *closest)
+static int is_closer(const double point[2], double coords[MAXVERTS][2],
+ double *closest)
{
-double dist_squared = ((point[X] - coords[0][X]) * (point[X] -
coords[0][X]))
-+ ((point[Y] - coords[0][Y]) * (point[Y] - coords[0][Y]));
+double dist_squared = ((point[X] - coords[0][X])
+ * (point[X] - coords[0][X]))
+ + ((point[Y] - coords[0][Y])
+ * (point[Y] - coords[0][Y]));
-if (point[X] 0 || point[Y] 0)
-return (0); /* don't mess around with negative
coordinates */
+if (point[X] 0 || point[Y] 0) {
+return (0); /* don't mess around with negative coordinates
*/
+}
if (*closest 0 || dist_squared *closest) {
*closest = dist_squared;
-return (1); /* if this is the first point or is the
closest yet
- set 'closest' equal to this distance^2 */
+return (1); /* if this is the first point or is the closest
yet
+set 'closest' equal to this distance^2 */
}
-return (0); /* if it's not the first or closest */
+return (0); /* if it's not the first or closest */
}
@@ -293,18 +306,23 @@
char *endptr; /* we want it non-null */
double x_coord = -1;/* -1 is returned if no coordinate is given
*/
-if (args == NULL)
+if (args == NULL) {
return (-1);/* in case we aren't passed anything */
+}
-while (*args !isdigit(*args) *args != ',')
-args++; /* jump to the first digit, but not past a
comma or end */
+while (*args !isdigit(*args) *args != ',') {
+args++; /* jump to the first digit, but not past
+ a comma or end */
+}
x_coord = strtod(args, endptr
cvs commit: apachen/htdocs/manual/mod index.html mod_auth.html mod_auth_anon.html mod_auth_msql.html
coar98/01/23 08:13:58 Modified:htdocs/manual/misc FAQ.html htdocs/manual/mod index.html mod_auth.html mod_auth_anon.html Removed: htdocs/manual/mod mod_auth_msql.html Log: mod_auth_msql isn't part of the distribution any more, so take out all references to it that assume it is. Plus some miscellaneous HTML cleanup. Revision ChangesPath 1.100 +7 -6 apachen/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apachen/htdocs/manual/misc/FAQ.html,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- FAQ.html 1998/01/23 00:36:30 1.99 +++ FAQ.html 1998/01/23 16:13:50 1.100 @@ -15,7 +15,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.99 $ ($Date: 1998/01/23 00:36:30 $) + $Revision: 1.100 $ ($Date: 1998/01/23 16:13:50 $) /P P The latest version of this FAQ is always available from the main @@ -1803,11 +1803,12 @@ A HREF=http://www.linuxhq.com/HOWTO/META-FAQ.html; Linux newsgroup/mailing list/A. As a last-resort workaround, you can - comment out the CODE#define USE_SHMGET_SCOREBOARD/CODE definition in the + comment out the CODE#definenbsp;USE_SHMGET_SCOREBOARD/CODE + definition in the SAMPLINUX/SAMP section of SAMPsrc/conf.h/SAMP and rebuild the server (prior to 1.3b4, simply - removing CODE#define HAVE_SHMGET/CODE would have sufficed). This will - produce a server which is slower and less reliable. + removing CODE#definenbsp;HAVE_SHMGET/CODE would have sufficed). + This will produce a server which is slower and less reliable. /P HR /LI @@ -1892,8 +1893,8 @@ /A P You have probably configured the Host by specifying a FQHN, - and thus the libmsql will use a full blown tcp/ip socket to talk to - the database, rather than a fast internal device. The + and thus the SAMPlibmsql/SAMP will use a full blown TCP/IP socket + to talk to the database, rather than a fast internal device. The SAMPlibmsql/SAMP, the mSQL FAQ, and the SAMPmod_auth_msql/SAMP documentation warn you about this. If you have to use different hosts, check out the SAMPmod_auth_msql/SAMP code for 1.22 +0 -2 apachen/htdocs/manual/mod/index.html Index: index.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/index.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- index.html1997/10/24 09:34:21 1.21 +++ index.html1998/01/23 16:13:56 1.22 @@ -42,8 +42,6 @@ ddUser authentication using Berkeley DB files. dtA HREF=mod_auth_dbm.htmlmod_auth_dbm/A ddUser authentication using DBM files. -dtA HREF=mod_auth_msql.htmlmod_auth_msql/A Apache 1.2.* and earlier -ddUser authentication using mSQL files. dtA HREF=mod_autoindex.htmlmod_autoindex/A ddAutomatic directory listings. dtA HREF=mod_browser.htmlmod_browser/A Apache 1.2.* only 1.10 +2 -2 apachen/htdocs/manual/mod/mod_auth.html Index: mod_auth.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_auth.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mod_auth.html 1997/12/16 20:57:38 1.9 +++ mod_auth.html 1998/01/23 16:13:56 1.10 @@ -115,8 +115,8 @@ A common use for this is in conjunction with one of the database modules; such as a href=mod_auth_db.htmlcodemod_auth_db.c/code/a, a -href=mod_auth_dbm.htmlcodemod_auth_dbm.c/code/a, a -href=mod_auth_msql.htmlcodemod_auth_msql.c/code/a and a +href=mod_auth_dbm.htmlcodemod_auth_dbm.c/code/a, +codemod_auth_msql.c/code, and a href=mod_auth_anon.htmlcodemod_auth_anon.c/code/a. These modules supply the bulk of the user credential checking; but a few (administrator) related accesses fall through to a lower level with a 1.15 +1 -1 apachen/htdocs/manual/mod/mod_auth_anon.html Index: mod_auth_anon.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_auth_anon.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_auth_anon.html1997/09/16 04:06:03 1.14 +++ mod_auth_anon.html1998/01/23 16:13:57 1.15 @@ -156,7 +156,7 @@ h2a name=ExampleExample/A/h2 The example below (when combined with the Auth directives -of a htpasswd-file based (or GDM, mSQL etc) base access +of a htpasswd-file based (or GDM, mSQL EMetc./EM) base access control system allows users
cvs commit: apachen STATUS
coar98/01/24 05:48:32 Modified:.STATUS Log: Note commit-then-review guidelines and also the repository renaming issue. Revision ChangesPath 1.118 +7 -3 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- STATUS1998/01/24 04:14:13 1.117 +++ STATUS1998/01/24 13:48:31 1.118 @@ -173,11 +173,15 @@ changes to be committed without prior review. Specific guidelines and implementation date to be worked out. +* Guidelines for commit-then-review are documented at + http://dev.apache.org/guidelines.html#ctr + Open issues: -* Guidelines for when prior review is required if commit-then-review - is the normal mode of operation. Roy has started covering the - whole process in http://dev.apache.org/guidelines.html. +* Renaming the apache CVS module to apache-1.2 and the + apachen module to apache-1.3 - and, at some point, + copying (*not* branching) the apache-1.3 module to a new + apache-2.x tree and opening up 2.0 development. * Ken's [POLL] apachen/patches directory Shall we experiment with allowing patches to be distributed for
cvs commit: apache STATUS
coar98/01/24 06:52:46 Modified:.Tag: APACHE_1_2_X STATUS Log: Note commit model in use. Revision ChangesPath No revision No revision 1.1.2.23 +5 -0 apache/Attic/STATUS Index: STATUS === RCS file: /export/home/cvs/apache/Attic/STATUS,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -u -r1.1.2.22 -r1.1.2.23 --- STATUS1998/01/22 16:36:40 1.1.2.22 +++ STATUS1998/01/24 14:52:45 1.1.2.23 @@ -2,6 +2,11 @@ or DoS bugs. Changes that have been tested in 1.3 already may be given consideration. Easy portability fixes may be given consideration. +Current Modes: + +o Commit-Then-Review (see http://dev.apache.org/guidelines.html#ctr +o NO lazy voting + Committed since 1.2.5: * Martins portability change for ReliantUNIX/SINIX (_XPG_IV switch)
cvs commit: apache STATUS
coar98/01/24 06:59:57 Modified:.Tag: APACHE_1_2_X STATUS Log: Note the RM for 1.2.* (and test moving the master STATUS,v file out of the Attic). Revision ChangesPath No revision No revision 1.1.2.24 +2 -0 apache/STATUS Index: STATUS === RCS file: /export/home/cvs/apache/STATUS,v retrieving revision 1.1.2.23 retrieving revision 1.1.2.24 diff -u -r1.1.2.23 -r1.1.2.24 --- STATUS1998/01/24 14:52:45 1.1.2.23 +++ STATUS1998/01/24 14:59:57 1.1.2.24 @@ -2,6 +2,8 @@ or DoS bugs. Changes that have been tested in 1.3 already may be given consideration. Easy portability fixes may be given consideration. +Dean is pretty much accepted as the release manager for this branch. + Current Modes: o Commit-Then-Review (see http://dev.apache.org/guidelines.html#ctr
cvs commit: apachen STATUS
coar98/01/24 08:13:54 Modified:.STATUS Log: Add a note about another work-in-process. Revision ChangesPath 1.121 +3 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- STATUS1998/01/24 15:29:54 1.120 +++ STATUS1998/01/24 16:13:53 1.121 @@ -166,6 +166,9 @@ Status: Dean +1, Jim +1, Martin +1, Paul +1 Needs to be redone so that it better supports non-ascii hosts. +* Ken's IndexFormat enhancement to mod_autoindex to allow + CustomLog-like tailoring of directory listing formats + Needs patch: * Dean's locale project
cvs commit: apachen STATUS
coar98/01/24 11:30:09 Modified:.STATUS Log: Reword the prefix discussion a little, and add my US$0.02. Revision ChangesPath 1.125 +13 -10apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- STATUS1998/01/24 19:01:59 1.124 +++ STATUS1998/01/24 19:30:09 1.125 @@ -199,15 +199,19 @@ * Provide consistant prefixes; suggestions: - ap_: (eg: ap_cpystrn) -Apache provided general functions - appublic_: - appub_: -Public API functions - apprivate_: (eg: apprivate_new_connection) - appri_: -Private functions which we can't make static -but should be. + Apache provided general functions (e.g., ap_cpystrn) + ap_xxx: Ken +1 + + Public API functions (e.g., palloc) + apapi_xxx: Ken +1 + appublic_xxx: + appub_xxx: + + Private functions which we can't make static + but should be (e.g., new_connection) + apprivate_xxx: + appri_xxx: + httpd_xxx: Ken +1 * Maybe moving *all* of the *.h header files into a new src/include directory? @@ -253,7 +257,6 @@ appropriate environment. Marc and Alexei don't see any big deal. -* Ken suggests that new check_cmd_context() and related defines should be non-static and in util_* so modules can use 'em. (He didn't notice this flaw during the review.)
cvs commit: apachen/src CHANGES
coar98/01/24 11:39:48 Modified:src CHANGES Log: Don't go into controversial detail about the new_connection() renaming; the final new name is yet TBD, but the old name is definitely dead. Revision ChangesPath 1.597 +2 -4 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.596 retrieving revision 1.597 diff -u -r1.596 -r1.597 --- CHANGES 1998/01/24 19:02:01 1.596 +++ CHANGES 1998/01/24 19:39:46 1.597 @@ -9,10 +9,8 @@ structures. Specifically, module authors should be using table_elts() to get access to an array_header * for the table. [Dean Gaudet] - *) Rename new_connection() to ap__new_connection() to avoid namespace - collision with LDAP library routines. The ap__ prefix means - it's a private non-API interface, as opposed to ap_. - [Ken Coar, Rasmus Lerdorf] + *) Renamed new_connection() to avoid namespace collision with LDAP + library routines. [Ken Coar, Rasmus Lerdorf] *) WIN32: mod_speling is now available on the Win32 platform. [Marc Slemko]
cvs commit: apachen/src/ap Makefile.tmpl ap.h ap_execve.c
coar98/01/25 08:13:13
Modified:src/ap Makefile.tmpl ap.h ap_execve.c
Log:
Fix some indenting issues in ap_execve.c, and fill in the
blanks in ap.h and Makefile.tmpl.
Revision ChangesPath
1.8 +1 -1 apachen/src/ap/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apachen/src/ap/Makefile.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.tmpl 1998/01/25 01:40:55 1.7
+++ Makefile.tmpl 1998/01/25 16:13:11 1.8
@@ -29,4 +29,4 @@
ap_snprintf.o: $(INCDIR)/conf.h
ap_strings.o: $(INCDIR)/httpd.h
ap_cpystrn.o: $(INCDIR)/httpd.h
-ap_execve.o: $(INCDIR)/httpd.h
+ap_execve.o: $(INCDIR)/httpd.h $(INCDIR)/http_log.h
1.4 +3 -2 apachen/src/ap/ap.h
Index: ap.h
===
RCS file: /export/home/cvs/apachen/src/ap/ap.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ap.h 1998/01/21 19:17:34 1.3
+++ ap.h 1998/01/25 16:13:11 1.4
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995-1998 The Apache Group. All rights reserved.
+ * Copyright (c) 1998 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -62,5 +62,6 @@
API_EXPORT(char *) ap_escape_quotes(pool *, const char *);
API_EXPORT(int) ap_snprintf(char *, size_t, const char *, ...);
API_EXPORT(int) ap_vsnprintf(char *, size_t, const char *, va_list ap);
-
+int ap_execle(const char *, const char *, ...);
+int ap_execve(const char *, const char *argv[], const char *envp[]);
#endif /* !APACHE_AP_H */
1.3 +38 -20apachen/src/ap/ap_execve.c
Index: ap_execve.c
===
RCS file: /export/home/cvs/apachen/src/ap/ap_execve.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_execve.c 1998/01/25 02:04:30 1.2
+++ ap_execve.c 1998/01/25 16:13:12 1.3
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995-1998 The Apache Group. All rights reserved.
+ * Copyright (c) 1998 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -74,7 +74,7 @@
* local argv[] array. The va_arg logic makes sure we do the right thing.
* XXX: malloc() is used because we expect to be overlaid soon.
*/
-int ap_execle(const char *filename, const char *arg,...)
+int ap_execle(const char *filename, const char *arg, ...)
{
va_list adummy;
char **envp;
@@ -83,16 +83,18 @@
/* First pass: Count arguments on stack */
va_start(adummy, arg);
-for (argc = 0; va_arg(adummy, char *) != NULL; ++argc)
+for (argc = 0; va_arg(adummy, char *) != NULL; ++argc) {
continue;
+}
va_end(adummy);
argv = (char **) malloc((argc + 2) * sizeof(*argv));
/* Pass two --- copy the argument strings into the result space */
va_start(adummy, arg);
-for (argc = 0; (argv[argc] = va_arg(adummy, char *)) != NULL; ++argc)
+for (argc = 0; (argv[argc] = va_arg(adummy, char *)) != NULL; ++argc) {
continue;
+}
envp = va_arg(adummy, char **);
va_end(adummy);
@@ -103,13 +105,14 @@
}
int ap_execve(const char *filename, const char *argv[],
- const char *envp[])
+ const char *envp[])
{
const char *argv0 = argv[0];
extern char **environ;
-if (envp == NULL)
+if (envp == NULL) {
envp = (const char **) environ;
+}
/* Try to execute the file directly first: */
execve(filename, argv, envp);
@@ -120,7 +123,8 @@
* EACCES Execute permission is denied for the file.
* EACCES Search permission is denied on a component of the path
prefix.
* EPERM The file system is mounted noexec.
- * EPERM The file system is mounted nosuid and the file has an SUID or
SGID bit set.
+ * EPERM The file system is mounted nosuid and the file has an SUID
+ *or SGID bit set.
* E2BIG The argument list is too big.
* ENOEXEC The magic number in the file is incorrect.
* EFAULT filename points outside your accessible address space.
@@ -141,14 +145,16 @@
(argv = hashbang(filename, argv)) != NULL) {
aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, NULL,
-Script %s needs
cvs commit: apachen/htdocs/manual/vhosts details.html details_1_2.html examples.html fd-limits.html host.html index.html ip-based.html name-based.html vhosts-in-depth.html virtual-host.html
coar98/01/26 08:54:38 Modified:htdocs/manual bind.html cgi_path.html content-negotiation.html custom-error.html dns-caveats.html env.html handler.html index.html install.html invoking.html keepalive.html location.html man-template.html multilogs.html new_features_1_0.html new_features_1_1.html new_features_1_2.html new_features_1_3.html process-model.html sections.html sourcereorg.html stopping.html suexec.html unixware.html upgrading_to_1_3.html windows.html htdocs/manual/misc API.html FAQ.html client_block_api.html compat_notes.html descriptors.html fin_wait_2.html howto.html index.html known_bugs.html known_client_problems.html nopgp.html perf-bsd44.html perf-dec.html perf-hp.html perf-tuning.html perf.html security_tips.html htdocs/manual/mod core.html directives.html index.html mod_access.html mod_actions.html mod_alias.html mod_asis.html mod_auth.html mod_auth_anon.html mod_auth_db.html mod_auth_dbm.html mod_autoindex.html mod_browser.html mod_cern_meta.html mod_cgi.html mod_cookies.html mod_digest.html mod_dir.html mod_dld.html mod_dll.html mod_env.html mod_example.html mod_expires.html mod_headers.html mod_imap.html mod_include.html mod_info.html mod_isapi.html mod_log_agent.html mod_log_common.html mod_log_config.html mod_log_referer.html mod_mime.html mod_mime_magic.html mod_negotiation.html mod_proxy.html mod_rewrite.html mod_speling.html mod_status.html mod_unique_id.html mod_userdir.html mod_usertrack.html htdocs/manual/vhosts details.html details_1_2.html examples.html fd-limits.html host.html index.html ip-based.html name-based.html vhosts-in-depth.html virtual-host.html Log: A truly mighty mod normalising HTML tags to uppercase, and 'i' and 'b' to 'EM' and 'STRONG' respectively. Been threatening to do this for months.. no-one need try to maintain this when writing/modifiying the docs. Revision ChangesPath 1.10 +36 -36apachen/htdocs/manual/bind.html Index: bind.html === RCS file: /export/home/cvs/apachen/htdocs/manual/bind.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bind.html 1997/11/11 23:46:47 1.9 +++ bind.html 1998/01/26 16:53:27 1.10 @@ -1,7 +1,7 @@ !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN -htmlhead -titleSetting which addresses and ports Apache uses/title -/head +HTMLHEAD +TITLESetting which addresses and ports Apache uses/TITLE +/HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY @@ -12,71 +12,71 @@ ALINK=#FF !--#include virtual=header.html -- -h1 ALIGN=CENTERSetting which addresses and ports Apache uses/h1 +h1 ALIGN=CENTERSetting which addresses and ports Apache uses/H1 -hr +HR When Apache starts, it connects to some port and address on the local machine and waits for incoming requests. By default, it listens to all addresses on the machine, and to the port -as specified by the ttPort/tt directive in the server configuration. +as specified by the TTPort/TT directive in the server configuration. However, it can be told to listen to more the one port, or to listen to only selected addresses, or a combination. This is often combined with the Virtual Host feature which determines how Apache -responds to different IP addresses, hostnames and ports.p +responds to different IP addresses, hostnames and ports.P There are two directives used to restrict or specify which addresses and ports Apache listens to. -ul -lia href=#bindaddressBindAddress/a is used to restrict the server to listening to +UL +LIA HREF=#bindaddressBindAddress/A is used to restrict the server to listening to a single address, and can be used to permit multiple Apache servers on the same machine listening to different IP addresses. -lia href=#listenListen/a can be used to make a single Apache server listen +LIA HREF=#listenListen/A can be used to make a single Apache server listen to more than one address and/or port. -/ul +/UL
cvs commit: apache-2.0/src/main httpd.h
coar98/01/27 17:39:59 Modified:src/main httpd.h Log: As Rob pointed out, update the server version to reflect what's being built in this tree. Revision ChangesPath 1.178 +1 -1 apache-2.0/src/main/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-2.0/src/main/httpd.h,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- httpd.h 1998/01/26 18:24:34 1.177 +++ httpd.h 1998/01/28 01:39:58 1.178 @@ -352,7 +352,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.3b4-dev/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/2.0a1-dev/* SEE COMMENTS ABOVE */ #ifdef SERVER_SUBVERSION #define SERVER_VERSION SERVER_BASEVERSION SERVER_SUBVERSION #else
cvs commit: apache-1.3 STATUS
coar98/01/27 17:44:48 Modified:.STATUS Log: Note the change of the CVS module names for 1.2 and 1.3. Revision ChangesPath 1.135 +6 -6 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- STATUS1998/01/27 10:28:29 1.134 +++ STATUS1998/01/28 01:44:48 1.135 @@ -200,6 +200,12 @@ * Guidelines for commit-then-review are documented at http://dev.apache.org/guidelines.html#ctr +* The apache CVS module has been renamed to apache-1.2 and the + apachen module to apache-1.3. apache-1.3 has been copied + to apache-2.0, but whether that's appropriate or not is + under discussion. A couple of people want that module to + start empty rather than full of 1.3's stuff. + Open issues: * Provide consistant prefixes; suggestions: @@ -221,12 +227,6 @@ * Maybe moving *all* of the *.h header files into a new src/include directory? Status: Ken +1, Dean +1 - -* Renaming the apache CVS module to apache-1.2 and the - apachen module to apache-1.3 - and, at some point, - copying (*not* branching) the apache-1.3 module to a new - apache-2.x tree and opening up 2.0 development. - Status: Ken +1, Jim +1 (let do it NOW :) ) * Ken's [POLL] apachen/patches directory Shall we experiment with allowing patches to be distributed for
cvs commit: apache-site ABOUT_APACHE.html
coar98/01/29 04:30:11 Modified:.ABOUT_APACHE.html Log: Partial update to bring the HTML version into sync with the plaintext version. More to come.. Revision ChangesPath 1.11 +42 -18apache-site/ABOUT_APACHE.html Index: ABOUT_APACHE.html === RCS file: /export/home/cvs/apache-site/ABOUT_APACHE.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ABOUT_APACHE.html 1997/12/15 16:53:14 1.10 +++ ABOUT_APACHE.html 1998/01/29 12:30:10 1.11 @@ -136,7 +136,7 @@ /P HR SIZE=4 H2 - Current Apache Group in alphabetical order as of 1 November 1997: + Current Apache Group in alphabetical order as of 1 January 1998: /H2 DL DD @@ -154,7 +154,8 @@ /TD /TR TR - TDMark J. Coxnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + TDMark J. + Coxnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD TDC2Net Europe, UK /TD @@ -172,13 +173,15 @@ /TD /TR TR - TDDean Gaudetnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + TDDean + Gaudetnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD TDTransmeta Corporation, California /TD /TR TR - TDRob Hartillnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + TDRob + Hartillnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD TDInternet Movie DB, UK /TD @@ -202,7 +205,8 @@ /TD /TR TR - TDBen Laurienbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + TDBen + Laurienbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD TDFreelance Consultant, UK /TD @@ -232,13 +236,15 @@ /TD /TR TR - TDPaul Suttonnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + TDPaul + Suttonnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD TDC2Net Europe, UK /TD /TR TR - TDMarc Slemkonbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + TDMarc + Slemkonbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD TDCanada /TD @@ -271,15 +277,15 @@ DD TABLE TR - TDRobert S. Thaunbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + TDDavid Robinsonnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD - TDMIT, Massachusetts + TDCambridge University, UK /TD /TR TR - TDDavid Robinsonnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; + TDRobert S. Thaunbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD - TDCambridge University, UK + TDMIT, Massachusetts /TD /TR /TABLE @@ -335,13 +341,17 @@ If you just want to send in an occasional suggestion/fix, then you can just use the bug reporting form at lt;A - HREF=http://www.apache.org/bugdb.cgi; - SAMPhttp://www.apache.org/bugdb.cgi/SAMP/Agt;. + HREF=http://www.apache.org/bug_report.html; + SAMPhttp://www.apache.org/bug_report.html/SAMP/Agt;. You can also subscribe to the announcements mailing list (SAMP[EMAIL PROTECTED]/SAMP) which we use to broadcast information about new releases, bugfixes, and upcoming - events. + events. There's a lot of information about the development process (much + of it in serious need of updating) to be found at + lt;A + HREF=http://dev.apache.org/; + SAMPhttp://dev.apache.org//SAMP/Agt;. /P BLOCKQUOTE STRONGNOTE:/STRONG @@ -359,9 +369,19 @@ The Apache Development Process /H2 P + There is a core group of contributors (informally called the quot;corequot;) + which was formed from the project founders and is augmented from time + to time when core members nominate outstanding contributors and the + rest of the core members agree. The core group focus is more on + quot;businessquot; issues and limited-circulation things like + security problems + than on mainstream code development. The term quot;The Apache Groupquot; + technically refers to this core of project contributors. + /P + P The Apache Group is a meritocracy -- the more work you have done, the more you are allowed to do. The group founders set the original rules, but - they can be changed by vote of the active members. There is a core group + they can be changed by vote of the active members. There is a group of people who have logins on our server and access to the CVS repository. Everyone has access to the CVS snapshots. Changes to the code are proposed on the mailing list and usually voted on by active @@ -376,9 +396,13 @@ tone. We
cvs commit: apache-site/contributors index.html
coar98/01/29 11:54:49 Modified:contributors index.html Log: Insert a missing BR. Revision ChangesPath 1.27 +1 -1 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- index.html1998/01/27 07:42:36 1.26 +++ index.html1998/01/29 19:54:48 1.27 @@ -177,7 +177,7 @@ BName:/B A NAME=coxMark Cox/ABR Bemail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR BURL:/B A HREF=http://www.awe.com/~mark/;http://www.awe.com/~mark//ABR -BOrganization:/B C2Net Europe, Ltd. +BOrganization:/B C2Net Europe, Ltd.BR BOccupation:/B Managing DirectorBR BLocation:/B Leeds, EnglandBR BContributions:/B Various patches, bug fixes, and DBM code alterations bringing
cvs commit: apache-1.2/src CHANGES
coar98/01/30 06:45:46
Modified:support suexec.c
src CHANGES
Log:
Remove pointless references to an as-yet undefined 'cwd' cell.
PR: 1738
Reviewed by: Dean Gaudet
Revision ChangesPath
1.24 +2 -2 apache-1.2/support/suexec.c
Index: suexec.c
===
RCS file: /export/home/cvs/apache-1.2/support/suexec.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- suexec.c 1998/01/30 09:14:31 1.23
+++ suexec.c 1998/01/30 14:45:44 1.24
@@ -357,7 +357,7 @@
* and setgid() to the target group. If unsuccessful, error out.
*/
if (((setgid(gid)) != 0) || (initgroups(actual_uname,gid) != 0)) {
-log_err(failed to setgid (%ld: %s/%s)\n, gid, cwd, cmd);
+log_err(failed to setgid (%ld: %s)\n, gid, cmd);
exit(109);
}
@@ -365,7 +365,7 @@
* setuid() to the target user. Error out on fail.
*/
if ((setuid(uid)) != 0) {
- log_err(failed to setuid (%ld: %s/%s)\n, uid, cwd, cmd);
+ log_err(failed to setuid (%ld: %s)\n, uid, cmd);
exit(110);
}
1.288 +3 -0 apache-1.2/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- CHANGES 1998/01/30 09:13:43 1.287
+++ CHANGES 1998/01/30 14:45:45 1.288
@@ -1,5 +1,8 @@
Changes with Apache 1.2.6
+ *) Variable 'cwd' was being used pointlessly before being set.
+ [Ken Coar] PR#1738
+
*) SIGURG doesn't exist on all platforms.
[Mark Andrew Heinrich [EMAIL PROTECTED]]
cvs commit: apache-1.3 STATUS
coar98/01/30 06:51:50 Modified:.STATUS Log: Another suexec issue fixed.. Revision ChangesPath 1.137 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- STATUS1998/01/29 20:38:18 1.136 +++ STATUS1998/01/30 14:51:49 1.137 @@ -141,6 +141,7 @@ * SIGURG isn't everywhere like elvis * some rfc2068 case insensitivity issues * r-allowed cleanup +* References to undefined 'cwd' cell fixed in suexec.c Available Patches:
cvs commit: apache-1.2 STATUS
coar98/01/30 06:52:49 Modified:.STATUS Log: Another suexec issue fixed.. Revision ChangesPath 1.3 +1 -0 apache-1.2/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.2/STATUS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- STATUS1998/01/30 09:12:44 1.2 +++ STATUS1998/01/30 14:52:48 1.3 @@ -28,6 +28,7 @@ * PR#1599: Digest auth token should be tested case-insensitive * PR#1650 (et alia): const in mod_imap causing pointer mismatches * PR#1399: eat data after failed POST +* References to undefined 'cwd' cell fixed in suexec.c Available:
cvs commit: apache-1.3/src/ap Makefile.tmpl
coar98/02/01 07:56:21
Modified:src Configure Makefile.tmpl
src/os/bs2000 Makefile.tmpl
src/os/emx Makefile.tmpl
src/os/unix Makefile.tmpl
src/main Makefile.tmpl
src/ap Makefile.tmpl
Log:
Phase 2 of moving the .h files into src/include.. modify the scripts
and Makefiles that reference them.
Revision ChangesPath
1.179 +4 -3 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- Configure 1998/01/21 23:59:54 1.178
+++ Configure 1998/02/01 15:56:14 1.179
@@ -873,7 +873,7 @@
if [ $RULE_WANTHSREGEX = yes ]; then
REGLIB=regex/libregex.a
SUBDIRS=$SUBDIRS regex
-INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH regex
+#INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH regex
fi
# create modules.c
@@ -991,7 +991,8 @@
echo CFLAGS1=$CFLAGS Makefile.config
echo INCLUDES1=$INCLUDES Makefile.config
-INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH $OSDIR main ap
+#INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH $OSDIR main ap
+INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH $OSDIR include
incprefix=-I
for depth in 0 1 2; do
incvar=INCLUDES_DEPTH${depth}=
@@ -1071,7 +1072,7 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-INCDIR=../../main
+INCDIR=../../include
EOF
if [ -f $moddir/Makefile.libdir ]; then
# it's responsible for the rest of its Makefile
1.74 +2 -2 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- Makefile.tmpl 1997/11/30 19:17:23 1.73
+++ Makefile.tmpl 1998/02/01 15:56:14 1.74
@@ -69,5 +69,5 @@
$(OBJS): Makefile
# DO NOT REMOVE
-modules.o: modules.c main/httpd.h main/conf.h main/alloc.h main/buff.h \
- main/http_config.h
+modules.o: modules.c include/httpd.h include/conf.h include/alloc.h \
+ include/buff.h include/http_config.h
1.2 +1 -1 apache-1.3/src/os/bs2000/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.tmpl 1998/01/13 23:11:30 1.1
+++ Makefile.tmpl 1998/02/01 15:56:16 1.2
@@ -2,7 +2,7 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
-INCDIR=../../main
+INCDIR=../../include
OBJS= os.o os-inline.o ebcdic.o
1.2 +1 -1 apache-1.3/src/os/emx/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/src/os/emx/Makefile.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.tmpl 1997/11/05 12:48:22 1.1
+++ Makefile.tmpl 1998/02/01 15:56:17 1.2
@@ -2,7 +2,7 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
-INCDIR=../../main
+INCDIR=../../include
OBJS=os.o os-inline.o
COPY=os.h os-inline.c
1.10 +1 -1 apache-1.3/src/os/unix/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/src/os/unix/Makefile.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.tmpl 1997/10/07 19:53:32 1.9
+++ Makefile.tmpl 1998/02/01 15:56:18 1.10
@@ -2,7 +2,7 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
-INCDIR=../../main
+INCDIR=../../include
OBJS=os.o os-inline.o
1.8 +163 -106 apache-1.3/src/main/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.tmpl 1997/12/24 04:36:13 1.7
+++ Makefile.tmpl 1998/02/01 15:56:20 1.8
@@ -7,9 +7,10 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
+INCDIR=../include
OBJS= alloc.o http_main.o
cvs commit: apache-1.3/src/regex Makefile.tmpl
coar98/02/01 08:33:13 Modified:src CHANGES Configure src/regex Makefile.tmpl Log: Final phase of the move of .h files to src/include. Revision ChangesPath 1.610 +10 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.609 retrieving revision 1.610 diff -u -r1.609 -r1.610 --- CHANGES 1998/02/01 04:54:45 1.609 +++ CHANGES 1998/02/01 16:33:08 1.610 @@ -1,5 +1,15 @@ Changes with Apache 1.3b4 + *) Yet another rearrangement of the source tree.. now all the common + header files are in the src/include directory. The -Imain -Iap + references in Makefiles have been changed to the simpler -Iinclude + instead. In addition to simplifying the build a little bit, this + also makes it clear when a module is referencing something in a + other than kosher manner (e.g., the proxy including mod_mime.h). + Module-private header files (the proxy, mod_mime, the regex library, + and mod_rewrite) have not been moved to src/include; nor have + the OS-abstraction files. + *) Fix a bug where r-hostname didn't have the :port stripped from it. [Dean Gaudet] 1.180 +0 -2 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- Configure 1998/02/01 15:56:14 1.179 +++ Configure 1998/02/01 16:33:10 1.180 @@ -873,7 +873,6 @@ if [ $RULE_WANTHSREGEX = yes ]; then REGLIB=regex/libregex.a SUBDIRS=$SUBDIRS regex -#INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH regex fi # create modules.c @@ -991,7 +990,6 @@ echo CFLAGS1=$CFLAGS Makefile.config echo INCLUDES1=$INCLUDES Makefile.config -#INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH $OSDIR main ap INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH $OSDIR include incprefix=-I for depth in 0 1 2; do 1.3 +6 -5 apache-1.3/src/regex/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/regex/Makefile.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.tmpl 1997/11/16 01:20:38 1.2 +++ Makefile.tmpl 1998/02/01 16:33:12 1.3 @@ -4,7 +4,7 @@ # Put -Dconst= in for a pre-ANSI compiler. # Do not take -DPOSIX_MISTAKE out. # REGCFLAGS isn't important to you (it's for my use in some special contexts). -CFLAGS=-I. -DPOSIX_MISTAKE $(AUX_CFLAGS) +CFLAGS=-I. -I../include -DPOSIX_MISTAKE $(AUX_CFLAGS) # If you have a pre-ANSI compiler, put -o into MKHFLAGS. If you want # the Berkeley __P macro, put -b in. @@ -46,16 +46,16 @@ rm -f *.o # stuff to build regex.h -REGEXH=regex.h +REGEXH=../include/regex.h REGEXHSRC=regex2.h $(REGSRC) $(REGEXH): $(REGEXHSRC) mkh - sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) regex.h + sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) $(REGEXH) #cmp -s regex.tmp regex.h 2/dev/null || cp regex.tmp regex.h #rm -f regex.tmp # dependencies -$(OBJPRODN) debug.o: utils.h regex.h regex2.h +$(OBJPRODN) debug.o: utils.h $(REGEXH) regex2.h regcomp.o: cclass.h cname.h regcomp.ih regexec.o: engine.c engine.ih regerror.o: regerror.ih @@ -105,7 +105,8 @@ mf.tmp: Makefile - sed '/^REGEXH=/s/=.*/=regex.h/' Makefile | sed '/#DEL$$/d' $@ + sed '/^REGEXH=/s/=.*/=..\/include\\regex.h/' Makefile \ + | sed '/#DEL$$/d' $@ DTRH=cclass.h cname.h regex2.h utils.h PRE=COPYRIGHT README WHATSNEW
cvs commit: apache-1.3 STATUS
coar98/02/01 08:37:29 Modified:.STATUS Log: Sunny and cold. (Why are we doing this??) Revision ChangesPath 1.140 +1 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- STATUS1998/02/01 00:21:13 1.139 +++ STATUS1998/02/01 16:37:29 1.140 @@ -143,6 +143,7 @@ * r-allowed cleanup * References to undefined 'cwd' cell fixed in suexec.c * fix options/allowoverride merging +* Ken's restructuring the header files into src/include Available Patches: @@ -228,10 +229,6 @@ apprivate_xxx: appri_xxx: httpd_xxx: Ken +1 - -* Maybe moving *all* of the *.h header files into a new - src/include directory? - Status: Ken +1, Dean +1 * Ken's [POLL] apachen/patches directory Shall we experiment with allowing patches to be distributed for
cvs commit: apache-1.3/src/main Makefile.tmpl
coar98/02/01 08:44:29 Modified:src/main Makefile.tmpl Log: The mod_*.o files aren't in this directory any more, so they don't need to replace space with confusion in the Makefile. Revision ChangesPath 1.9 +0 -108apache-1.3/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.tmpl 1998/02/01 15:56:20 1.8 +++ Makefile.tmpl 1998/02/01 16:44:28 1.9 @@ -78,114 +78,6 @@ $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ $(INCDIR)/scoreboard.h $(INCDIR)/fnmatch.h md5c.o: md5c.c $(INCDIR)/conf.h $(INCDIR)/md5.h -mod_access.o: mod_access.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_log.h $(INCDIR)/http_request.h -mod_actions.o: mod_actions.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ - $(INCDIR)/util_script.h -mod_alias.o: mod_alias.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/http_config.h -mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_log.h $(INCDIR)/util_script.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_request.h -mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h -mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_request.h -mod_auth_db.o: mod_auth_db.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h -mod_auth_dbm.o: mod_auth_dbm.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h -mod_auth_msql.o: mod_auth_msql.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h -mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ - $(INCDIR)/util_script.h -mod_browser.o: mod_browser.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h -mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \ - $(INCDIR)/util_script.h $(INCDIR)/http_log.h $(INCDIR)/http_request.h -mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_log.h $(INCDIR)/util_script.h \ - $(INCDIR)/http_conf_globals.h -mod_digest.o: mod_digest.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/util_md5.h $(INCDIR)/md5.h -mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_main.h $(INCDIR)/util_script.h -mod_dld.o: mod_dld.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h -mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/http_config.h -mod_expires.o: mod_expires.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_log.h -mod_headers.o: mod_headers.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR
cvs commit: apache-1.3/htdocs/manual/mod mod_dll.html mod_rewrite.html mod_speling.html
coar98/02/05 13:20:03 Modified:htdocs/manual windows.html htdocs/manual/misc custom_errordocs.html known_client_problems.html perf-hp.html perf-tuning.html security_tips.html htdocs/manual/mod mod_dll.html mod_rewrite.html mod_speling.html Log: Correcting some HTML boo-boos (not subject to style debates). It has been said, and verily it is true, that weblint rocks. Revision ChangesPath 1.11 +3 -3 apache-1.3/htdocs/manual/windows.html Index: windows.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/windows.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- windows.html 1998/02/05 20:04:16 1.10 +++ windows.html 1998/02/05 21:19:54 1.11 @@ -118,7 +118,7 @@ directory, on the current hard drive. Another directory may be used, but the files will need to be installed manually./P -PTo install the files into the /CODE\Apache/CODE directory +PTo install the files into the CODE\Apache/CODE directory automatically, use one the following nmake commands (see above):/P UL LICODEnmake /f Makefile.nt installr/CODE (for release build) @@ -211,13 +211,13 @@ line, or as a Windows NT service. To run it from the command line, use the following command: PRE -C:\Apache STRONGapache -s/STRONG +C:\Apachegt; STRONGapache -s/STRONG /PRE PApache will then execute, and will remain running until it is exited. To use Apache as a Windows NT service, use the following:/P PRE -C:\Apache STRONGapache -i/STRONG +C:\Apachegt; STRONGapache -i/STRONG /PRE PThen open the Services control panel, and start the Apache service./P 1.3 +10 -11apache-1.3/htdocs/manual/misc/custom_errordocs.html Index: custom_errordocs.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/custom_errordocs.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- custom_errordocs.html 1998/02/05 20:04:28 1.2 +++ custom_errordocs.html 1998/02/05 21:19:56 1.3 @@ -12,9 +12,7 @@ VLINK=#80 ALINK=#FF -DIV ALIGN=CENTER - IMG SRC=../images/sub.gif ALT=[APACHE DOCUMENTATION] -/DIV +!--#include virtual=header.html -- H1 ALIGN=CENTERUsing XSSI and SAMPErrorDocument/SAMP to configure customized international server error responses/H1 @@ -30,7 +28,7 @@ LIA HREF=#listingsHTML listing of the discussed example/A /UL HR -A NAME=introH2Introduction/H2/A +H2A NAME=introIntroduction/A/H2 This document describes an easy way to provide your apache WWW server with a set of customized error messages which take advantage of A HREF=../content-negotiation.htmlContent Negotiation/A @@ -76,14 +74,15 @@ P An example of a document not found message for a german client might look like this:BR -IMG SRC=../images/custom_errordocs.gifBR +IMG SRC=../images/custom_errordocs.gif + ALT=[Needs graphics capability to display]BR All links in the document as well as links to the server's administrator mail address, and even the name and port of the serving virtual host are inserted in the error document at run-time, i.e., when the error actually occurs. /P -A NAME=createdirH2Creating an ErrorDocument directory/H2/A +H2A NAME=createdirCreating an ErrorDocument directory/A/H2 For this concept to work as easily as possible, we must take advantage of as much server support as we can get: @@ -159,7 +158,7 @@ appropriate permissions (readable and executable by the server uid or gid, only writable for the administrator). -A NAME=docnamesH3Naming the individual error document files/H3/A +H3A NAME=docnamesNaming the individual error document files/A/H3 By defining the SAMPMultiViews/SAMP option, the server was told to automatically scan the directory for matching variants (looking at language @@ -186,7 +185,7 @@ variant (A HREF=#fallbacksee below/A). /UL -A NAME=headfootH3The common header and footer files/H3/A +H3A NAME=headfootThe common header and footer files/A/H3 By putting as much layout information in two special include files, the error documents can be reduced to a bare minimum. @@ -229,7 +228,7 @@ implementation of the discussed example. -A NAME=createdocsH3Creating ErrorDocuments in different languages/H3/A +H3A NAME=createdocsCreating ErrorDocuments in different languages/A/H3 After all this preparation work, little remains to be said about the actual documents. They all share a simple common structure: @@ -243,7 +242,7 @@ of a [400 Bad Request] error
cvs commit: apache-2.0 STATUS
coar98/02/05 18:58:40 Modified:.STATUS Log: Tra la la.. Revision ChangesPath 1.7 +10 -9 apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- STATUS1998/02/06 02:35:12 1.6 +++ STATUS1998/02/06 02:58:40 1.7 @@ -21,35 +21,36 @@ Open issues: - Replace the current Unix compilation model (Configuration.tmpl, home-brew + * Replace the current Unix compilation model (Configuration.tmpl, home-brew Configure script) with the autoconf toolset. - Status: Brian +1, Roy +1, Dean +1 + Status: Brian +1, Roy +1, Dean +1 - Investigate replacing the current Unix compilation model (Configuration.tmpl + * Investigate replacing the current Unix compilation model (Configuration.tmpl home-brew Configure script) with the autoconf toolset. (this varies from the above such that if it's shown that the autoconf toolset can do what we want, with less headache than what we have, then we go for it) - Status: Jim +1 + Status: Jim +1, Ken +1 - The autoconf toolset should include all three: autoconf, automake, and + * The autoconf toolset should include all three: autoconf, automake, and libtool. - Status: Brian +1, Jim +1, Roy +1, Dean +1 + Status: Brian +1, Jim +1, Roy +1, Dean +1, Ken +1 FEATURE SET FOR 2.0 - Here, we decide how many of the following feature ideas we will set for +Here, we decide how many of the following feature ideas we will set for ourselves as work items for 2.0. We can't do everything we would want to, otherwise 2.0 will never be released. So please try and be conservative with your votes. Items in no particular order. Feel free to add more, but try not to duplicate earlier items too much. a) multithreading. - Brian +1 + Brian +1, Ken +1 b) new layered I/O. - Brian +1 + Brian +1, Ken +1 c) radically revamped API + Ken +1 d) just new API phases Brian +1
cvs commit: apache-2.0 STATUS
coar98/02/06 07:03:22 Modified:.STATUS Log: Woo-hoo, on a roll this morning. Sunny, cloudless, and bitterly cold. Revision ChangesPath 1.11 +38 -15apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- STATUS1998/02/06 13:49:16 1.10 +++ STATUS1998/02/06 15:03:21 1.11 @@ -43,28 +43,51 @@ conservative with your votes. Items in no particular order. Feel free to add more, but try not to duplicate earlier items too much. -a) multithreading. - Brian +1, Ken +1, Dean +1, Jim +1, Paul +1 +* multithreading. + Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1 -b) new layered I/O. - Brian +1, Ken +1, Dean +1, Jim +1, Paul +1 +* revamped process model (Dean's proposal) + Dean says: it's hard to do the multithreading work cleanly without + considering a bunch of this + Status: + +* new layered I/O. + Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1 - b1) sfio - b2) bstdio + . sfio + . bstdio + +* API work + + . radically revamped API + Status: Ken +1 -c) radically revamped API - Ken +1 + . documented API + Status: Ken +1 -d) just new API phases - Brian +1, Jim +1 (just the gaping holes) + . just new API phases + Status: Brian +1, Jim +1 (just the gaping holes) + + . change API 'phase' model to use module-registered hooks rather + than a fixed static structure + Status: Ken +1 + + . clearly identify API functions by renaming them + Status: Ken +1 + + . backward compatibility with 1.3 (just require a recompile) + if functions get renamed, old names retained as wrappers + Status: Paul +1 -e) new configuration language + . make API call syntax rational (e.g., all r*() routines list r + as their first argument, et cetera) + Status: Ken +1 -f) rewrite in C++ +* new configuration language + Status: -g) revamped process model (Dean's proposal) - Dean says: it's hard to do (a) cleanly without considering a - bunch of this +* rewrite in C++ + Status: Closed issues:
cvs commit: apache-1.3/src/include http_config.h
coar98/02/07 05:59:56 Modified:src/include http_config.h Log: Bump MODULE_MAGIC_NUMBER because of the dynamic_load_handle pointer addition in the module structure header. Revision ChangesPath 1.65 +1 -1 apache-1.3/src/include/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- http_config.h 1998/02/06 18:25:22 1.64 +++ http_config.h 1998/02/07 13:59:55 1.65 @@ -255,7 +255,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19980201 +#define MODULE_MAGIC_NUMBER 19980207 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apache-devsite mmn.txt
coar98/02/07 06:01:09 Modified:.mmn.txt Log: Note the bump of MMN due to the dynamic_load_handle addition to the module structure. Revision ChangesPath 1.10 +2 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mmn.txt 1998/02/01 22:07:00 1.9 +++ mmn.txt 1998/02/07 14:01:08 1.10 @@ -29,3 +29,5 @@ - table_addn(), table_setn(), table_mergen() 19980201 (1.3b4-dev) - construct_url() prototype server_rec * - request_rec * - add get_server_name() and get_server_port() +19980207 (1.3b4-dev) - add dynamic_load_handle to module structure as part +of the STANDARD_MODULE_STUFF header
cvs commit: apache-1.3 STATUS
coar98/02/07 07:48:09 Modified:.STATUS Log: Another clear cold day. Revision ChangesPath 1.146 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- STATUS1998/02/07 03:31:04 1.145 +++ STATUS1998/02/07 15:48:08 1.146 @@ -4,13 +4,13 @@ 2.0 : In pre-alpha development see: http://www.arctic.org/~dgaudet/apache/2.0/process-model -1.3b4: In development, maybe a release early Feb 98? Jim will be RM - unless someone else wants it +1.3b4: In development, maybe a release early Feb 98? Jim is RM 1.3b3: Released and announced 1.3b1: There is no 1.3b1 Current Modes: +* CODE FREEZE in effect for 1.3b4. NO COMMITS! o Commit-Then-Review (see http://dev.apache.org/guidelines.html#ctr Plan:
cvs commit: apache-2.0 STATUS
coar98/02/10 10:19:27 Modified:.STATUS Log: Add another work area discussed in the past. Also, things are starting to get potentially overcommitted here; add an opportunity to check sanity by letting people sign up for different pieces. Items with lots of votes but no volunteers should maybe be struck from the plan, or moved to 'nice-to-have' status. Revision ChangesPath 1.22 +39 -15apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- STATUS1998/02/10 06:49:34 1.21 +++ STATUS1998/02/10 18:19:27 1.22 @@ -46,75 +46,99 @@ to add more, but try not to duplicate earlier items too much. * multithreading. - Status: Brian +1, Ken +1, Jim +1, Paul +1, Sameer +1, Marc +1, Ralf +1, MarkC +1, Ben +1 - - Thread Abstraction - Status: Sameer +1, Marc +1, MarkC +1, Ben +1, Dean +1 - + Status: Brian +1, Ken +1, Jim +1, Paul +1, Sameer +1, Marc +1, + Ralf +1, MarkC +1, Ben +1 + - Thread Abstraction + Status: Sameer +1, Marc +1, MarkC +1, Ben +1, Dean +1 + Volunteers: + * revamped process model (Dean's proposal) Dean says: it's hard to do the multithreading work cleanly without considering a bunch of this - Status: Marc +1 on much of it; threads aren't enough for perf. MarkC +1, Paul +1, Dean +1 + Status: Marc +1 on much of it; threads aren't enough for perf. + MarkC +1, Paul +1, Dean +1 + Volunteers: * new layered I/O. - Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1, Sameer +1, Marc +1, Ralf +1, MarkC +1, Ben +1 - + Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1, Sameer +1, + Marc +1, Ralf +1, MarkC +1, Ben +1 + Volunteers: Ken + . sfio Status: Dean -1 until it's shown to be thread safe (RST claims it isn't) + Volunteers: . bstdio - This was written by Chris Provenzano as part of his implementation - of Posix threads... Jim can place a copy of the RST-hacked - version on dev.apache.org if needed and possible. + This was written by Chris Provenzano as part of his implementation + of Posix threads... Jim can place a copy of the RST-hacked + version on dev.apache.org if needed and possible. -- RST never donated his hacks to the Group. Don't put it up for - download unless you've cleared it with him. --Brian + download unless you've cleared it with him. --Brian . page flipping friendly, page-sized buffer oriented, zero copy I/O -(In this model there are functions like readbuf() which return a + (In this model there are functions like readbuf() which return a pointer to a buffer, rather than taking a pointer to a buffer. This is a lot like how kernels actually work. The advantage is that you can get zero-copy in the user space, which is a big win for caching modules of all sorts. You can also support the traditional slow style of stdio, which adds an extra user space copy.) Status: Dean +1, Marc +1, Ben +1, Paul +1 + Volunteers: * API work . radically revamped API Status: Ken +1 + Volunteers: Ken . documented API Status: Ken +1, Sameer +1, Marc +1, Ralf +1, Paul +1, Dean +1 - + Volunteers: Ken + . just new API phases Status: Brian +1, Jim +1, Sameer +1 (just the gaping holes), - Ralf +1 (especially url2url and file2file in addition to url2file) + Ralf +1 (especially url2url and file2file in addition to + url2file) + Volunteers: Ken . change API 'phase' model to use module-registered hooks rather than a fixed static structure Status: Ken +1, Ralf +1, MarkC +1, Paul +1, Dean +1 + Volunteers: Ken . use virtual functions for module hooks Status: Ben +1, Paul -1 + Volunteers: . clearly identify API functions by renaming them Status: Ken +1, Ralf +1, Ben +1, Paul +1 (plus back compat.), Dean +1 + Volunteers: Ken . backward compatibility with 1.3 (just require a recompile) if functions get renamed, old names retained as wrappers Status: Paul +1, Sameer +1, Marc +1, Ralf +1, MarkC +1, Paul +1 + Volunteers: . make API call syntax rational (e.g., all r*() routines list r as their first argument, et cetera) Status: Ken +1, Ralf +0, Paul +0, Dean +0 + Volunteers: Ken + + . abstract module layering for plugins (e.g., a mod_auth interface
cvs commit: apache-1.3/htdocs/manual bind.html handler.html keepalive.html location.html multilogs.html new_features_1_1.html
coar98/02/11 06:34:31 Modified:htdocs/manual bind.html handler.html keepalive.html location.html multilogs.html new_features_1_1.html Log: Fix some broken links detexted by Xenu. Revision ChangesPath 1.13 +8 -8 apache-1.3/htdocs/manual/bind.html Index: bind.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/bind.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bind.html 1998/02/05 20:04:06 1.12 +++ bind.html 1998/02/11 14:34:27 1.13 @@ -38,19 +38,19 @@ H3A name=bindaddressBindAddress/A/H3 A - HREF=directive-dict.html#Syntax + HREF=mod/directive-dict.html#Syntax REL=Help STRONGSyntax:/STRONG/A BindAddress EM[ * | IP-address | hostname ]/EMBR A - HREF=directive-dict.html#Default + HREF=mod/directive-dict.html#Default REL=Help STRONGDefault:/STRONG/A CODEBindAddress */CODEBR A - HREF=directive-dict.html#Context + HREF=mod/directive-dict.html#Context REL=Help STRONGContext:/STRONG/A server configBR A - HREF=directive-dict.html#Status + HREF=mod/directive-dict.html#Status REL=Help STRONGStatus:/STRONG/A CoreP @@ -61,19 +61,19 @@ H3A name=listenListen/A/H3 A - HREF=directive-dict.html#Syntax + HREF=mod/directive-dict.html#Syntax REL=Help STRONGSyntax:/STRONG/A Listen EM[ port | IP-address:port ]/EMBR A - HREF=directive-dict.html#Default + HREF=mod/directive-dict.html#Default REL=Help STRONGDefault:/STRONG/A CODEnone/CODEBR A - HREF=directive-dict.html#Context + HREF=mod/directive-dict.html#Context REL=Help STRONGContext:/STRONG/A server configBR A - HREF=directive-dict.html#Status + HREF=mod/directive-dict.html#Status REL=Help STRONGStatus:/STRONG/A CoreP 1.13 +8 -8 apache-1.3/htdocs/manual/handler.html Index: handler.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/handler.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- handler.html 1998/02/05 20:04:09 1.12 +++ handler.html 1998/02/11 14:34:27 1.13 @@ -72,19 +72,19 @@ H2A name=addhandlerAddHandler/A/H2 A - HREF=directive-dict.html#Syntax + HREF=mod/directive-dict.html#Syntax REL=Help STRONGSyntax:/STRONG/A lt;AddHandler EMhandler-name extension/EMgt;BR A - HREF=directive-dict.html#Context + HREF=mod/directive-dict.html#Context REL=Help STRONGContext:/STRONG/A server config, virtual host, directory, .htaccessBR A - HREF=directive-dict.html#Status + HREF=mod/directive-dict.html#Status REL=Help STRONGStatus:/STRONG/A BaseBR A - HREF=directive-dict.html#Module + HREF=mod/directive-dict.html#Module REL=Help STRONGModule:/STRONG/A mod_mime @@ -104,19 +104,19 @@ H2A name=sethandlerSetHandler/A/H2 A - HREF=directive-dict.html#Syntax + HREF=mod/directive-dict.html#Syntax REL=Help STRONGSyntax:/STRONG/A lt;SetHandler EMhandler-name/EMgt;BR A - HREF=directive-dict.html#Context + HREF=mod/directive-dict.html#Context REL=Help STRONGContext:/STRONG/A directory, .htaccessBR A - HREF=directive-dict.html#Status + HREF=mod/directive-dict.html#Status REL=Help STRONGStatus:/STRONG/A BaseBR A - HREF=directive-dict.html#Module + HREF=mod/directive-dict.html#Module REL=Help STRONGModule:/STRONG/A mod_mime 1.11 +8 -8 apache-1.3/htdocs/manual/keepalive.html Index: keepalive.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/keepalive.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- keepalive.html1998/02/05 20:04:11 1.10 +++ keepalive.html1998/02/11 14:34:28 1.11 @@ -35,19 +35,19 @@ H3KeepAlive/H3 A - HREF=directive-dict.html#Syntax + HREF=mod/directive-dict.html#Syntax REL=Help STRONGSyntax:/STRONG/A KeepAlive EMmax-requests/EMBR A - HREF=directive-dict.html#Default + HREF=mod/directive-dict.html#Default REL=Help STRONGDefault:/STRONG/A CODEKeepAlive 5/CODEBR A - HREF=directive-dict.html#Context + HREF=mod/directive-dict.html#Context REL=Help STRONGContext:/STRONG/A server configBR A - HREF=directive-dict.html#Status + HREF=mod/directive-dict.html#Status REL=Help STRONGStatus:/STRONG/A CoreP @@ -58,19 +58,19 @@ H3KeepAliveTimeout/H3 A - HREF=directive-dict.html#Syntax + HREF=mod/directive-dict.html#Syntax REL=Help STRONGSyntax:/STRONG/A KeepAliveTimeout EMseconds/EMBR A - HREF=directive-dict.html#Default + HREF=mod/directive-dict.html#Default REL=Help STRONGDefault:/STRONG
cvs commit: apache-site bugdb.cgi
coar98/02/11 07:18:35
Modified:.bugdb.cgi
Log:
Add a is this still alive button, correct and simplify the
handling of canned text, and make the display of same 'small'
to take up less space at the top of the edit form.
Revision ChangesPath
1.25 +37 -4 apache-site/bugdb.cgi
Index: bugdb.cgi
===
RCS file: /export/home/cvs/apache-site/bugdb.cgi,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bugdb.cgi 1998/01/20 15:06:09 1.24
+++ bugdb.cgi 1998/02/11 15:18:34 1.25
@@ -28,6 +28,13 @@
# appropriate message key (e.g., _C_Stale). handle_edit_pr senses
# this and substitutes the actual text.
#
+$CANNED_TEXT{Quiet} =
+[This is a standard response.]\n .
+This Apache problem report has not been updated recently.\n .
+Please reply to this message if you have any additional\n .
+information about this issue, or if you have answers to\n .
+any questions that have been posed to you. If we don't\n .
+hear from you, this report will be closed.;
$CANNED_TEXT{Stale} =
[This is a standard response.]\n .
No response from submitter, assuming issue has been resolved.;
@@ -1477,7 +1484,7 @@
if ($ENV{'REMOTE_USER'}) {
local ($timestamp) = timestamp($fullpr);
print EOM;
-TABLE
+TABLE CELLPADDING=0 CELLSPACING=0
TR ALIGN=LEFT VALIGN=TOP
TD
FORM ACTION=$SCRIPT_NAME/edit_pr
@@ -1491,6 +1498,32 @@
TR ALIGN=LEFT VALIGN=TOP
TD
FORM METHOD=POST
ACTION=$SCRIPT_NAME/handle_edit_pr/$pr$fieldvalues{'State'}$timestamp
+INPUT TYPE=submit VALUE=Query
+
+INPUT TYPE=hidden NAME=Editor VALUE=$ENV{'REMOTE_USER'}
+INPUT TYPE=hidden NAME=Synopsis VALUE=
+INPUT TYPE=hidden NAME=Originator
VALUE=$fieldvalues{'Originator'}
+INPUT TYPE=hidden NAME=Class VALUE=$fieldvalues{'Class'}
+INPUT TYPE=hidden NAME=Release VALUE=$fieldvalues{'Release'}
+INPUT TYPE=hidden NAME=Severity VALUE=$fieldvalues{'Severity'}
+INPUT TYPE=hidden NAME=State VALUE=feedback
+INPUT TYPE=hidden NAME=StateReason VALUE=_C_Quiet
+INPUT TYPE=hidden NAME=Category VALUE=$fieldvalues{'Category'}
+INPUT TYPE=hidden NAME=Responsible
VALUE=$fieldvalues{'Responsible'}
+INPUT TYPE=hidden NAME=ResponsibleReason VALUE=
+ /FORM
+ /TD
+ TDSTRONGOutstanding request(s) for information/STRONG
+ /TD
+ TD
+ PRE
+SMALL$CANNED_TEXT{'Quiet'}/SMALL
+ /PRE
+ /TD
+ /TR
+ TR ALIGN=LEFT VALIGN=TOP
+ TD
+ FORM METHOD=POST
ACTION=$SCRIPT_NAME/handle_edit_pr/$pr$fieldvalues{'State'}$timestamp
INPUT TYPE=submit VALUE=Close
INPUT TYPE=hidden NAME=Editor VALUE=$ENV{'REMOTE_USER'}
@@ -1510,7 +1543,7 @@
/TD
TD
PRE
-$CANNED_TEXT{'Stale'}
+SMALL$CANNED_TEXT{'Stale'}/SMALL
/PRE
/TD
/TR
@@ -1536,7 +1569,7 @@
/TD
TD
PRE
-$CANNED_TEXT{'Duplicate'}
+SMALL$CANNED_TEXT{'Duplicate'}/SMALL
/PRE
/TD
/TR
@@ -1562,7 +1595,7 @@
/TD
TD
PRE
-$CANNED_TEXT{'Inappropriate'}
+SMALL$CANNED_TEXT{'Inappropriate'}/SMALL
/PRE
/TD
/TR
cvs commit: apache-1.3/src/ap ap_execve.c
coar98/02/14 05:51:08 Modified:src/ap ap_execve.c Log: With ap_exec*() no longer calling aplog_error(), the source no longer needs to include http_log.h. Revision ChangesPath 1.6 +0 -1 apache-1.3/src/ap/ap_execve.c Index: ap_execve.c === RCS file: /export/home/cvs/apache-1.3/src/ap/ap_execve.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ap_execve.c 1998/02/07 12:14:56 1.5 +++ ap_execve.c 1998/02/14 13:51:07 1.6 @@ -87,7 +87,6 @@ */ #include httpd.h -#include http_log.h /*---*/
cvs commit: apache-site related_projects.html
coar98/02/18 03:13:33 Modified:.related_projects.html Log: Fix up a nested anchor issue pointed out by Martin (it means including an evil nbsp; to make sure the heading is the fragment target), and remove leading spaces from some LIs (which will screw up indentation if the item line-wraps). Revision ChangesPath 1.18 +15 -15apache-site/related_projects.html Index: related_projects.html === RCS file: /export/home/cvs/apache-site/related_projects.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- related_projects.html 1998/02/17 20:58:56 1.17 +++ related_projects.html 1998/02/18 11:13:33 1.18 @@ -22,30 +22,30 @@ H3Non-Commercial Projects/H3 UL -LI A HREF=#apachesslApache-SSL/A -LI A HREF=#moduleregApache Module Registry/A -LI A HREF=#phpPHP Project/A -LI A HREF=#modperlApache/Perl Integration Project/A -LI A HREF=#os2Apache for OS/2/A -LI A HREF=#amigaApache for Amiga/A -LI A HREF=#jservThe Java-Apache Project/A -LI A HREF=#guidevApache Graphical User Interface Project/A -LI A HREF=#docsApache Documentation Project/A +LIA HREF=#apachesslApache-SSL/A +LIA HREF=#moduleregApache Module Registry/A +LIA HREF=#phpPHP Project/A +LIA HREF=#modperlApache/Perl Integration Project/A +LIA HREF=#os2Apache for OS/2/A +LIA HREF=#amigaApache for Amiga/A +LIA HREF=#jservThe Java-Apache Project/A +LIA HREF=#guidevApache Graphical User Interface Project/A +LIA HREF=#docsApache Documentation Project/A /UL H3Commercial Products/H3 UL -LI A HREF=#apacheweekApache Week/A -LI A HREF=#matriceMatrice W3/A -LI A HREF=#strongholdStronghold/A -LI A HREF=#tenonWebTen, a MacOS port of Apache/A +LIA HREF=#apacheweekApache Week/A +LIA HREF=#matriceMatrice W3/A +LIA HREF=#strongholdStronghold/A +LIA HREF=#tenonWebTen, a MacOS port of Apache/A /UL HR -A NAME=apachessl -H3A HREF=http://www.apache-ssl.org/;Apache-SSL/A/H3 +H3A HREF=http://www.apache-ssl.org/; +Apache-SSL/AA NAME=apachesslnbsp;/A/H3 Apache-SSL is an encrypting web server, based on Apache and SSLeay, which implements A HREF=http://home.netscape.com/newsref/std/;Secure Sockets
cvs commit: apache-1.2 KEYS
coar98/02/19 15:33:17 Modified:.KEYS Log: Dean ducked signing the 1.2.6 release because his key wasn't in the 1.2 KEYS file. This fixes it so he can't pull that again. ;- Revision ChangesPath 1.11 +103 -6apache-1.2/KEYS Index: KEYS === RCS file: /export/home/cvs/apache-1.2/KEYS,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- KEYS 1998/01/30 09:12:41 1.10 +++ KEYS 1998/02/19 23:33:17 1.11 @@ -125,7 +125,9 @@ -END PGP PUBLIC KEY BLOCK- Type Bits/KeyIDDate User ID -pub 1024/49A563D9 1997/02/24 Mark Cox [EMAIL PROTECTED] +pub 1024/49A563D9 1997/02/24 Mark Cox [EMAIL PROTECTED] + Mark Cox [EMAIL PROTECTED] + Mark Cox [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- Version: 2.6.3ia @@ -133,11 +135,19 @@ mQCNAzMRY/IAAAEEAOloTOU0f4w7FDRMM6kA/6XazXxJ/HH8dsmb6E7RuYfVlXsd kCwxUBOkyW+AYhkHbYUwnB5qBoFUyLrbLGuwKHW1KnAwgbeZLTH5nqQLpA0RLGVZ v3tzImKUdyyxBphZWC4IeEgUbl9cc+piOsEJ8QzF7gnqwWo/Ku6tTP1JpWPZAAUR -tBlNYXJrIENveCA8bWFya0B1a3dlYi5jb20+iQCVAwUQMxFj8u6tTP1JpWPZAQHz -eQP+N0nQDbPzWeqLssQLyhFkjw5zZByN60j8p25+6JEq7RXgkN1cHtAdH5LMwRAG -fc258f7P9Syp64lH8s4XWYSX5GX8YA8MurOrJmoGFrJs/yxWng8xtxI9tFUnuoIb -HqnD7HCS9Oj1INdyyQuCxZYGHAgxHhpfNTZt+33tMSFIZTQ= -=uIkU +tBdNYXJrIENveCA8bWFya0Bhd2UuY29tPokAlQMFEDQvYTHurUz9SaVj2QEB/hMD +/ix6pAa+4ZgFQNRAc7fC+I4uGWvXoI8N8wtgiJi//8Kc1vjtvTylLPKVBDsy1ihs +bVOjD3NUEkH95TNI3QhVeCwJPl2e3GgFl253hj8Jai9snHj75pXjQXq0NxQ/JRSr +EAqrFM7+yRLPs7zDwsMoc2Ox5emq4joVa3syZUEwW7LxtBZNYXJrIENveCA8bWNv +eEBjMi5uZXQ+iQCVAwUQNHKlBO6tTP1JpWPZAQEA8QP9HSjVMLohfOVO0tHcLRDB +eDfnRnBxgTeF7P2u8qB+eOeLqBzHNmE/gROWuZXOpkxeCqT0GG3oXqmSEmVOtDsJ +K92sKvtTdJOAGq95UQI3t1Ix6iNHkVJfo11RkJyU2iL6XFR1953nS33xKGdbU6v7 +5KVCu3JTe1kDEDOyMVDdRmW0GU1hcmsgQ294IDxtYXJrQHVrd2ViLmNvbT6JAJUD +BRAzEWPy7q1M/UmlY9kBAfN5A/43SdANs/NZ6ouyxAvKEWSPDnNkHI3rSPynbn7o +kSrtFeCQ3Vwe0B0fkszBEAZ9zbnx/s/1LKnriUfyzhdZhJfkZfxgDwy6s6smagYW +smz/LFaeDzG3Ej20VSe6ghseqcPscJL06PUg13LJC4LFlgYcCDEeGl81Nm37fe0x +IUhlNA== +=k8vP -END PGP PUBLIC KEY BLOCK- Type Bits/KeyIDDate User ID @@ -185,3 +195,90 @@ hiXZ =K7lL -END PGP PUBLIC KEY BLOCK- + +Type bits/keyIDDate User ID +pub 1024/45B91DF1 1996/03/02 Doug MacEachern [EMAIL PROTECTED] + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: 2.6.2 + +mQCNAzE4lesAAAEEAKJYS1vL2iB3owwiZdCxp3JyvSNaC7h1p2jQXcJvY10gqyZm +VffDwFoSvJM1JdCx3o1mb3JpZ2OTV4SrDDkzcSpTXelgyh7k9O3HB7oG6pHTML9g +Dq9ZKydShMIvIJos7KuLWoM/jtkv7r/gWsGHAyKbT8fs3r7nlmxFuR3xAAUX +tB9Eb3VnIE1hY0VhY2hlcm4gPGRvdWdtQG9zZi5vcmc+ +=yaR9 +-END PGP PUBLIC KEY BLOCK- + +Type Bits/KeyIDDate User ID +pub 1023/163751F5 1997/08/18 Dean Gaudet [EMAIL PROTECTED] + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: 2.6.3a + +mQCNAzP30QgAAAED/1k8hPKsJj8Il/TfhP1JIRGwnXuzfQ/etv+MZJMzeNeKa8OX +Kw0d4e1S/KdJ+AZwWQp3ZMDoX2ghZ79X4DDDLEAc/Fmy0Gg8t89CP+xJk7b4EHjk +F7HX69BRJp3On4aRTXRND3WviqEmn5ppzbBkTenF9WWudLRbqrc4NnoWN1H1AAUR +tCBEZWFuIEdhdWRldCA8ZGdhdWRldEBhcmN0aWMub3JnPokAlQMFEDP30Qm3ODZ6 +FjdR9QEB9VQD/0+zumFj1zzYZ1+bS9Az36gijDUb8rlEVf/lBShx4VEvha8fsRRy +vkwnmJyupYvGtrSIYAwB0VK+GZPZa7XfZvUCM83AZY9vGpE0LwW2Vcz9kWZdJ0t+ +B7zJElmBUrmj9aW6ICmSNbOBwVo1Y7hg6lPSFFMOOECFpT1WuTXXYpNA +=KWcF +-END PGP PUBLIC KEY BLOCK- + + +Type bits/keyIDDate User ID +pub 768/8F394E3D 1995/08/08 Martin Kraemer [EMAIL PROTECTED] + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: 2.6 + +mQBtAzAnjA8AAAEDAKlpkRzZ7c4yDdVnW9fMHMXrMJ8gQ+UIzr1xt2+y7Sv71Nv9 +GfUuTeCWdOoynFUXvvBjyCuEIZ426s9UfrnWv94VppoS8sjFgLYkRIAhZiDMHYp0 +j8i1/f82KtdYjzlOPQAFEbQqTWFydGluIEtyYWVtZXIgPE1hcnRpbi5LcmFlbWVy +QE1jaC5TTkkuRGU+ +=hcsR +-END PGP PUBLIC KEY BLOCK- + + +Type Bits/KeyIDDate User ID +pub 1024/EC140B81 1997/04/10 Dirk-Willem van Gulik [EMAIL PROTECTED] + Dirk-Willem van Gulik [EMAIL PROTECTED] + Dirk-Willem van Gulik [EMAIL PROTECTED] + Dirk-Willem van Gulik [EMAIL PROTECTED] + Dirk-Willem van Gulik [EMAIL PROTECTED] + Dirk-Willem van Gulik [EMAIL PROTECTED] + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: 2.6.3i + +mQCNAzNNOsMAAAEEAJmwazRhNJB4mQkvp0rrxLkeOAxR9fGBXgJNa6HHdLv7YHwx +mwMorHYDCAMypO1yuznNTaMVT1z3cS+yqhOkTVxwNI1mxW6Zts1kOJB9pWuU33sk +sUuCkLHXMgyvP9cms6gcYgB5g3UP6M/aQ4T017+Gk/7crlH87DGmPZbsFAuBAAUR +tCxEaXJrLVdpbGxlbSB2YW4gR3VsaWsgPGRpcmt4QHdlYndlYXZpbmcub3JnPokA +lQMFEDRZ5+0xpj2W7BQLgQEB/KAD/1xniFNLHp+jxIVrEL6HcI06QZUYPvRuarWq
cvs commit: apache-1.3/src/support Makefile.tmpl
coar98/02/21 20:37:20 Modified:src Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/example Makefile.tmpl src/modules/experimental Makefile.tmpl src/modules/extra Makefile.tmpl src/modules/proxy Makefile.tmpl src/modules/standard Makefile.tmpl src/modules/test Makefile.tmpl src/os/unix Makefile.tmpl src/support Makefile.tmpl Log: Somewhat reworked make depend rules, which result in dependencies that use $(INCDIR) for the src/include directory. Why? Because it makes it a lot easier to spot exceptions (like the proxy's outbound includes of mod_mime.h, et cetera). Revision ChangesPath 1.78 +11 -9 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- Makefile.tmpl 1998/02/18 08:50:58 1.77 +++ Makefile.tmpl 1998/02/22 04:37:08 1.78 @@ -6,6 +6,7 @@ CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) LIBS=$(EXTRA_LIBS) $(LIBS1) INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH0) $(EXTRA_INCLUDES) +INCDIR=include LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) OBJS= \ @@ -51,12 +52,14 @@ # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after # using it. depend: - sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ - $(CC) -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ - mv Makefile.tmpl Makefile.tmpl.bak \ - mv Makefile.new Makefile.tmpl + cp Makefile.tmpl Makefile.tmpl.bak \ + sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ + gcc -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ + sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \ + Makefile.tmpl \ + rm Makefile.new for i in $(SUBDIRS); do \ - ( cd $$i $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' depend) || exit 1; \ + ( cd $$i $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' depend ) || exit 1; \ done #Dependencies @@ -65,7 +68,6 @@ # DO NOT REMOVE buildmark.o: buildmark.c -modules.o: modules.c include/httpd.h include/conf.h os/unix/os.h \ - include/hsregex.h include/alloc.h include/buff.h include/ap.h \ - include/http_config.h -tt.o: tt.c +modules.o: modules.c $(INCDIR)/httpd.h $(INCDIR)/conf.h os/unix/os.h \ + $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/http_config.h 1.13 +23 -21apache-1.3/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.tmpl 1998/02/12 10:15:18 1.12 +++ Makefile.tmpl 1998/02/22 04:37:09 1.13 @@ -28,26 +28,28 @@ # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after # using it. depend: - sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ - $(CC) -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ - mv Makefile.tmpl Makefile.tmpl.bak \ - mv Makefile.new Makefile.tmpl + cp Makefile.tmpl Makefile.tmpl.bak \ + sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ + gcc -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ + sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \ + Makefile.tmpl \ + rm Makefile.new # DO NOT REMOVE -ap_cpystrn.o: ap_cpystrn.c ../include/httpd.h ../include/conf.h \ - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \ - ../include/buff.h ../include/ap.h -ap_execve.o: ap_execve.c ../include/httpd.h ../include/conf.h \ - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \ - ../include/buff.h ../include/ap.h ../include/http_log.h -ap_signal.o: ap_signal.c ../include/httpd.h ../include/conf.h \ - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \ - ../include/buff.h ../include/ap.h -ap_slack.o: ap_slack.c ../include/httpd.h ../include/conf.h \ - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \ - ../include/buff.h ../include/ap.h ../include/http_log.h -ap_snprintf.o: ap_snprintf.c ../include/conf.h ../os/unix/os.h \ - ../include/hsregex.h -ap_strings.o: ap_strings.c ../include/httpd.h ../include/conf.h \ - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \ - ../include/buff.h ../include/ap.h +ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ + ../os/unix/os.h $(INCDIR
