From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 2 Nov 2017 22:19:23 +0000 (+0000)
Subject: ab: follow up to r1811664.
X-Git-Tag: 2.5.0-alpha~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70bfc1c0bfff2fa2bde109c9978cf2d0ec6452f0;p=thirdparty%2Fapache%2Fhttpd.git

ab: follow up to r1811664.

apr_socket_send() can return both an error and data, account for data in
the latter case (i.e. let next call fail, if any).



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

diff --git a/support/ab.c b/support/ab.c
index 89310a0df8c..38ebb3dcc2b 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -845,23 +845,21 @@ static void write_request(struct connection * c)
                 return;
             }
             l = e;
-            e = APR_SUCCESS;
         }
         else
 #endif
         {
             e = apr_socket_send(c->aprsock, request + c->rwrote, &l);
-            if (e != APR_SUCCESS) {
+            if (e != APR_SUCCESS && !l) {
                 if (!APR_STATUS_IS_EAGAIN(e)) {
                     epipe++;
                     printf("Send request failed!\n");
                     close_connection(c);
-                    return;
                 }
-                if (!l) {
+                else {
                     set_polled_events(c, APR_POLLOUT);
-                    return;
                 }
+                return;
             }
         }
         totalposted += l;