Routine V3 merge.

This commit is contained in:
Shyotl
2012-01-29 01:25:39 -06:00
parent f5818b7621
commit 6c921ba340
14 changed files with 148 additions and 103 deletions

View File

@@ -114,11 +114,21 @@ LLSocket::ptr_t LLSocket::create(EType type, U16 port)
if(STREAM_TCP == type)
{
status = apr_socket_create(&rv->mSocket, APR_INET, SOCK_STREAM, APR_PROTO_TCP, rv->mPool());
status = apr_socket_create(
&rv->mSocket,
APR_INET,
SOCK_STREAM,
APR_PROTO_TCP,
rv->mPool());
}
else if(DATAGRAM_UDP == type)
{
status = apr_socket_create(&rv->mSocket, APR_INET, SOCK_DGRAM, APR_PROTO_UDP, rv->mPool());
status = apr_socket_create(
&rv->mSocket,
APR_INET,
SOCK_DGRAM,
APR_PROTO_UDP,
rv->mPool());
}
else
{