summaryrefslogtreecommitdiff
path: root/extra/yassl/examples/echoserver
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2006-05-22 15:49:57 +0200
committerunknown <msvensson@shellback.(none)>2006-05-22 15:49:57 +0200
commitb959d36bce2c71b45b65ae86b730feb108951760 (patch)
tree435cf1e3d081d3837f4215a39c9b798e621de571 /extra/yassl/examples/echoserver
parent07188950aefdebe5d55af86b14fe8179e52b5987 (diff)
downloadmariadb-git-b959d36bce2c71b45b65ae86b730feb108951760.tar.gz
Import from yaSSL
Fixes for HPUX etc. Don't define exceptions operator new on hpux as the linker will look for the function extra/yassl/examples/echoserver/echoserver.cpp: Import patch yassl.diff extra/yassl/include/openssl/ssl.h: Import patch yassl.diff extra/yassl/include/socket_wrapper.hpp: Import patch yassl.diff extra/yassl/src/handshake.cpp: Import patch yassl.diff extra/yassl/src/socket_wrapper.cpp: Import patch yassl.diff extra/yassl/src/ssl.cpp: Import patch yassl.diff extra/yassl/src/template_instnt.cpp: Import patch yassl.diff extra/yassl/src/timer.cpp: Import patch yassl.diff extra/yassl/src/yassl_error.cpp: Import patch yassl.diff extra/yassl/src/yassl_int.cpp: Import patch yassl.diff extra/yassl/taocrypt/include/block.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/md4.hpp: Import patch yassl.diff extra/yassl/taocrypt/include/runtime.hpp: Import patch yassl.diff extra/yassl/taocrypt/src/md4.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/template_instnt.cpp: Import patch yassl.diff extra/yassl/taocrypt/taocrypt.dsp: Import patch yassl.diff extra/yassl/taocrypt/test/test.cpp: Import patch yassl.diff extra/yassl/testsuite/test.hpp: Import patch yassl.diff extra/yassl/mySTL/stdexcept.hpp: Don't define exceptions operator new on hpux as the linker will look for the function extra/yassl/taocrypt/src/Makefile.am: Add md4.cpp to Makefile.am
Diffstat (limited to 'extra/yassl/examples/echoserver')
-rw-r--r--extra/yassl/examples/echoserver/echoserver.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/yassl/examples/echoserver/echoserver.cpp b/extra/yassl/examples/echoserver/echoserver.cpp
index 3243cc21a7c..8e23ead20ab 100644
--- a/extra/yassl/examples/echoserver/echoserver.cpp
+++ b/extra/yassl/examples/echoserver/echoserver.cpp
@@ -65,7 +65,8 @@ THREAD_RETURN YASSL_API echoserver_test(void* args)
while (!shutdown) {
sockaddr_in client;
socklen_t client_len = sizeof(client);
- int clientfd = accept(sockfd, (sockaddr*)&client, &client_len);
+ int clientfd = accept(sockfd, (sockaddr*)&client,
+ (ACCEPT_THIRD_T)&client_len);
if (clientfd == -1) err_sys("tcp accept failed");
SSL* ssl = SSL_new(ctx);