httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r320804 - in /httpd/httpd/branches/2.2.x: CHANGES modules/ssl/ssl_engine_init.c support/ab.c
Date Thu, 13 Oct 2005 16:56:35 GMT
Author: jorton
Date: Thu Oct 13 09:56:29 2005
New Revision: 320804

URL: http://svn.apache.org/viewcvs?rev=320804&view=rev
Log:
Merge r314844, r320796 from trunk:

* support/ab.c (test): Increment count of started requests when a
non-blocking connect completes; avoids case where more requests are
made than intended.

* modules/ssl/ssl_engine_init.c (ssl_init_CheckServers): Fix IP/port
key generation which passed a bogus pointer for a %pA conversion,
hence could give false warnings for name-based-vhost use.

PR: 36966, 37051

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c
    httpd/httpd/branches/2.2.x/support/ab.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=320804&r1=320803&r2=320804&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Oct 13 09:56:29 2005
@@ -1,6 +1,12 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.1.9
 
+  *) mod_ssl: Fix issue which could cause spurious warnings about use
+     of name-based vhosts.  PR 37051.  [Joe Orton]
+
+  *) ab: Fix to ensure that only the expected number of requests are run.
+     PR 36966.  [Joe Orton]
+
   *) mod_proxy_balancer: BalancerManager and proxies correctly handle
      member workers with paths. PR36816. [Ruediger Pluem, Jim Jagielski]
 

Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c?rev=320804&r1=320803&r2=320804&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c Thu Oct 13 09:56:29 2005
@@ -1044,14 +1044,16 @@
     table = apr_hash_make(p);
 
     for (s = base_server; s; s = s->next) {
+        char *addr;
+
         sc = mySrvConfig(s);
 
         if (!((sc->enabled == SSL_ENABLED_TRUE) && s->addrs)) {
             continue;
         }
 
-        key = apr_psprintf(p, "%pA:%u",
-                           &s->addrs->host_addr, s->addrs->host_port);
+        apr_sockaddr_ip_get(&addr, s->addrs->host_addr);
+        key = apr_psprintf(p, "%s:%u", addr, s->addrs->host_port);
         klen = strlen(key);
 
         if ((ps = (server_rec *)apr_hash_get(table, key, klen))) {

Modified: httpd/httpd/branches/2.2.x/support/ab.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/support/ab.c?rev=320804&r1=320803&r2=320804&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/ab.c (original)
+++ httpd/httpd/branches/2.2.x/support/ab.c Thu Oct 13 09:56:29 2005
@@ -1681,6 +1681,7 @@
                     }
                     else {
                         c->state = STATE_CONNECTED;
+                        started++;
 #ifdef USE_SSL
                         if (c->ssl)
                             ssl_proceed_handshake(c);



Mime
View raw message