Have seperate variable on ap_writev to set the number of iovecs passed in

and pass back the number of bytes written. Use ap_iovec_t on the call rather
than struct iovec (I may reverse this tomorrow :-). Whatever we do, the network_io
and file_io calls need to use iovecs consistently, which isn't the case now.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84642 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 94ef45863dc33a3bb1f876125ede8bbc21bf77cd..f355382d669a836f88d8a0cca384b91b2c980f76 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -2960,10 +2960,12 @@ static char *lookup_map_program(request_rec *r, ap_file_t *fpin,
     char buf[LONG_STRING_LEN];
     char c;
     int i;
-    int size_val;
+    ap_size_t nbytes;
+
 #ifndef NO_WRITEV
     ap_iovec_t *iov;
     struct iovec iova[2];
+    ap_size_t niov;
 #endif
 
     /* when `RewriteEngine off' was used in the per-server
@@ -2989,21 +2991,21 @@ static char *lookup_map_program(request_rec *r, ap_file_t *fpin,
     iova[1].iov_len = 1;
 
     ap_make_iov(&iov, iova, r->pool);
-    size_val = 2;
-    ap_writev(fpin, iov, &size_val);
+    niov = 2;
+    ap_writev(fpin, iov, niov, &nbytes);
 #endif
 
     /* read in the response value */
     i = 0;
-    size_val = 1;
-    ap_read(fpout, &c, &size_val);
-    while (size_val == 1 && (i < LONG_STRING_LEN-1)) {
+    nbytes = 1;
+    ap_read(fpout, &c, &nbytes);
+    while (nbytes == 1 && (i < LONG_STRING_LEN-1)) {
         if (c == '\n') {
             break;
         }
         buf[i++] = c;
 
-        ap_read(fpout, &c, &size_val);
+        ap_read(fpout, &c, &nbytes);
     }
     buf[i] = '\0';
 
@@ -3189,7 +3191,8 @@ static void rewritelog(request_rec *r, int level, const char *text, ...)
     char type[20];
     char redir[20];
     va_list ap;
-    int i, size_val;
+    int i;
+    ap_size_t nbytes;
     request_rec *req;
     char *ruser;
     const char *rhost;
@@ -3258,8 +3261,8 @@ static void rewritelog(request_rec *r, int level, const char *text, ...)
                 type, redir, level, str2);
 
     fd_lock(r, conf->rewritelogfp);
-    size_val = strlen(str3);
-    ap_write(conf->rewritelogfp, str3, &size_val);
+    nbytes = strlen(str3);
+    ap_write(conf->rewritelogfp, str3, &nbytes);
     fd_unlock(r, conf->rewritelogfp);
 
     va_end(ap);