add APR_IPV6_V6ONLY socket option

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

2 files changed, 28 insertions, 0 deletions

diff --git a/network_io/unix/sockopt.c b/network_io/unix/sockopt.c
index 41ed14746..31024a8aa 100644
--- a/network_io/unix/sockopt.c
+++ b/network_io/unix/sockopt.c
@@ -310,6 +310,20 @@ apr_status_t apr_socket_opt_set(apr_socket_t *sock,
     if (opt & APR_INCOMPLETE_READ) {
         apr_set_option(&sock->netmask, APR_INCOMPLETE_READ, on);
     }
+    if (opt & APR_IPV6_V6ONLY) {
+#if APR_HAVE_IPV6 && defined(IPV6_V6ONLY)
+        /* we don't know the initial setting of this option,
+         * so don't check/set sock->netmask since that optimization
+         * won't work
+         */
+        if (setsockopt(sock->socketdes, IPPROTO_IPV6, IPV6_V6ONLY,
+                       (void *)&on, sizeof(int)) == -1) {
+            return errno;
+        }
+#else
+        return APR_ENOTIMPL;
+#endif
+    }
 
     return APR_SUCCESS; 
 }         
diff --git a/network_io/win32/sockopt.c b/network_io/win32/sockopt.c
index 53f633265..c326f9dae 100644
--- a/network_io/win32/sockopt.c
+++ b/network_io/win32/sockopt.c
@@ -210,6 +210,20 @@ APR_DECLARE(apr_status_t) apr_socket_opt_set(apr_socket_t *sock,
             apr_set_option(&sock->netmask, APR_TCP_NODELAY, on);
         }
         break;
+    case APR_IPV6_V6ONLY:
+#if APR_HAVE_IPV6 && defined(IPV6_V6ONLY)
+        /* we don't know the initial setting of this option,
+         * so don't check/set sock->netmask since that optimization
+         * won't work
+         */
+        if (setsockopt(sock->socketdes, IPPROTO_IPV6, IPV6_V6ONLY,
+                       (void *)&on, sizeof(int)) == -1) {
+            return apr_get_netos_error();
+        }
+#else
+        return APR_ENOTIMPL;
+#endif
+        break;
     default:
         return APR_EINVAL;
         break;