vote

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

Comment on TLSv1.1/.2 patch.

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

vote, comment

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

  Patch and STATUS updated to reflect the fix to [+]SSLv2 noted by kbrand.

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

Update.

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

xforms

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

add a link to Windows platform documentation

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

another easily-reviewed patch

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

a few votes on simple patches

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

mod_log_config: %{abc}C truncates cookies whose values contain '='.
PR 53104

Backport of r1328133 from trunk resp. r1359690 from 2.4.

Submitted by: gregames
Reviewed by: trawick, wrowe
Backported by: rjung

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

core: (dummy_connection): Destroy tmp pool and
return on connect() failure. Fixes small memory
leak for Unix MPMs in parent process if connect()
failed when waking up children.

Backport of r1300171 from trunk resp. r1301649 from 2.4.x.

Submitted by: jorton
Reviewed by: trawick, wrowe
Backported by: rjung

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

mod_proxy_balancer: fix error message implying recovery
during a markdown.

Backport of r1299738 from trunk resp. r1301194 from 2.4.x.

Submitted by: covener
Reviewed by: trawick, wrowe
Backported by: rjung

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

comment

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

vote.

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

Vote, promote obvious fixes

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

mod_negotiation: Escape filenames in variant list
to prevent an possible XSS for a site where untrusted
users can upload files to a location with MultiViews
enabled.

SECURITY: CVE-2012-2687 (cve.mitre.org):

Submitted by: Niels Heinen <heinenn google.com>

Reviewed by: trawick, wrowe
Backported by: rjung

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

Looks sensible, allows workaround of a regression for cautious users

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

Vote and promote

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

vote on some simple proposals

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

mod_proxy_ajp: Add support for 'ProxyErrorOverride on'.

PR: 50945
Submitted by: Peter Pramberger <peter pramberger.at>, jim
Reviewed by: igalic, rpluem
Backports: r1087864

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

mod_ssl: Add SSLProxyMachineCertificateChainFile directive uses openssl
to construct a chain for each proxy cert. When a remote server requests
a client certificate that is NOT the direct issuer of any available client
certificate, the chain for that certificate will be used to trace it to a
known CA and that client certificate will be used.

Submitted by: druggeri
Reviewed by: kbrand, rpluem
Backports: 1160863,1162103,1170833,1172010,1175946,1242089

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

mpm_event, mpm_worker: Remain active amidst prevalent child process
resource shortages.

Submitted by: trawick
Reviewed by: wrowe, rjung

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

Updates.

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

Fixed broken *_DECLARE_DATA section.
Seems our preprocessor is some crazy and inserts a blank
after replacing a define which made the awk script fail.
Patch submitted by: normw gknw net (Backport r1305192).

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

Sync NetWare modules makefile with 2.4.x branch.
Make Make sure that we clean up the ldap module folder;
renamed build vars.

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

NetWare build tweaks.
mwccnlm: search directory of referencing file first for #includes.
Make use of CFLAGS from environment.
Added default maxerrors value 1 so that the compiler breaks
after 1st error; can be overwritten with CC_MAX_ERRORS var.
(partly backport of r1371164)

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

Give some love to 2.2.x: ddd a round of backports,
which are already part of trunk and 2.4.

The list includes any fixes applied to 2.4 between
March 15 and July 19 2012.

Most of them easy to review, some not.
Unfortunately especially the important backport of
AllowAnyURI needs two additional prerequisite backports.

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

Vote, promote

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

Update.

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

Agreed

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

(mpm_event, mpm_worker: Remain active amidst prevalent child process
resource shortages.)?

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

Merge r136634 from trunk:

mod_proxy_balancer: Restore balancing after a failed worker has
recovered when using lbmethod_bybusyness.

PR: 48735

Markus Stoll and Adam C both submitted patches against 2.2.x
to bug 48735.  Compared with those two, this solution

1. resets the busy field in the error-ed worker at the end of
   the request instead of at recovery time
2. leaves the lbstatus field alone
3. covers all possible scenarios where the busy field in the
   error-ed worker needs to be adjusted, since a cleanup to
   perform the decrement is registered at the point of the
   increment

Submitted by: trawick
Reviewed by: druggeri, rpluem

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

Merge r1301111 from trunk:

mod_dumpio: Return an error code from a previous input filter

PR: 52914
Submitted by: sf
Reviewed by: rjung, trawick

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

WinNT MPM: Fix INVALID_SOCKET bogosity

The related code and a lot more was removed from trunk in r730828.

This doesn't address any reported problem symptom.

Submitted by: trawick
Reviewed by: druggeri, rpluem

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

Merge a subset of r1363440 from trunk:

mpm_worker: Fix cases where the spawn rate wasn't reduced after
child process resource shortages.
(Note: mpm_event is omitted from this backport proposal because of
 missing prerequisite fixes.  Even mpm_worker has a tiny issue,
described in comments in the code.)

Submitted by: trawick
Reviewed by: rjung, rpluem

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

Backport r1306409 from trunk:

* Add the forcerecovery balancer parameter that determines if recovery for
  balancer workers without considering the retry value of workers is enforced.
  There might be cases where an already overloaded backend can get into deeper
  trouble if the recovery of all workers is enforced without considering the
  retry parameter of each worker

Submitted by: rpluem
Reviewed by: rpluem, sf, rjung

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

* promote

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

* Vote

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

vote

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

Add a missing paren

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

Comment spelling fix.

CTR

Backport of r1368131 from trunk resp.
r1371935 from 2.4.x.

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

bad header doxygen: ap_rflush does not return the number
of bytes flushed, it returns 0 on success, -1 on error.

Should be CTR.

Backport of r1368393 and r1368396 from trunk
resp. r1371930 from 2.2.x.

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

xforms

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

Add forgotten replacement argument to Header
directive docs.

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

xforms

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

fix broken link

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

Fix broken link

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

typo fix

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

xforms

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

typo fixes

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

typo fixes

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

typo fixes

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

some more typo fixes

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

typo fixes

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

grab r1370907 from trunk:

fix subversion project URL

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

A quick build.sh revealed the docs have fallen a bit out of sync

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

sf, kbrand please re-review, picked up on your suggested changes in
a newly revised patch.

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

As released

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

vote, promote, propose

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

Backporting r1369725 to 2.2. For some reason, rbowen's previous fix was overwritten.

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

Merge r1369568 from trunk:

bytes is not a unit of filename

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

grab r1369435 from trunk:

fix documented default value of ScoreBoardFile

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

(mod_proxy_balancer: Restore balancing after a failed worker has
recovered when using lbmethod_bybusyness.  PR 48735.)?

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

Fix typo in docs
(miscomception ->misconception)

Backport of r1367778 from trunk resp.
r1367779. from 2.4.x.

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

update transformations.

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

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

That patch needs some work

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

Vote.

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

Merge r1363183 from trunk:

mpm_prefork: Reduce spawn rate after a child process exits due to
unexpected poll or accept failure.

Submitted by: trawick
Reviewed by:  jorton, rjung

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

Vote, promote.

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

xforms

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

some final typo fixes

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

more typo fixes

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

xforms

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

typo fixes

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

another simple MPM fix...

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

Vote.

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

fix a couple of silly typos, already fixed in later branches

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

simple prefork fix, y'all?

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

merge r1363186 from trunk:

modernize some commentary on APEXIT_foo values

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

xforms

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

Change the "abc$" example to something else, since it wouldn't work.

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

typo fix

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

xforms

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

Merge r1364309 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

copy the context restrictions from sections.html for symlink
related options

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

Disable highlighting for those cases where a backport brings along the new <highlight> syntax.

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

xforms

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

Backport some minor changes to the developer docs.

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

xforms

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

Backport some more, small changes.

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

xforms

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

Some more backports of information from trunk that applies to 2.2 as well.

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

xforms

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

Backport a few changes from trunk that also apply to 2.2

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

xforms

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

Remove .* from the equation in the "<Directory ~ ..." example.
Submitted by: Daniel (comment #143 on site)

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

Replace highlighter css, in case we replace <example> with <highlight> while backporting changes, so they don't stand out as ugly white fields.

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

fiw newlines

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

xforms

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

<highlight> -> <example>

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