summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2010-01-10 22:42:55 +0000
committerjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2010-01-10 22:42:55 +0000
commitda42c41d5adbd2810a205fd604670e307502a7cd (patch)
treee7b10af9a57a49d02cdb520eb893eae67ca68ef7 /test
parent7a51e560b46006113ea675a59304b31c82d0237b (diff)
downloadneon-da42c41d5adbd2810a205fd604670e307502a7cd.tar.gz
* test/socket.c (ssl_closure, ssl_truncate): Don't expect clean
closure. git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@1779 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
Diffstat (limited to 'test')
-rw-r--r--test/socket.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/socket.c b/test/socket.c
index 5aeca7b..7b7fb69 100644
--- a/test/socket.c
+++ b/test/socket.c
@@ -1,6 +1,6 @@
/*
Socket handling tests
- Copyright (C) 2002-2009, Joe Orton <joe@manyfish.co.uk>
+ Copyright (C) 2002-2010, Joe Orton <joe@manyfish.co.uk>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1000,7 +1000,8 @@ static int ssl_closure(void)
ONV(ret != NE_SOCK_RESET && ret != NE_SOCK_CLOSED,
("write got %" NE_FMT_SSIZE_T " not reset or closure: %s", ret,
ne_sock_error(sock)));
- return good_close(sock);
+ ne_sock_close(sock);
+ return OK;
}
static int serve_truncate(ne_socket *sock, void *userdata)
@@ -1019,7 +1020,9 @@ static int ssl_truncate(void)
ONV(ret != NE_SOCK_TRUNC,
("socket got error %d not truncation: `%s'", ret,
ne_sock_error(sock)));
- return finish(sock, 0);
+ ne_sock_close(sock);
+ CALL(await_server());
+ return OK;
}
#else