apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1531093 - in /apr/apr/branches/1.5.x: ./ network_io/win32/sockopt.c
Date Thu, 10 Oct 2013 20:07:37 GMT
Author: trawick
Date: Thu Oct 10 20:07:37 2013
New Revision: 1531093

URL: http://svn.apache.org/r1531093
Log:
merge r1081495 from trunk:

return apr_get_netos_error() when setsockopt() fails

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/network_io/win32/sockopt.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1081495

Modified: apr/apr/branches/1.5.x/network_io/win32/sockopt.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/network_io/win32/sockopt.c?rev=1531093&r1=1531092&r2=1531093&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/network_io/win32/sockopt.c (original)
+++ apr/apr/branches/1.5.x/network_io/win32/sockopt.c Thu Oct 10 20:07:37 2013
@@ -187,7 +187,7 @@ APR_DECLARE(apr_status_t) apr_socket_opt
 
             if (setsockopt(sock->socketdes, optlevel, optname, 
                            (void *)&on, sizeof(int)) == -1) {
-                return errno;
+                return apr_get_netos_error();
             }
             apr_set_option(sock, APR_TCP_DEFER_ACCEPT, on);
         }



Mime
View raw message