"new" patch is only a rediff without these conflicts.


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

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

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

gen_test_char: add double-quote to the list of T_HTTP_TOKEN_STOP.

PR: 9727
Submitted by: Ville Skytt <ville.skytta iki.fi>

Submitted by: fielding
Reviewed by: jim


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

   mod_jk functionality.
      http://svn.apache.org/viewvc?view=rev&revision=627728



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

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

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

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

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

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

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

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

hanging
fruit



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

UserDir accepts multiple file paths. Submitted by: Vincent Jong <megaspaz tron.megaspaz.net>

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

Merge r635137 from trunk:
Pet peeve: fix capitalisation of 'Require' directive

Merge r450473 from trunk:
Minor typo


Merge r545834 from trunk:
Fix a typo, as per PR 40447.

Submitted by Tony Stevenson.

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

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

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

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

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

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

   http://svn.apache.org/viewvc?view=rev&revision=645813


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

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

Reinstate location walk for subrequests
PR 41960 (Jose Kahan)

Submitted by: niq
Reviewed by: jim


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

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

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

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

note that KeepAliveTimeout of the first defined virtual host 
in the set of NameVirtualHost will be used

PR: 36770

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

Submitted by: Nilgün Belma Bugüner <nilgun belgeler.org>
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@655460 13f79535-47bb-0310-9956-ffa450edef68

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

- try to add a note to explain the behaviour of clients use a pipelined
  connection wrt to MaxRequestsPerChild and KeepAlive.

Merge r413683 from trunk:
A little bit more detail, and an example, for how DocumentRoot is
handled. Examples good.

Merge r449032 from trunk:
Capitalization consistency
Submitted by Vincent Bray

Merge r649076 from trunk:
Replace reference to obsolete RFC. Submitted by: Igor Galić.

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

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

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

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

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

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

    enhanced error logging:
      http://svn.apache.org/viewvc?view=rev&revision=646845
    -f option to create logfile ASAP:
      http://svn.apache.org/viewvc?view=rev&revision=632355
    PR 40183. Don't leak memory when reopening the logfile:
      http://svn.apache.org/viewvc?view=rev&revision=615901
    avoid extra apr_time_now() calls and code bloat:
       http://svn.apache.org/viewvc?view=rev&revision=600154

Reviewed by: wrowe, covener, trawick



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

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

corresponding CHANGEs entry, so I grabbed from trunk


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

lacked updates to the doccos and so really shouldn't
have been approved as is, but what the heck, so I
went ahead and pulled the doccos changes from the orig
commit anyway. Also, since this is a userland change,
it should really have a CHANGES entry too, so I added
one of those as well :)


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

Use the correct markup for the httpd program.

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