I am a committer so remove my Email address.

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

not valid in htaccess,  http://httpd.apache.org/docs/2.4/mod/mod_cache.html#comment_1510



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


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


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


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

Fix command line parsing. This was introduced in r1395253 when refactoring the code.
Untested
PR 55264 <jrhett netconsonance com>
Submitted by: jailletc36
Reviewed/backported by: jim


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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1506142 13f79535-47bb-0310-9956-ffa450edef68
axe original htaccess proposal for helping mpm-itk; +1 and promote the new one

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

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

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

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

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

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

1-arg SetEnv is valid

http://httpd.apache.org/docs/2.2/mod/mod_proxy_http.html#comment_1528




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

add a note that proxy environment variables are either set or unset, 
unless specific values are listed.



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


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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1507644 13f79535-47bb-0310-9956-ffa450edef68
Merge r1389339, r1498880 from trunk:

add pre_htaccess hook; in conjunction with earlier dirwalk_stat
and post_perdir_config hooks, this should allow mpm-itk to be
used without patches to httpd core



Replace pre_htaccess hook with more flexible open_htaccess hook

Submitted by: trawick, sf
Reviewed/backported by: jim


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

Fix bug #55304 with the provided patch, slightly reformatted.

In short: do not validate conditions of a COPY source's parent since
it is not modified during the operation.

* modules/dav/main/mod_dav.c:
  (dav_method_copymove): adjust params to dav_validate_request()

Submitted by: gstein
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1507681 13f79535-47bb-0310-9956-ffa450edef68
Merge r1481396, r1502665 from trunk:

update log tags

replace duplicate, add missing


reflow a very long line, no functional change

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


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