Merge r1263, r1264 from trunk:0.27.x

* src/ne_socket.c (ne_sock_sessid): Don't copy from beyond
  ->session_id array.

* test/socket.c (ssl_session_id): Test that only expected number of
bytes are copied.

* test/auth.c (serve_digest): Inhibit "server child failure" messages
when the server should quit.


git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.27.x@1265 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845

1 files changed, 7 insertions, 0 deletions

diff --git a/test/auth.c b/test/auth.c
index a0c87ee..7473346 100644
--- a/test/auth.c
+++ b/test/auth.c
@@ -700,6 +700,13 @@ static int serve_digest(ne_socket *sock, void *userdata)
 
     SEND_STRING(sock, resp);
 
+    /* Give up now if we've sent a challenge which should force the
+     * client to fail immediately: */
+    if (parms->failure == fail_bogus_alg
+        || parms->failure == fail_req0_stale) {
+        return OK;
+    }
+
     do {
         CALL(discard_request(sock));