Fix a null pointer dereference in the merge_env_dir_configs function of
the mod_env module. PR 11791     [Paul J. Reder]


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

similar to Apache/2.0

Also surfaced the directive in the standard config, defaulting to FULL


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

dbm rewrite maps

use dbm:filename for the default type

use dbm=TYPE:filename for a non-default type


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

maps.

For now, the SDBM dbm flavor is always used.  It won't be compatible
with dbm rewrite maps built for Apache 1.3 until apr-util supports
ndbm and mod_rewrite is changed to prefer ndbm over the built-in
sdbm.

PR:         10644


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

the inappropriate use of nonblocking reads.  Also get rid of the stderr
altogether since mod_rewrite never uses it.

PR: 9534


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

Submitted by: Paul J. Reder
Reviewed by: Jeff Trawick

Fixes required to get quoted and escaped command args working in
mod_ext_filter. There are also fixes in APR that were submitted
via a patch to apr_cpystrn.c PR 11793


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

Submitted by:	Brett Hutley <brett@hutley.net> J.D. Silvester <jsilves@uwo.ca>


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

  Fix bug reported as PR 11854.


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

Bug #11213
Obtained from: Ian Darwin <ian779@darwinsys.com>

Reviewed by:   Ian Holsman


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

Obtained from:
Submitted by:	Alexey Panchenko alexey@liwest.ru
Reviewed by:


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

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

connections (previously, the setaside code in the core output
filter would copy file buckets <8KB into the heap, resulting
in poor keepalive performance)


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

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

  Security rollup for 2.0.40 release.  Tag and roll baby.


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

  Notations for win32/iconv, and fix a typo


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

chain.
PR:
Obtained from:
Submitted by:	Peter Van Biesen <peter.vanbiesen@vlafo.be>
Reviewed by:	Graham Leggett <minfrin@apache.org>


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

This will allow things like...
SetEnv gzip-only-text/html 1
BrowserMatch "GECKO" gzip-only-text/html=0

Obtained from: Andr� Schild <A.Schild@aarboard.ch>
Reviewed by:   Ian Holsman


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

  Wasn't the only one with the essential idea, co-credit where credit is
  due.


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

  This was never a 'vulnerability'... the APR_FILEPATH_SECUREROOT flag
  passed to apr_filepath_merge refused to merge any rooted 'addpath'.
  However, that isn't the traditional 1.3 behavior, so fly past any
  leading '/'s on the way to merging the uri to the DocumentRoot.

PR: 10946


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

  worth noting


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

an environment variable.  Add the ability to register a filter of
type other than AP_FTYPE_RESOURCE.


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

We needed to compare on the value we pass to apr_sockaddr_info_get(),
not the IP address string.  Sometimes this is an IP address string
and sometimes it is a host name.  Otherwise, on the second pass
through this code we won't find the existing listen_rec for a Listen
directive which had a host name, and we'll create a new listen_rec
and try to bind again to the same addr/port.

PR:                  11030
Helped immensely by: David Shane Holden <dpejesh@yahoo.com>,
                     who debugged it and submitted a patch which
                     showed the problem; a much simpler change was
                     committed though


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

make sure we can actually bind to an AF_INET6 socket before
deciding that we should default to AF_INET6.  This fixes a startup
problem on certain levels of OpenUNIX.

PR:        10235


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

PR:
Obtained from:
Submitted by:
Reviewed by:


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

Submitted by: Shantonu Sen <ssen@apple.com>


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

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

the response should be filtered.  Previously, "intype=text/html"
wouldn't match something like "text/html;charset=8859_1".


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

Submitted by:              Craig Sebenik <craig@netapp.com>
Reviewed by:               Jeff Trawick


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

  Solve C-L post body reads from the HTTP_IN by ap_get_brigade() so that
  we know -immediately- that we've read the last of the data.  This patch
  adds an EOS bucket to the brigade if ctx->remaining has been consumed.

Reviewed by:	Justin Erenkrantz


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

Submitted by:                      Shoichi Sakane <sakane@kame.net>
Reviewed and modified slightly by: Jeff Trawick


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

Submitted by:	Peter Poeml <poeml@suse.de>
Reviewed by:	Justin Erenkrantz


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

Submitted by:	Peter Poeml <poeml@suse.de>
Reviewed by:	Justin Erenkrantz


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

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

for the benefit of people running multithreaded MPMs or lots
of vhosts


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

  Final tweak and CREDITs ... switch the order to simplify things, and
  pull out the old dependency on ApacheMonitorVersion.rc


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

  While this fixed the bug, no resources were build for ApacheMonitor,
  so the application couldn't start.


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

PR:                        10617
Submitted by:              Arthur P. Smith <apsmith@aps.org>
Reviewed/modified by:      Jeff Trawick


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

This moves around the order of compilation around so that the error goes
away.
PR:	10130
Submitted by:	James Cox [imajes@php.net]


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

 This clears the list of renames pending in apr-util.
 Parts of this list was alreadu done, but the pending list hadn't been updated.

 apr_hook_debug_current     from apr_current_hooking_module
 apr_hook_debug_show        from apr_show_hook

 apr_hook_global_pool       from apr_global_hook_pool
 apr_hook_sort_all          from apr_sort_hooks

 apr_uri_port_of_scheme     from apr_uri_default_port_for_scheme
 apr_uri_unparse            from apr_uri_unparse_components
 apr_uri_parse              from apr_uri_parse_components
 apr_uri_parse_hostinfo     from apr_uri_parse_hostinfo_components

 apr_uri_t                  from apr_uri_components

 All APR_URI_*              from all APU_URI_* symbols
 All APR_UNP_*              from all UNP_* symbols

PR:
Obtained from:
Submitted by:	 Thom May
Reviewed by:


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

to avoid the overhead of brigade creation and deletion.  (This produced
a 5% reduction in the total CPU usage of a minimalist httpd configuration:
<JHEPKCEMGPKFFDHHDDKDMELFEKAA.bill@wstoddard.com>)


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