Typo

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

xforms

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

Merge r1500323 (add note when default algorithm has been changed) and add
warning about crypt alogrithm from 2.4 man page

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

Updates.

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

Vote.

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

Applied.

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

Avoid including apr_general.h.
The MSVC Resource Compiler truncates macro names at char 31.
Since apr_general.h includes apr.h which in turn includes
system headers we get warnings or errors with the Resource
Compiler with newer system headers (VC10 and later) which
have macro names defined with more than 31 chars.
(backport from trunk r1499742 / httpd-2.4.x r1499855)
Reviewed by: gsmith, sf

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

vote, promote, propose

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

mod_ssl: Fix "SNI for backend" when compiled against
OpenSSL without support for SSLv2.

PR 55194.

Followup to r1497466. Does not apply to trunk or 2.4.x.

Proposed by: rjung
Reviewed by: covener, trawick

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

vote

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

Propose.

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

v+p

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

vote

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

Propose.

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

And on to .26

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

Preparing to tag 2.2.25

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

Slight clarification of CHANGES entry.

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

Fix indentation.
No functional change.

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

Fix indentation (plus now needed line-wrap).
No functional change.
Followup to r1497435.
Backport of r1497588 (trunk) resp.
r1486454 (2.4.x).

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

Answer question.

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

Re-sort into the right release

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

mod_proxy_http: Use the same hostname for SNI as for the HTTP request when
forwarding to SSL backends.

PR: 53134
Backports: r1333969
Submitted by: Michael Weiser <michael weiser.dinsnail.net>, rpluem
Reviewed by: covener, wrowe, rjung

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

mod_ssl/proxy: enable the SNI extension for backend TLS connections

Backports: r1175416
Submitted by: kbrand
Reviewed by: wrowe, rjung, trawick

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

mod_dav: Do not segfault on PROPFIND with a zero length DBM.

PR: 52559
Backports: r1476645
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: rjung, wrowe, trawick

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

mod_dav: Do not fail PROPPATCH when prop namespace is not known.

PR: 52559
Backports: r1476644
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, wrowe, rjung

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

mod_dav: When a PROPPATCH attempts to remove a non-existent dead
property on a resource for which there is no dead property in the same
namespace httpd segfaults.

PR: 52559
Backports: r1476642
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, wrowe, rjung

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

Reorder and regroup a bit for clarity

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

core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
on Linux kernel versions 3.x and above.

PR: 55121
Backports: r1496429
Submitted by: Bradley Heilbrun <apache heilbrun.org>
Reviewed by: trawick, wrowe, rjung

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

vote/promote

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

mod_dav: Sending an If or If-Match header with an invalid ETag doesn't
result in a 412 Precondition Failed for a COPY operation.

PR: 54610
Submitted by: Timothy Wood <tjw omnigroup com>
Backports: r1476604 (2.4: r1486456)
Reviewed by: minfrin, wrowe, rjung

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

add CHANGES entries for r1497429

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

mod_dav: Make sure that when we prepare an If URL for Etag comparison,
we compare unencoded paths.

PR: 53910
Submitted by: Timothy Wood <tjw omnigroup com>
Backports: r1470940, r1477530
Reviewed by: minfrin, wrowe, rjung

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

  * core: Limit ap_pregsub() to 64MB, add ap_pregsub_ex() for longer strings.
    The default limit can be adjusted at compile time using AP_PREGSUB_MAXLEN.
    mod_setenvif: Log error on substitution overflow.

Submitted by: trawick
Reviewed by: trawic, wrowe, covener

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

promote regex limit

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

mod_proxy_balancer: Add failontimeout parameter. Timeout will put worker
in error state if an IO timeout is detected.

Backports: r1465839
Submitted by: druggeri
Reviewed by: druggeri, wrowe, rjung

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

Votes, promotions

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

Vote, comment, propose.

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

Fix build breakage introduced by the backport
in r1497101.

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

Missed a source Copyright

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

Clean up cruft

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

mod_dav: Ensure URI is correctly uriencoded on return.

PR: 54611
Backports: r1476621
Submitted by: Timothy Wood <tjw omnigroup com>
Reviewed by: minfrin, trawick, wrowe

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

votes, promote one

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

Additional info for reviewers

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

Mop up cruft from r1497095 merge

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

mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn with
the source href (sent as part of the request body as XML) pointing to a
URI that is not configured for DAV will trigger a segfault.

Backports: r1485668
Reviewed by: minfrin, trawick, wrowe
Submitted by: Ben Reser <ben reser.org>

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

mod_cache: Fix uninitialized tmppath variable.

PR: 54949
Submitted by: <jkaluza redhat.com>
Reviewed by: minfrin, trawick, wrowe

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

mod_ssl: Catch missing, mismatched or encrypted client cert/key pairs
with SSLProxyMachineCertificateFile/Path directives.
(check at startup, to prevent segfaults at proxy request time)

PR: 52212, 54698
Backports: r1374214, r1374216, r1375445, r1467593
Submitted by: Keith Burdis <keith burdis.org>, Joe Orton, Kaspar Brand
Reviewed by: kbrand, minfrin, wrowe

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

mod_authnz_ldap: Allow using exec: callouts like SSLPassphraseDialog
for AuthLDAPBindPassword.

Backports: r1433478, r1467523, r1467792
Submitted by: druggeri
Reviewed by: minfrin. wrowe

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

Those who did the real work backporting this headache should
take most of the blame^Wcredit.

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

Promote pcre fix to SHOWSTOPPER for one more review

Vote and promote two patches

Propose backporting enable SNI for proxy to address concerns with another
patch (sorry for breaking protocol and inserting it above the related patch
which suggested it is necessary).

Bury three proposals that simply aren't going anywhere as-is.

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

fix typo in reference to this branch

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

SINGLE_LISTEN_UNSERIALIZED_ACCEPT

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

a few votes

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

Sensible solution

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

core: Limit ap_pregsub() to 64MB, add ap_pregsub_ex() for longer strings.

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

svn:eol-style = native

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

bump version.

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

votes, promote

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

Condense

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

grab r1495198 from 2.4.x branch:
fix strange wording

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

Typos in config comments.

Backports of r290940, r713575 and r732816
from 2.4.x.

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

'make docs' xforms

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

revert accidental commit r1487459 (sorry)

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

mergeinfo for r1487458

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

grab r1487451 from trunk:

s/proxy image/proxy/

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

Withdraw proposal.

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

Propose.

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

Let v2.2 users enjoy the goodness. Propose.

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

mod_ssl: Quiet FIPS mode weak keys disabled and FIPS not selected emits
in the error log to debug level.

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1447993
2.2.x patch: http://people.apache.org/~wrowe/httpd-2.2-quiet-fips.patch

Submitted by: wrowe
Reviewed by: druggeri, kbrand

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

Promote, noting wrowe's -1 becoming +1.

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

Propose DAV fixes.

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

update transformation

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

Update.

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

Update.

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

NetWare build: dont make the svn revision file a dependency.

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

* mod_rewrite: Ensure that client data written to the RewriteLog is
  escaped to prevent terminal escape sequences from entering the
  log file. (CVE-2013-1862 (cve.mitre.org))

Submitted by: jorton
Reviewed by: jorton, covener, rpluem

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

* Vote and promote

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

NetWare build: make use of SVN revision optional.

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

Use SVN revision for NetWare dev builds version info.

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

Kill some NetWare build warnings (backport r1481040).

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

xforms

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

some more typos

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

xforms

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

typo fix

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

Remove duplication.

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

Vote.

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

Add note about patch update

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

Update.

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

Vote.

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

Correct the ProxyIOBufferSize docs to match the code. Add a note about the AJP
behaviour as per http://www.mail-archive.com/dev@httpd.apache.org/msg41843.html.

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

htdigest: Fix buffer overflow when reading digest
password file with very long lines.

PR 54893.

Backport of r1475878 from trunk resp.
r1476089 from 2.4.x.

Proposed/Backported by: rjung
Reviewed by: humbedooh, rpluem

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

* Vote and promote

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

Update proposal with 2.4 reference.

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

vote

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

Propose.

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

mod_proxy_balancer: Correct doubled-slash ProxyPassReverse

PR:           51489 51982
Backports:    r1386576, r1386578
Submitted by: jimjag
Reviewed by:  wrowe, druggeri, humbedooh

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

vote + promote

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

vote

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

Propose minor security fix for mod_rewrite.

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

update comment, and move proposal to stalled section for 2.2.x, too

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