--- apr-1.3.5/network_io/unix/sockets.c.orig	Fri Nov 20 05:16:19 2009
+++ apr-1.3.5/network_io/unix/sockets.c	Fri Nov 20 05:13:50 2009
@@ -233,12 +233,12 @@
 
 #if APR_TCP_NODELAY_INHERITED
     if (apr_is_option_set(sock, APR_TCP_NODELAY) == 1) {
-        apr_set_option(*new, APR_TCP_NODELAY, 1);
+        apr_socket_opt_set(*new, APR_TCP_NODELAY, 1);
     }
 #endif /* TCP_NODELAY_INHERITED */
 #if APR_O_NONBLOCK_INHERITED
     if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) {
-        apr_set_option(*new, APR_SO_NONBLOCK, 1);
+        apr_socket_opt_set(*new, APR_SO_NONBLOCK, 1);
     }
 #endif /* APR_O_NONBLOCK_INHERITED */