'APACHE_2_0_25'.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/tags/2.0.25@90784 13f79535-47bb-0310-9956-ffa450edef68

files only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90783 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90781 13f79535-47bb-0310-9956-ffa450edef68

I've had a couple of emails from users using mod_usertrack for authentication.
Add the equivalent of a "warning: coffee may be hot" label, and fix a broken
email address at the same time.

Submitted by:	Mark Cox


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90780 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90777 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90776 13f79535-47bb-0310-9956-ffa450edef68

mod_auth_ldap. This allows you to use mod_include to embed specified
user attributes in a page like so:
Hello <!--#echo var="AUTHENTICATE_CN"-->, how are you?
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90775 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90774 13f79535-47bb-0310-9956-ffa450edef68

  Fix a typo for documentation consistency.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90773 13f79535-47bb-0310-9956-ffa450edef68

script it generates shouldn't expect to find a modules directory.

Also, tee binbuild's output into build.log (rather than redirect it) so you can
see what's going on with the build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90772 13f79535-47bb-0310-9956-ffa450edef68

transaction pools once, and re-use them for each connection.

Submitted by:	Aaron Bannert <aaron@clove.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90771 13f79535-47bb-0310-9956-ffa450edef68

Submitted by:	Karl Fogel <kfogel@collab.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90769 13f79535-47bb-0310-9956-ffa450edef68

  This is the same granularity of control as mod_mime gave to set handlers
  (and now AddInputFilter and AddOutputFilter by extension) so this seems
  entirely appropriate in the core as well.  Options FileInfo is required
  to change the processing behavior of files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90760 13f79535-47bb-0310-9956-ffa450edef68

  Also in the prior commit (1.338)

  *) Modfied mod_mime to prevent mod_negotation from serving a multiview
     of a 'handler' or 'filter', so that any filename extension that does
     not contribute to the negotiated metadata can't be served without
     an explicit request.  E.g., if the .Z extension is associated with
     an unzip filter, the user request somefile.Z.html, mod_negotiation
     won't serve it.  It can serve somefile.Z.html when somefile.Z is
     requested, since the .Z extension is explictly requested, if the
     .html extension is associated with ContentType text/html.

    See changes for a complete description.  Because (in the example) the
    .Z extension doesn't affect negotiated behavior, the files index.html
    and index.Z.html couldn't be distinguished, and the user would get an
    error 406 NOT ACCEPTABLE, which is the _wrong_ answer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90759 13f79535-47bb-0310-9956-ffa450edef68

  Someone pointed out that we were running the images through the INCLUDE
  filter.  This fixes it, in a sort of hackish way.
  I don't remember who noticed this, sorry :(


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90758 13f79535-47bb-0310-9956-ffa450edef68

  Version 1.338 of mod_mime also tightened the mod_negotiation behavior.
  See changes for a complete description.  Because (in the example) the
  .Z extension doesn't affect negotiated behavior, the files index.html
  and index.Z.html couldn't be distinguished, and the user would get an
  error 406 NOT ACCEPTABLE, which is the _wrong_ answer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90757 13f79535-47bb-0310-9956-ffa450edef68

  Introduces mod_mime AddInputFilter and AddOutputFilter filter ext syntax.

  Significantly refactored the code to maintain single functions for the
  add_extension_info hash and remove_extension_info table processing.

  The AddInputFilter/AddOutputFilter could have been plural, as they accept
  a semicolon delimited list of filters (e.g. you need to stack two different
  filters based on a single extension.)  I expect that the plural could
  confuse users, though, as they might expect AddInputFilters foo bar var
  to add foo and bar to the extension var, which it definately doesn't do!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90756 13f79535-47bb-0310-9956-ffa450edef68

  Clip a duplicate appearance


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90755 13f79535-47bb-0310-9956-ffa450edef68

  This small patch I committed last week broke the transparent negotiation
  behavior.  I hope this is now settled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90754 13f79535-47bb-0310-9956-ffa450edef68

fdqueue functions in a different way.
Submitted by:	Aaron Bannert <aaron@clove.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90749 13f79535-47bb-0310-9956-ffa450edef68

As the worker MPM is really an alternative to the threaded MPM                  (and hopefully it'll be a replacement), the httpd.conf settings                 are identical.
Submitted by:	Aaron Bannert <aaron@clove.org>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90738 13f79535-47bb-0310-9956-ffa450edef68

code waited to start until the second pass (assuming we were just starting
up) to open the log file. Also fix a typo.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90737 13f79535-47bb-0310-9956-ffa450edef68

keepalive requests.  We were allocating a brigade out of the
connection pool; the number of these brigades allocated
per connection was theoretically unlimited.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90736 13f79535-47bb-0310-9956-ffa450edef68

Moved split_and_pass_pretag_buckets back to being a
macro at Ryans's request. Removed the return from it
by setting and returning a return code instead. Updated
the code to check the return code from teh macro and
do the right thing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90735 13f79535-47bb-0310-9956-ffa450edef68

apr_parse_addr_port() assumes that if there is just a number it must
be a port, but here we need to assume that it is a host.

todo: pass a flag into apr_parse_addr_port()?  unclear whether or
      not that is cleaner overall


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90734 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90733 13f79535-47bb-0310-9956-ffa450edef68

- make code more perlish.
- read and parse the config file only once
- use a hash instead of array for the list of internal config vars to
  test against
- added -h option (just print usage)
- wrapped numerous print STDERR calls into a simpler error() and
  notice() subs
- simplified some of the logic in if's using perl constructs.

Submitted by:	Stas Bekman <stas@stason.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90732 13f79535-47bb-0310-9956-ffa450edef68

  Solve a bug I introduced this weekend, we want to compare core_*->r
  as a boolean, not by value.

  Reported by: Barrie Slaymaker <barries@slaysys.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90729 13f79535-47bb-0310-9956-ffa450edef68

about what to do with different request methods.  It's true that mod_include
in 1.3.x did not allow POST, but back then it was a handler.  Now it's a
filter and can be used to filter the output of dynamically generated responses,
even ones resulting from a POST request.  So if mod_include is in the filter
stack, it should just blindly parse the brigade regardless of request method.

This still fixes the security problem, it just fixes it by being more flexible
rather than less so.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90728 13f79535-47bb-0310-9956-ffa450edef68

for mod_include.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90727 13f79535-47bb-0310-9956-ffa450edef68

return a value?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90726 13f79535-47bb-0310-9956-ffa450edef68

(foo** just doesn't work the way we sometimes might want :( )


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90725 13f79535-47bb-0310-9956-ffa450edef68

over an HTTPS connection.  This also adds an ap_remove_input_filter
function, which should be used to remove the SSL input filter in this
case, as soon as this code is stressed a bit more.

For right now, we are sending the same message that we used to send in
mod_ssl for Apache 1.3.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90724 13f79535-47bb-0310-9956-ffa450edef68

  Regroup some of the headers in the win32 module, to make the distinction
  between modules/http and server/ a bit clearer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90721 13f79535-47bb-0310-9956-ffa450edef68

  Final additional comments (for the moment) about the new optimization.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90716 13f79535-47bb-0310-9956-ffa450edef68

in the generated EXTRA_LIBS in config_vars.mk (at least on Linux 2.4).

APR already determines if we need nsl, socket - checking for it in httpd
is merely redundant.

None of the code in httpd-2.0 seems to deal with HAVE_GMTOFF as all of
that code was moved to APR a long time ago.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90715 13f79535-47bb-0310-9956-ffa450edef68

  Further optimization to location_walk() and clean up unused variables.

  We will note the end result of the merge, and if remains the same through
  the second pass, we have nothing whatsoever to do :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90714 13f79535-47bb-0310-9956-ffa450edef68

  Clean up location_walk, so that this step performs a minimum
  amount of redundant effort (it must be run twice, but it will no
  longer reparse all <Location > blocks when the request uri
  hadn't changed.)

  The location walk block is refactored, with some significant changes
  in variable names for legibility.  Cooler still, it uses pool data
  instead of 'notes' for the important cache info :)

  Note the patch builds the <Location > per dir config from _nothing_,
  and then merges it into the per_dir_config.  When the underlying
  per_dir_config changes between passes, the location_walk can simply
  tack back on this preconstruct onto the new per_dir_config.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90713 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90712 13f79535-47bb-0310-9956-ffa450edef68

  I think this statement makes more sense, please ask if it isn't clear.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90711 13f79535-47bb-0310-9956-ffa450edef68