As rbb pointed out, two constructors are prone to bugs. Remap our old

  apr_socket_opt_set(SO_TIMEOUT) flavor to invoke apr_socket_timeout_set()


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63684 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 2 deletions

diff --git a/network_io/os2/sockopt.c b/network_io/os2/sockopt.c
index 779e9cbd8..3ecc1aa02 100644
--- a/network_io/os2/sockopt.c
+++ b/network_io/os2/sockopt.c
@@ -122,7 +122,7 @@ APR_DECLARE(apr_status_t) apr_socket_opt_set(apr_socket_t *sock,
     }
     if (opt & APR_SO_TIMEOUT) {
         /* XXX: To be deprecated */
-        sock->timeout = on;
+        return apr_socket_timeout_set(sock, on);
     }
     if (opt & APR_TCP_NODELAY) {
         if (setsockopt(sock->socketdes, IPPROTO_TCP, TCP_NODELAY, (void *)&on, sizeof(int)) == -1) {
@@ -147,7 +147,7 @@ APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock,
     switch(opt) {
     case APR_SO_TIMEOUT:
         /* XXX: To be deprecated */
-        *on = sock->timeout;
+        *on = (apr_int32_t)sock->timeout;
         break;
     default:
         return APR_EINVAL;