Merge r582543, r1090093, r1102978, r1909474, r1909585, r1909586, r1909590, r1909677 from trunk:1.7.x

In preparation to be able to test multiple, parallel
flavors of the apr build, we'll need to designate the
path of the apr-invoked binaires.  Macroize this.

Removed tabs and trailing spaces.


Appears to be required for getpid()


In case that we have threads store the apr_reslist parameters in the
apr_memcache_server_t struct for later usage.

* include/apr_memcache.h::struct apr_memcache_server_t:
    Add missing fields to struct.

* memcache/apr_memcache.c::apr_memcache_server_create:
    Init fields with given values.


Check sockets from connection pool before using them and try to reconnect
them if they are not usable any longer.

* memcache/apr_memcache.c::ms_find_conn:
    Check if the socket returned from the connection pool is still readable. If
    not then invalidate the connection in the pool and request a new one
    from the connection pool. Repeat this until a valid socket is returned
    or this was done the maximum number of connections in the pool plus one.
    This ensures that at least one new socket was created. If a new socket
    does not work this indicates a broken backend and not just a restart in
    the past. In this case return an error like previously.

* test/testmemcache.c:
    Add new test for connection validation.

* test/memcachedmock.c:
    For the new test we need a memcached mock server that we control and
    can restart.

* test/testmemcache.h:
    Shared defines between test/testmemcache.c and test/memcachedmock.c.

* test/Makefile.in:
* test/Makefile.win:
* test/NWGNUmakefile:
* test/NWGNUmemcachedmock:
    Needed changes to build test/memcachedmock.c on different platforms.


* Add missing test/memcachedmock.c

* Wait for the mock memcached to shutdown the socket

* Add CHANGES entry for r1909474, r1909585, r1909586, r1909590
Reviewed by: ruediger


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

1 files changed, 84 insertions, 0 deletions

diff --git a/test/memcachedmock.c b/test/memcachedmock.c
new file mode 100644
index 00000000..b6c2e6fc
--- /dev/null
+++ b/test/memcachedmock.c
@@ -0,0 +1,84 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdlib.h>
+#include "apr_network_io.h"
+#include "apr_pools.h"
+#include "apr_pools.h"
+#include "testmemcache.h"
+
+#define MOCK_REPLY "VERSION 1.5.22\r\n"
+
+int main(int argc, char *argv[])
+{
+    apr_pool_t *p;
+    apr_sockaddr_t *sa;
+    apr_socket_t *server;
+    apr_socket_t *server_connection;
+    apr_status_t rv;
+    apr_size_t length;
+    int i;
+
+    apr_initialize();
+    atexit(apr_terminate);
+    apr_pool_create(&p, NULL);
+
+    apr_sockaddr_info_get(&sa, MOCK_HOST, APR_UNSPEC, MOCK_PORT, 0, p);
+
+    apr_socket_create(&server, sa->family, SOCK_STREAM, 0, p);
+
+    apr_socket_opt_set(server, APR_SO_REUSEADDR, 1);
+
+    apr_socket_timeout_set(server, 0);
+
+    apr_socket_bind(server, sa);
+
+    apr_socket_listen(server, 5);
+
+    /* Do spin instead of a proper poll for sake of simplicity */
+    for (i = 0; i < 4; i++) {
+
+        rv = apr_socket_accept(&server_connection, server, p);
+        if (rv == APR_SUCCESS) {
+            break;
+        }
+
+        apr_sleep(apr_time_from_sec(1));
+    }
+
+    length = strlen(MOCK_REPLY);
+    apr_socket_send(server_connection, MOCK_REPLY, &length);
+
+    apr_socket_close(server_connection);
+
+    /* Do spin instead of a proper poll for sake of simplicity */
+    for (i = 0; i < 4; i++) {
+
+        rv = apr_socket_accept(&server_connection, server, p);
+        if (rv == APR_SUCCESS) {
+            break;
+        }
+
+        apr_sleep(apr_time_from_sec(1));
+    }
+
+    length = strlen(MOCK_REPLY);
+    apr_socket_send(server_connection, MOCK_REPLY, &length);
+
+    apr_socket_close(server_connection);
+
+    exit(0);
+}