From: Jeff Trawick <trawick@apache.org>
Date: Mon, 15 Sep 2003 15:40:06 +0000 (+0000)
Subject: merge this fix from 2.1-dev:
X-Git-Tag: 2.0.48~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a212ba29e119ee2763efb827b773c280576452b;p=thirdparty%2Fapache%2Fhttpd.git

merge this fix from 2.1-dev:

*) ab: Work over non-loopback on Unix again. PR 21495.

The CHANGES entry is currently under the 2.0.48 heading.  We
can figure out what to change once 2.0.48 is out the door.


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

diff --git a/CHANGES b/CHANGES
index 54997df30fa..f1a74bdde06 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.48
 
+  *) ab: Work over non-loopback on Unix again. PR 21495. [Jeff Trawick]
+
   *) Fix a misleading message from the some of the threaded MPMs when 
      MaxClients has to be lowered due to the setting of ServerLimit.  
      [Jeff Trawick]
diff --git a/STATUS b/STATUS
index 56c6a33443b..69f03c6f392 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/09/15 11:49:19 $]
+Last modified at [$Date: 2003/09/15 15:40:05 $]
 
 Release:
 
@@ -274,17 +274,9 @@ PATCHES TO PORT FROM 2.1
         modules/generators/mod_autoindex.c r1.120
       +1: nd, trawick
 
-    * ab: Handle conditions where connect() on non-blocking socket
-      doesn't complete immediately (i.e., restore functionality when
-      benchmarking non-local targets).  This doesn't resolve some
-      serious flaws in state-handling within ab; it is simply a
-      minimal change to get it going again, as fixing it correctly is
-      potentially destabilizing and may take some iterations in
-      2.1-dev before it is ready for prime time.
-        support/ab.c: r1.128
-      +1: trawick, stoddard, brianp
-
-      More fixes
+    * More ab fixes; r1.129 fixes what looks like a trivial error in the 
+      SSL support; r1.130 adds some state-handling fixes related to
+      ab's breakage in 2.0.47
         support/ab.c: r1.129, r1.130
       +1: trawick, brianp
 
diff --git a/support/ab.c b/support/ab.c
index 0210b357397..90b129a4196 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -1256,7 +1256,7 @@ static void start_connect(struct connection * c)
 	    c->state = STATE_CONNECTING;
 	    c->rwrite = 0;
             new_pollfd.desc_type = APR_POLL_SOCKET;
-            new_pollfd.reqevents = APR_POLLIN;
+            new_pollfd.reqevents = APR_POLLOUT | APR_POLLIN;
             new_pollfd.desc.s = c->aprsock;
             new_pollfd.client_data = c;
 	    apr_pollset_add(readbits, &new_pollfd);
@@ -1777,14 +1777,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-	printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.121.2.3 $> apache-2.0");
+	printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.121.2.4 $> apache-2.0");
 	printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
 	printf("Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/\n");
 	printf("\n");
     }
     else {
 	printf("<p>\n");
-	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.121.2.3 $");
+	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.121.2.4 $");
 	printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
 	printf(" Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/<br>\n");
 	printf("</p>\n<p>\n");