httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/support ab.c
Date Wed, 10 Dec 2003 16:08:44 GMT
jorton      2003/12/10 08:08:44

  Modified:    support  ab.c
  Log:
  Fix ab's SSL support a little:
  
  * support/ab.c (ssl_*): Fix function prototypes througout.
  (test): Use correct connection structure when using SSL.
  
  Revision  Changes    Path
  1.132     +15 -12    httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -u -r1.131 -r1.132
  --- ab.c	3 Sep 2003 19:27:12 -0000	1.131
  +++ ab.c	10 Dec 2003 16:08:44 -0000	1.132
  @@ -478,7 +478,7 @@
    *
    */
   #ifdef USE_SSL
  -long ssl_print_cb(BIO *bio,int cmd,const char *argp,int argi,long argl,long ret)
  +static long ssl_print_cb(BIO *bio,int cmd,const char *argp,int argi,long argl,long ret)
   {
       BIO *out;
   
  @@ -520,7 +520,7 @@
       return i;
   }
   
  -void ssl_rand_seed()
  +static void ssl_rand_seed(void)
   {
       int nDone = 0;
       int n, l;
  @@ -552,9 +552,7 @@
       nDone += 128;
   }
   
  -int ssl_print_connection_info(bio,ssl)
  -BIO *bio;
  -SSL *ssl;
  +static int ssl_print_connection_info(BIO *bio, SSL *ssl)
   {
           SSL_CIPHER *c;
           int alg_bits,bits;
  @@ -569,9 +567,7 @@
           return(1);
   }
   
  -int ssl_print_cert_info(bio,x509cert)
  -BIO *bio;
  -X509 *x509cert;
  +static int ssl_print_cert_info(BIO *bio, X509 *x509cert)
   {
           X509_NAME *dn;
           char buf[64];
  @@ -603,7 +599,7 @@
           return(1);
   }
   
  -void ssl_start_connect(struct connection * c)
  +static void ssl_start_connect(struct connection * c)
   {
       BIO *bio;
       X509 *x509cert;
  @@ -1720,7 +1716,14 @@
   
   	for (i = 0; i < n; i++) {
               const apr_pollfd_t *next_fd = &(pollresults[i]);
  -            struct connection *c = next_fd->client_data;
  +            struct connection *c;
  +            
  +#ifdef USE_SSL
  +            if (ssl) 
  +                c = &con[i];
  +            else
  +#endif
  +                c = next_fd->client_data;
   
   	    /*
   	     * If the connection isn't connected how can we check it?
  
  
  

Mime
View raw message