Create backport branch for r1578311.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1578311@1578312 13f79535-47bb-0310-9956-ffa450edef68
Merge r1578273,1578311 from trunk, resolving tree conflict caused by file split

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1578311@1578314 13f79535-47bb-0310-9956-ffa450edef68
Record a merge of r1578326, and apply a similar fix on the branch

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1578311@1578327 13f79535-47bb-0310-9956-ffa450edef68
Create backport branch.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1584342@1584350 13f79535-47bb-0310-9956-ffa450edef68
On 1.8.x-r1584342 branch: merge r1581810 and 1584342, resolve text
conflicts for 1584342.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1584342@1584362 13f79535-47bb-0310-9956-ffa450edef68
Fixes to build 1.8 with apr 0.9.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-apr-0.9@1585493 13f79535-47bb-0310-9956-ffa450edef68
On 1.8.x-apr-0.9 branch, support for 0.9.x including 0.9.20.

* configure.ac
  (APR_VER_REGEXES): Allow 0.9.2?.
 
* subversion/include/private/svn_dep_compat.h
  (apr_hash_make_custom): Provide.

* subversion/tests/libsvn_wc/utils.c
  Include svn_dep_compat.h.

* subversion/libsvn_subr/prompt.c
  (terminal_open): Use compatibility names.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-apr-0.9@1585499 13f79535-47bb-0310-9956-ffa450edef68
Create backport branch for r1577151

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1577151@1589064 13f79535-47bb-0310-9956-ffa450edef68
Merge r1577151, resolving minor conflicts in test suite.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1577151@1589066 13f79535-47bb-0310-9956-ffa450edef68
Merge the r1545835 group from trunk:

 * r1545835, r1545845
   Prevent use with known buggy versions of httpd.
   Justification:
     Signal to our packagers that these versions have issues that they either
     need to upgrade or patch around.
   Votes:
     +1: breser, rhuijben, danielsh


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1589569 13f79535-47bb-0310-9956-ffa450edef68
Merge r1587968 from trunk:

 * r1587968
   Maintain data[len]=0 invariant for svn_string_t.
   Justification:
     Code may rely on null byte being present.
   Notes:
     Triggers a read beyond allocated memory on trunk but no known
     misbehaviour on 1.8.
   Votes:
     +1: philip, rhuijben, stefan2


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1589570 13f79535-47bb-0310-9956-ffa450edef68
Merge the 1.8.x-apr-0.9 branch:

 * 1585499
   Build with apr-0.9.x.
   Justification:
     1.8 claims 0.9 support but it doesn't work.
   Branch:
     ^/subversion/branches/1.8.x-apr-0.9
   Votes:
     +1: philip, rhuijben, stefan2


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1589571 13f79535-47bb-0310-9956-ffa450edef68
Merge the 1.8.x-r1584342 branch:

 * r1581810, 1584342
   Fix issue 4412, locks lost from working copy with pre-1.6.17 servers.
   Justification:
     Regression from 1.7, makes using locks hard.
   Notes:
     r1584342 is the fix, r1581810 is a test that fails with a 1.6.16 server.
   Branch:
     ^/subversion/branches/1.8.x-r1584342
    (merge before ^/subversion/branches/1.8.x-r1584592)
   Votes:
     +1: philip, rhuijben, stefan2


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1589573 13f79535-47bb-0310-9956-ffa450edef68
Merge the 1.8.x-r1577151 branch:

 * r1577151
   Make 'svn merge' honor the 'preserved-conflict-file-exts' setting.
   Justification:
     While really a behavior change that doesn't belong in a patch release
     I'm guessing nobody knew that we didn't implement this flag in this
     scenario.
   Branch:
     ^/subversion/branches/1.8.x-r1577151
   Votes:
     +1: rhuijben, steveking, stefan2


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1589575 13f79535-47bb-0310-9956-ffa450edef68
Merge the 1.8.x-r1578311 branch:

 * r1578273, r1578311, r1578326
   Make svn_ra_get_locks() and svn_ra_get_lock() report not locked nodes
   with a NULL svn_lock_t *, as documented.
   Justification:
     Many clients use the existence of an svn_lock_t on a node via info/status
     as a boolean to note that there is a lock. But because we didn't properly
     check the result we reported mostly empty svn_lock_t instances in more
     cases. Even on directories!
   Notes:
     A branch is needed, because the serf lock handling code was refactored and
     split to multiple files on trunk.
   Branch:
     ^/subversion/branches/1.8.x-r1578311
   Votes:
     +1: rhuijben, philip, stefan2


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1589577 13f79535-47bb-0310-9956-ffa450edef68
Merge the r1573106 group from trunk:

 * r1573106, r1573209
   A more stringent test for whether the compiler accepts a given option.
   Justification:
     Makes --enable-optimize and --enable-debug work with Solaris CC.
   Votes:
     +1: philip, rhuijben, stefan2


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1589579 13f79535-47bb-0310-9956-ffa450edef68