diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2007-10-19 10:14:16 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2007-10-19 10:14:16 +0000 |
| commit | de0d705d7cae4cd9d7084d808fb998f94884aee1 (patch) | |
| tree | 83bf3ddfe456b97c97b754a11c3b58044ef4326c /src | |
| parent | 677912364ab7e80fef886a069e2ada916b370ead (diff) | |
| download | neon-0.27.x.tar.gz | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/ne_socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ne_socket.c b/src/ne_socket.c index c1a4230..898eba8 100644 --- a/src/ne_socket.c +++ b/src/ne_socket.c @@ -1468,8 +1468,8 @@ int ne_sock_sessid(ne_socket *sock, unsigned char *buf, size_t *buflen) return -1; } - memcpy(buf, sess->session_id, *buflen); *buflen = sess->session_id_length; + memcpy(buf, sess->session_id, *buflen); return 0; #endif #else |