PR: 2060
Submitted by:	Jim Patterson <Jim.Patterson@Cognos.COM>, Ben Laurie


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81218 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81217 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:	Jim Jagielski
Reviewed by:	Dean Gaudet, Martin Kraemer, Brian Behlendorf
Disallow non-/dev/null device files to be used for ``configuration''
files (this includes htaccess, htpasswd and the mod_mime file). Also,
open these using ap_pfopen to better handle timeouts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81216 13f79535-47bb-0310-9956-ffa450edef68

This is required for compilation on WIN32, where API_VAR_EXPORT modifies
the definition.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81215 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81214 13f79535-47bb-0310-9956-ffa450edef68

	Final touches on removing the AddVersionComponent directive and
	correcting my BD references to something called "Server-Version."
	D'oh!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81213 13f79535-47bb-0310-9956-ffa450edef68

	Untangle the last patch..  ap_add_version_component() needs to
	*prepend* the strings it's fed, not append them.  This is because
	the last thing that calls it before the string is locked is
	ap_set_version() (as in set-like-cement), which adds the
	SERVER_BASEVERSION, the platform (conditionally), and the
	SERVER_SUBVERSION (if defined) at a known location - the front
	of the string.

	This has the drawback that module contributions will be listed
	in reverse order from their 'importance' (which is, in turn,
	in reverse order from their appearance in the Configuration
	file ;-).  However, only modules with major effects should be
	contributing to the string anyway, so we can consider them
	equal.  Can't we?

	The alternative is to either allow ap_set_version() to directly
	modify the string rather than going through ap_add...(), or else
	to add another routine that appends rather than prepends.  I
	don't like either of these because of the issues with semantics
	synchronisation and code duplication.

	The last patch confused things, though, so I'm just returning the
	behaviour to the original design - if someone wants to take
	extra steps to have module contributions listed in the same
	order as they're called, have a party.

	This should fix Rasmus' problem with the components being out
	of order, although it doesn't touch his issue with the init
	callback duplicating the SERVER_SUBVERSION effort.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81211 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81210 13f79535-47bb-0310-9956-ffa450edef68

This is a fix to make this not a show-stopper anymore.  Making a promise and
breaking it every now and then is worse than not making that promise.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81209 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81208 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:
Fix the order of how the server_version string is built... All extra
components are tacked to the _end_ of the string. The front of the
server_version string is always SERVER_BASEVERSION. So if we have

    "Apache/1.3b7-dev (FreeBSD)"

and the code gets ap_add_version_component("PHP/3.0") we'd get:

    "Apache/1.3b7-dev (FreeBSD) PHP/3.0"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81207 13f79535-47bb-0310-9956-ffa450edef68

garbage in, garbage out :)  removed the whole server string thing, added
two items from the list so we don't forget.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81206 13f79535-47bb-0310-9956-ffa450edef68

	- Fix type of cleanup routines being registered (Ben Hyde spotted)
	- Make sure that the "(platform)" comment (if enabled) appears at
	  a known location in the server version (right after the base
	  version string).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81205 13f79535-47bb-0310-9956-ffa450edef68

	Back out the AddVersionComponent run-time configuration
	directive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81203 13f79535-47bb-0310-9956-ffa450edef68

Uh, this is still needed to prevent compilation problems...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81202 13f79535-47bb-0310-9956-ffa450edef68

Marc's suggestion that we move this to debug, which I agree with.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81201 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81200 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81199 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81198 13f79535-47bb-0310-9956-ffa450edef68

about the ap_pcfg_openfile 'family'


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81197 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81196 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81195 13f79535-47bb-0310-9956-ffa450edef68

	Change the default setting of AddVersionPlatform to 'on'.  Jim,
	Brian Havard, and Marc think that's better - and if Marc, who is
	so security-conscious, thinks it's a good idea that tips me over
	to that side as well.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81194 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81192 13f79535-47bb-0310-9956-ffa450edef68

	Reposition the OS/2 display of the server version information so it
	has something to display.

Submitted by:	Brian Havard <brianh@kheldar.apana.org.au>
Reviewed by:	Ken Coar


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81191 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81190 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81189 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81188 13f79535-47bb-0310-9956-ffa450edef68

 1. Add big fat hint in INSTALL about risks and to read the
    htdocs/manual/suexec.html document before using the suexec-related
    configure options.

 2. Make sure the user has at least provided one --suexec-xxxx option
    (specifies suEXEC parameters) in addition to --enable-suexec option.
    If only --enable-suexec is given APACI stops with a hint to INSTALL
    and htdocs/manual/suexec.html documents.

 3. Provide two additional --suexec-xxxx options to make the suEXEC
    configuration complete (especially for package maintainers who else
    had to patch the source tree) by providing ways to configure minimal
    UID/GID and safe PATH, too.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81187 13f79535-47bb-0310-9956-ffa450edef68

1. $(INCLUDES) on the linking (x.o -> x) step is bogus.
   This is only needed in the compile (x.c -> x.o) step
   and is already done in the implicit target .c.o

2. Because suexec.c now includes conf.h a "make suexec"
   is broken because we don't provide $(INCLUDES) for
   the all-in-one step (x.c -> x). So at least we have
   to provide the rule for suexec.o -> suexec.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81186 13f79535-47bb-0310-9956-ffa450edef68

	Fix a broken cleanup registration that was breaking CGI handling.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81185 13f79535-47bb-0310-9956-ffa450edef68

	Oops, CGI scripts are broken.  That's a showstopper for sure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81184 13f79535-47bb-0310-9956-ffa450edef68

so change to `flag'
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81183 13f79535-47bb-0310-9956-ffa450edef68

	Foo, forgot to update MMN due to addition of ap_add_version_component
	and discontinuation of SERVER_SUBVERSION support.  (Which still needs
	to be ripped out of Configure, et alia loci).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81182 13f79535-47bb-0310-9956-ffa450edef68

  - make sure the configure script creates its temporary files in the
    shadow tree to avoid conflicts with parallel configure runs
  - removed unnecessary option "-r" from "rm" call for Makefiles
  - make sure the configure scripts creates the shadow-wrapper Makefile
    only when no shadow trees already exists
  - make sure "make distclean" removes the shadow-wrapper Makefile but only
    when no more shadow trees exists
  - overhauled mkshadow.sh script: now its more IFS-safe and approx. twice
    as fast (in the past it needed 70sec, now it runs just 38sec)
  - make sure CVS does not complain about the created files
    Makefille.<gnutriple> and directories src.<gnutriple>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81181 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81180 13f79535-47bb-0310-9956-ffa450edef68

	Add the AddVersion* directives to the 'new for 1.3' documentation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81179 13f79535-47bb-0310-9956-ffa450edef68

configuration or htdocs files. This is similar to how APACI now works.
For the configuration files, the @@...@@ tokens are expanded, and
the file called conf\*.conf.default. Then it is _copied_ to the
corresponding conf\*.conf _only if_ that file does not exist. If it
does exist, it displays a messagebox saying "Preserving file XXX", like
APACI. [PR#2118]

For the htdocs, the manuals are always installed into htdocs\manual(*)
However htdocs\index.html and htdocs\apache_pb.gif are not installed
if they already exist. So this will now not overwrite the user's
index.html file. [PR#2084 -- for Unix, but applied to Win32 as well]
Note: under APACI the manuals are not installed if htdocs exists. On
Win32 htdocs\manuals is installed. This is because we add a menu
item "Apache Documentation" which launches explorer to read the docs, so
we really want them installed.

(* if the installation type includes manuals, that is).

A couple of other fixes:

  - always create cgi-bin and htdocs directories, even if the
    manuals are not being installed

PR: 2118, 2084


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81178 13f79535-47bb-0310-9956-ffa450edef68

know we'll be adding it later


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81177 13f79535-47bb-0310-9956-ffa450edef68

	Add the core AddVersionComponent and AddVersionPlatform directives,
	which make the SERVER_SUBVERSION functionality a runtime thing and
	allow adding OS identity to the Server-Version string respectively.

PR:		2056
Reviewed by:	Jim Jagielski, Martin Kraemer, Brian Behlendorf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81176 13f79535-47bb-0310-9956-ffa450edef68