apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r414261 - /apr/apr/branches/1.2.x/network_io/unix/sendrecv.c
Date Wed, 14 Jun 2006 14:05:01 GMT
Author: jorton
Date: Wed Jun 14 07:05:00 2006
New Revision: 414261

URL: http://svn.apache.org/viewvc?rev=414261&view=rev
Log:
Merge r391579 from trunk:

* network_io/unix/sendrecv.c (apr_socket_sendv): Implement for
!HAVE_WRITEV build.

PR: 38822

Modified:
    apr/apr/branches/1.2.x/network_io/unix/sendrecv.c

Modified: apr/apr/branches/1.2.x/network_io/unix/sendrecv.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/network_io/unix/sendrecv.c?rev=414261&r1=414260&r2=414261&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/network_io/unix/sendrecv.c (original)
+++ apr/apr/branches/1.2.x/network_io/unix/sendrecv.c Wed Jun 14 07:05:00 2006
@@ -180,10 +180,10 @@
     return APR_SUCCESS;
 }
 
-#ifdef HAVE_WRITEV
 apr_status_t apr_socket_sendv(apr_socket_t * sock, const struct iovec *vec,
                               apr_int32_t nvec, apr_size_t *len)
 {
+#ifdef HAVE_WRITEV
     apr_ssize_t rv;
     apr_size_t requested_len = 0;
     apr_int32_t i;
@@ -225,8 +225,11 @@
     }
     (*len) = rv;
     return APR_SUCCESS;
-}
+#else
+    *len = vec[0].iov_len;
+    return apr_socket_send(sock, vec[0].iov_base, len);
 #endif
+}
 
 #if APR_HAS_SENDFILE
 



Mime
View raw message