diff options
author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2005-06-14 10:22:37 +0000 |
---|---|---|
committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2005-06-14 10:22:37 +0000 |
commit | 2c8947f65ddb2af59279532b5082f0f4369aa2c8 (patch) | |
tree | d79ff1ae6fd2b0a1172b6da44c7a9c0146574395 | |
parent | ce3811f8cca1db2c07db3404431064707660aa65 (diff) | |
download | libapr-2c8947f65ddb2af59279532b5082f0f4369aa2c8.tar.gz |
send and receive buffer sizes are not flags, and caller
may pass different values on different calls; so don't
try to optimize this setsockopt()
SO_LINGER is an odd one; the real setsockopt provides
a configurable value for the timeout; but with APR, this
is a flag and the timeout; so the optimization stays
for this one
Reviewed by: Joe Orton
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@190568 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | network_io/unix/sockopt.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/network_io/unix/sockopt.c b/network_io/unix/sockopt.c index 4c45db156..5fcc493e9 100644 --- a/network_io/unix/sockopt.c +++ b/network_io/unix/sockopt.c @@ -151,11 +151,8 @@ apr_status_t apr_socket_opt_set(apr_socket_t *sock, break; case APR_SO_SNDBUF: #ifdef SO_SNDBUF - if (apr_is_option_set(sock, APR_SO_SNDBUF) != on) { - if (setsockopt(sock->socketdes, SOL_SOCKET, SO_SNDBUF, (void *)&on, sizeof(int)) == -1) { - return errno; - } - apr_set_option(sock, APR_SO_SNDBUF, on); + if (setsockopt(sock->socketdes, SOL_SOCKET, SO_SNDBUF, (void *)&on, sizeof(int)) == -1) { + return errno; } #else return APR_ENOTIMPL; @@ -163,11 +160,8 @@ apr_status_t apr_socket_opt_set(apr_socket_t *sock, break; case APR_SO_RCVBUF: #ifdef SO_RCVBUF - if (apr_is_option_set(sock, APR_SO_RCVBUF) != on) { - if (setsockopt(sock->socketdes, SOL_SOCKET, SO_RCVBUF, (void *)&on, sizeof(int)) == -1) { - return errno; - } - apr_set_option(sock, APR_SO_RCVBUF, on); + if (setsockopt(sock->socketdes, SOL_SOCKET, SO_RCVBUF, (void *)&on, sizeof(int)) == -1) { + return errno; } #else return APR_ENOTIMPL; |