I am not comfortable with this solution for making the flushing band aid configurable. I do not oppose the concept, just the placement of the configuration information inside of the mod_proxy core, and not in mod_proxy_ajp.

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

Merge r389697 and r390499 from trunk, making mod_disk_cache return better error codes, instead of a silly APR_EGENERAL.

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

Merge r390573 from trunk:
  With all of the, uhm, interesting manners in which httpd
  can be built and installed, let's ensure httpd -V gives the
  reporter a chance to identify the APR flavor used to compile
  and to run httpd when reporting bugs.

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

Move up accepted Patches.

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

Merge r354630 from trunk:

If a connection aborts while waiting for a chunked line, flag the connection as
errored out and send errors upwards.

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

Vote early, vote often

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

Vote on a good feature :)

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

  Low hanging fruit, so low you'll trip over it.

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

vote on the mod_disk_cache fix.

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

Fix a race condition when creating the connection pool mutex and make sure that memory is being allocated from the correct pools when connections are being established. Enforce the GLOBAL_ONLY parameter for all of the directives.

Reviewed by: bnicholes, trawick, jim

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

* Fix report number

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

* actually two patches are needed for this. Add missing patch and reset voting.

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

Vote on the mod_disk_cache change

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

Add a fix for mod_disk_cache to the voting.

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

* Small formating change

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

Merge r370172, r371132 from trunk:

* Insert the HTTP_IN filter uncondionally before we call
  ap_send_error_response or ap_die. This ensures that
  ap_discard_request_body called by ap_die and by ap_send_error_response works
  correctly on status codes that do not cause the connection to be dropped and
  in situations where the connection should be kept alive.

PR: 38123
Reviewed by: rpluem, niq, jerenkrantz

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

* Move security fixes at the beginning of the changelog

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

  *) Fix mis-shifted 32 bit scope, masked to 64 bits as a method.
     [Will Rowe, Joe Orton]

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

Committed

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

Merge r378032 from trunk:

  *) mod_proxy: Fix KeepAlives not being allowed and set to
     backend servers. PR38602. [Ruediger Pluem, Jim Jagielski]

Also, document previous patch:
  *) Correctly initialize mod_proxy workers, which use a
     combination of local and shared datasets. Adjust logging
     to better trace usage. PR38403. [Jim Jagielski]

Reviewed by: jim

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

Cast a vote and bubble it up.

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

Two baked apples.

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

Merge r389797 from trunk:

* build/instdso.sh: Fix syntax error with some sed implementations.

PR: 38108
Submitted by: Masaoki Kobayashi <masaoki techfirm.co.jp>
Reviewed by: jorton, rpluem, pquerna

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

Merge r382799 from trunk:

* modules/ssl/ssl_scache_shmcb.c (shmcb_safe_clear): Mark with
"noinline" attribute for GCC > 3.

PR: 38838
Reviewed by: jorton, rpluem, pquerna

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

+1 for an ldap configuration change

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

Move up accepted backports.

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

Vote.

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

* Cast some votes and promote one proposal

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

Propose a backport: make the Flushing Bandaid for AJP
runtime configurable.

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

Merge accepted backport...

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

Sync up with trunk CHANGES entry

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

Merge r371013 from trunk:

* Fix PR38340 by actual getting the word and thus advancing the message buffer
  pointer to the next data.

Submitted by: Aleksey Pesternikov <apesternikov yahoo.com>
Reviewed by: Ruediger Pluem

Submitted by: rpluem
Reviewed by: jim

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

Merge r374929 from trunk:

* Do not overwrite the status of initialized workers and respect the configured
  status of uninitilized workers when creating a new child process.

Submitted by: rpluem
Reviewed by: jim

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

Merge r383339 from trunk:

* Crosscheck the length of the body chunk with the length of the ajp message
  to prevent readings beyond the buffer boundaries which possibly could reveal
  sensitive memory contents to the client.

Submitted by: rpluem
Reviewed by: jim

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

Fruit hanging low.

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

Cast a vote

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

PR#39133
Remove "cyberthugs.com" and other real (or potentially real)
examples from deny lists in access control howto.

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

Update the APR dependancies to at least v1.2.0. Add the missing file-cache
module to the cache family of modules in the RPM.

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

  Recast this vote in terms of all fixes required to use mod_isapi on Unix.

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

  Axe a previously axed reference to an unused build-time
  generator.

backport 387743

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

Reset the vote on the util_ldap.c backport proposal due to changes in the patch after some discussion on the dev-list.

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

bookkeeping for backport of 327008

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

why can't we all just use malloc and free

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

mod_ldap backport

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

And move approved backport to the right spot...

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

Cast a vote

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

- Add some votes.
- for the mod_proxy_balancer fix, move it up to accepted.

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

Document DBD connection strings

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

merge from trunk:

   core: Fix up botched status lines (mismatch with r->status or
         just badly formatted)

reviewed by: jerenkrantz, jorton

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

merge fix to mod_speling crash when r->filename is not set

Reviewed by: jerenkrantz, jim

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

  Easy backport to consider

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

  uri_delims moved to aprutil EONS ago

Backports 384622

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

  We no longer generate uri_delims for apr 1.x, but the table
  is hardcoded in apr_uri.c.

Backports 384608

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

Yahoo!! *Finally* have some free cycles to hack around.
Cast votes.

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

* Add two more proposals for backport

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

* Propose some backports

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

* The "Correctly error out if we get an error from upstream response." has
  been accepted for backport.

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

vote

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

  Coexist with multiple releases of APR, we only promise to die
  using APR 1.1 and earlier.

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

  Resubmit patch (can't demonstrate against trunk/ after refactoring),
  reset votes.

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

Vote

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

Cast some votes and remove my showstopper (which can be mitigated through
other means)...

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

merge from trunk perhaps?

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

update transformation

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

Fix mod_asis docs re: use of HTTP/CGI headers.

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

update transformation

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

update german translation to english revision 378921

Reviewed by: nd

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

Name the Apache HTTP Server properly by using its official name
'Apache HTTP Server' or 'Apache HTTPd' (short form of Apache HTTP daemon)
or using the program name 'httpd'.

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

update and fix typo.
English Revision: 290427

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

Format consistently.

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

update transformation

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

fix xml and semantic validity

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

Use absolute links as pointed out by nd and joshua

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

PR#38521 - fix link.

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

* Backported proposal as r374931. This makes the showstopper obsolete.

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

Merge r367798 from trunk:

* Fix PR38017 by handling the selection of the hostname in the same way for
  non proxied and reverse proxied requests.

  We need to handle both cases in the same manner as for the reverse proxy
  case we have the following situation:

  If a cached entry is looked up by mod_cache's quick handler r->proxyreq
  is still unset in the reverse proxy case as it only gets set in the
  translate name hook (either by ProxyPass or mod_rewrite) which is run
  after the quick handler hook. This is different to the forward proxy
  case where it gets set before the quick handler is run (in the
  post_read_request hook).
  If a cache entry is created by the CACHE_SAVE filter we always have
  r->proxyreq set correctly.
  So we must ensure that in the reverse proxy case we use the same code
  path and using the canonical name seems to be the right thing to do
  in the reverse proxy case.

PR: 38017
Submitted by: rpluem
Reviewed by: rpluem, wrowe, colm

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

Clarify a vote; remove a backport completed.

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

  Solaris build fixes; don't fail on missing .h files within
  a VPATH build, and don't test trees with -d (simply -f the
  expected files) in case a tree such as srclib/apr is actually
  a symlink rather than a true directory in ./buildconf.

Reviewed by: wrowe, rpluem, colm
Backports: 374821

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

cast some votes

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

Fix PR#38070
Avoid server-driven negotiation when a script has sent a Status: header.

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

  Hard to be agreeing in 2.0 without accepting this same fix in 2.2

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

Cast a vote

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

* Vote, move proposal to the end of list, correct URL to backport version
  of the patch.

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

  Propose VPATH / symlink srcdir/apr[-util] fixes

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

Propose backport of fix to PR#38070

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

Project name changed in Bugzilla when we released 2.2

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

A few more terms added to the regex vocabulary lesson.

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

* update transformation

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

Merge r373585 from trunk:

* Remove link to CacheSize as this directive is no longer present.

PR: 38449
Submitted by: Bjoern Voigt <bjoern cs.tu-berlin.de>

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

Removing unregistered mime types.

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

Add the m4a and m4b mime types, so that podcasts in these formats work
without configuration changes.

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

Vote

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

Joe's fix to avoid feeding C99 to C++ compilers

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

vote + promote

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

Fixing up typos

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

Make the DAV example actually work when included
in the default config by allowing access.

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

Merge r371933 from trunk:

Use HTMLTable option in the config example so that directory listings will satisfy
people concerned about html spec compliance.

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

Backport of mod_rewrite reference manual fixes

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

Backporting updated example to 2.2

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

Set the LDAP protocol before setting extended LDAP options. [PR38146]

Submitted by: Aaron Richton <richton nbcs.rutgers.edu>
Reviewed by: bnicholes, wrowe, rpluem

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