merge r1390461 from trunk:

memcache test: log a message in verbose mode if memcached isn't running


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1390468 13f79535-47bb-0310-9956-ffa450edef68
merge r1390477 from trunk:

Fix dead server retry logic.

Submitted by: Gavin Shelley <columbusmonkey me.com>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1390482 13f79535-47bb-0310-9956-ffa450edef68
merge these fixes from trunk:

r982408:
- Fix mismatched signed comparisons [1]
- While here replace atoi with strtol(3)

Reported by:	sf via gcc [1]

r982409:
- this is handling the error condition, not success
  [note, testmemcache apparently doesn't hit this path]


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1390509 13f79535-47bb-0310-9956-ffa450edef68
merge r1390526 from trunk:

apr_memcache_server_create(): Fix handling of the ttl parameter.
It is documented as a number of seconds but was treated as 
microseconds.

(The current Subversion release passes seconds.)

PR: 51511
Submitted by: Tim Whittington <timw apache.org>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1390529 13f79535-47bb-0310-9956-ffa450edef68
merge r1389154 and r1389169 from trunk

r1389154:
If --with-crypto was specified without enabling a crypto library, try to
autodetect possible crypto libraries, as long as they haven't been explicitly
disabled.

If you just want OpenSSL regardless of what is available on the system:

  --with-crypto --with-openssl

or

  --with-crypto --without-nss --without-<other>

If a library has to be specified explicitly so that it is found in a
non-default location (--with-nss=$HOME/install/nss), other libraries
won't be automatically enabled.

r1389169:

fix AC_CHECK_HEADER() usage with APU_CHECK_CRYPTO_NSS

The action-if-found is executed if *any* of the headers listed
are found, so only equivalent headers should be searched
with one invocation if action-if-found is used to flag success.

This catches an error such as missing prerror.h at at configure
time instead of at build time.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1390545 13f79535-47bb-0310-9956-ffa450edef68
Revert r1390529; ttl is in microseconds

git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1391194 13f79535-47bb-0310-9956-ffa450edef68
1.5.1 is out


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1394471 13f79535-47bb-0310-9956-ffa450edef68
Merge r1402870 from trunk:

Remove duplicated logic in apr_brigade_puts().

PR: 53740
Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>

Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1403226 13f79535-47bb-0310-9956-ffa450edef68
Merge r1402897 from trunk:

Fix potential data corruption in apr_brigade_write() and friends if
the last bucket of the brigade is a heap bucket that has been split,
and there are still references to the next part of the original bucket
in use.

Submitted by: sf
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1403248 13f79535-47bb-0310-9956-ffa450edef68
Merge 1422413, add CHANGES:

    Split glibc version detection in two #if directives.
    If __GLIBC_PREREQ is undefined, the single-line version expands to
    '#if 0 && 0(2,4)', which causes a syntax error.

    PR: 54275



git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1422415 13f79535-47bb-0310-9956-ffa450edef68
doc fix


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1425359 13f79535-47bb-0310-9956-ffa450edef68
Merge r1426442 from apr trunk:

    Fixup r1422413 so that memset is used on non-glibc platforms

    Noticed by Alan Hourihane <alanh fairlite co uk>


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1426445 13f79535-47bb-0310-9956-ffa450edef68
Merge r1426448:

Fix docs for apr_queue_trypop

PR: 54328
Submitted by: Javier Alcázar <javucho1000 yahoo com mx>


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1426449 13f79535-47bb-0310-9956-ffa450edef68