format

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

propose LDAP fix

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

Move chunk-size fix to SHOWSTOPPERS and try to improve SSLCertificateChainFile
info (=> warning) proposal.

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

vote/promote SSLCertificateChainFile depreciation noise restraint

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

Rebuild.

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

XML update.

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

Rebuild.

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

XML update.

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

revert my -1

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

-1 vote w/ comment

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

Propose fix for 2.4.14's regression.

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

movte

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

Rebuild.

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

XML updates.

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

Update SSLCertificateChainFile proposal.

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

Add 421 to ALPN (being worked) proposal.

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

Propose and move ALPN proposal to being worked.

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

update transformations.

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

update for sync with English docs.

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

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

And we are 2.4.15-dev

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

Get ready to tag 2.4.14

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

Merge r1667386 from trunk:

Followup to r1667385, my sandbox was out of date.

Submitted by: covener
Reviewed/backported by: jim

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

Vote.

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

vote

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

xforms

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

note

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

Fix CVE-2015-3185 reference in CHANGES

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

SECURITY: CVE-2015-3185 (cve.mitre.org)

Replacement of ap_some_auth_required (unusable in Apache httpd 2.4)
with new ap_some_authn_required and ap_force_authn hook.

Submitted by: breser
Backports: r1684524
Reviewed by: wrowe, ylavic, jim

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

CVE-2015-3183 Fix chunk header parsing defect.

Remove apr_brigade_flatten(), buffering and duplicated code from
the HTTP_IN filter, parse chunks in a single pass with zero copy.

Limit accepted chunk-size to 2^63-1 and be strict about chunk-ext
authorized characters.

Submitted by: minfrin, ylavic
Reviewed by: ylavic, wrowe, jim
Backports: 1484852, 1684513
Reported by: regilero <regis.leroy makina-corpus.com>

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

Merge r1619453 from trunk

   * mod_deflate: Add missing APLOGNO.

Submitted by: ylavic
Reviewed by: jailletc36, gsmith, druggeri
Backported by: jailletc36

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

Add compatibility note.
Turn some tabs into space.
Remove some useless <br /> in <highlight> blocks. (this was causing some additionnal blank lines at the end of some examples)

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

Add compatibility note

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

Propose

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

Promote

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

Easy vote

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

Rebuild.

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

XML updates.

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

Fix typo

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

easy vote

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

Propose

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

and we are 2.4.14-dev

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

Get ready to tag 2.4.13

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

xforms

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

Merge r1683198 from trunk:

mod_proxy_scgi upgraders likely need to set proxy-scgi-pathinfo

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

Merge r1681795, r1682988, r1682979, r1682819, r1682816 from trunk:

initialize args to not print garbage mem during a RewriteRule parse error

Initialize args to not print garbage mem during a RewriteCond parse error (same as r1681795 for RewriteRule)

Improve style in examples.

Improve error message (related to PR57311 diagnostic)

Concat string at compile time in order to save a few cycles.

Submitted by: covener, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed/backported by: jim

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

Merge r1681694, r1682907 from trunk:

mod_proxy: Don't put the worker in error state for 500 or 503 errors
returned by the backend unless failonstatus is configured to.  PR 56925.

mod_proxy: follow up to r1681694.

Handle the proxy-error-override note also in mod_proxy_ajp.

The note is not needed in mod_proxy_fcgi (which also handles
ProxyErrorOverride) since it calls ap_die() by itself, and always
returns OK to proxy_handler().

Add a comment about the note where used.

Submitted by: ylavic
Reviewed/backported by: jim

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

promote

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

vote

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

Vote.

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

update transformation

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

Propose easy votes

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

Xform.

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

Fix copy and paste docs error.

Backport of r1682937 from trunk.

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

Xforms.

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

Try to clarify extended uses of SSLCertificateFile.

Backport of r1682923 from trunk.

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

Prune resolved discussion, vote.

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

Enlarge proposal.

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

Merge r1629440, r1629441, r1681424, r1681440, r1681685 from trunk:

Style (mostly indent)
remove a useless local variable initialization

More style

Constify + save a few bytes in conf pool (+ some minor space adjustments)

Save a few bytes in conf pool and axe a function that duplicates 'ap_set_string_slot'

Save a few bytes in conf pool
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1682482 from trunk:

PR 57968: Don't lowercase the argument to SetHandler if the handler is
proxy:unix.

Submitted by: covener
Reviewed/backported by: jim

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

Vote, promote, comment.

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

Vote (easier to review with svn diff -x-w).

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

Vote.

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

Rebuild.

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

XML updates.

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

core, modules: Avoid error response/document handling by the core if some
handler or input filter already did it while reading the request (causing
a double response body).

Submitted by: ylavic
Backports: r1482522 (partial, ap_map_http_request_error() things only!),
           r1529988, r1529991, r1643537, r1643543, r1657897, r1665625,
           r1665721, r1674056
Reviewed by: ylavic, minfrin, wrowe

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

propose proxy:unix fix

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

This appears to be promoted

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

Typo

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

Clarify the change to the default cipher suite lists

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

Add changelog entry for r1682074.

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

Drop comment - dependency backport was committed 5-22

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

mod_ssl: fix small memory leak in ssl_init_server_certs when ECDH is used.
SSL_CTX_set_tmp_ecdh increases reference count, so we have to call
EC_KEY_free, otherwise eckey will not be freed.

Backports: r1666363
Author: jkaluza
Reviewed by: rjung, ylavic, wrowe

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

Vote and promote

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

Propose.

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

v4 for ALPN proposal adding r1670738.

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

Vote.

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

v3 for ALPN proposal without one remaining HAVE_TLS_NPN stuff.

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

Propose ALPN support.

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

Vote (fix link).

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

Propose.

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

Propose

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

Rebuild.

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

XML updates.

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

Merge r1679712 from trunk:

Follow up to r1679181: fix warning (return discards qualifiers from pointer target type).

Submitted by: ylavic
Reviewed by: trawick, rjung

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

remove my incorrect claim that we returned 400 in the wrong case

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

Propose

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

Rebuild.

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

XML updates.

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

Rebuild.

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

XML updates.

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

Vote and express promote (since it is such
a simple change).

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

Note that the OCSP stapling improvement partially addressed bug 57131.

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

Vote.

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

warnings :(  but fix is already available from trunk :)

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

Merge r1679032, r1679192, and r1680276 from trunk:

r1679032:

mod_ssl OCSP Stapling: Don't block initial handshakes while refreshing
the OCSP response for a different certificate.  mod_ssl has an additional
global mutex, "ssl-stapling-refresh".

Not mentioned in CHANGES:

Stapling no longer uses a mutex when using a stapling cache
implementation which doesn't require it.  (A further, unrelated
code change to mod_ssl is required to allow the use of memcache
as a stapling cache, and I haven't tested with distcache; thus
it isn't clear if this helps in practice yet.)

r1679192:

Fix regression in check for cached response
(Essentially) Submitted by: ylavic

r1680276:

OCSP stapling: slight simplification to some internal interfaces,
add a few comments and sanity checks

Submitted by: trawick (with assist from ylavic)
Reviewed by: jim, jorton

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

Done.

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

Merge r1420184 from trunk:

* modules/aaa/mod_authz_owner.h: Add header file with optional hook
  declaration for "authz_owner_get_file_group".

* modules/aaa/mod_authz_dbm.c, modules/aaa/mod_authz_groupfile.c: Use
  the header to pick up the above declaration; retrieve the optional
  function in a hook; use a static variable to store the function
  pointer.

Submitted by: jorton
Reviewed by: jkaluza, wrowe, jorton

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

Vote, promote.

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

extremely slow response

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

minor tweaks for readability/grammar

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