1
--- build-tree/apache2/support/ab.c 28 Aug 2004 16:20:08 -0000 1.121.2.12
2
+++ build-tree/apache2/support/ab.c 28 Sep 2004 16:02:31 -0000
12
+#if !defined(WIN32) && !defined(NETWARE)
13
+#include "ap_config_auto.h"
17
-#if ((!(RSAREF)) && (!(SYSSSL)))
19
+#if defined(HAVE_OPENSSL)
20
/* Libraries on most systems.. */
21
#include <openssl/rsa.h>
22
#include <openssl/crypto.h>
24
#include <openssl/err.h>
25
#include <openssl/ssl.h>
26
#include <openssl/rand.h>
28
-/* Libraries for RSAref and SYSSSL */
50
-long ssl_print_cb(BIO *bio,int cmd,const char *argp,int argi,long argl,long ret)
51
+static long ssl_print_cb(BIO *bio,int cmd,const char *argp,int argi,long argl,long ret)
60
+static void ssl_rand_seed()
68
-int ssl_print_connection_info(bio,ssl)
71
+static int ssl_print_connection_info(BIO *bio, SSL *ssl)
79
-int ssl_print_cert_info(bio,x509cert)
82
+static int ssl_print_cert_info(BIO *bio, X509 *x509cert)
90
-void ssl_start_connect(struct connection * c)
91
+static void ssl_start_connect(struct connection * c)
97
apr_time_t tnow = apr_time_now();
98
apr_size_t l = c->rwrite;
100
+ apr_status_t e = APR_SUCCESS; /* prevent GCC warning */
104
@@ -1670,7 +1665,14 @@
106
for (i = 0; i < n; i++) {
107
const apr_pollfd_t *next_fd = &(pollresults[i]);
108
- struct connection *c = next_fd->client_data;
109
+ struct connection *c;
116
+ c = next_fd->client_data;
119
* If the connection isn't connected how can we check it?
120
@@ -1772,14 +1774,14 @@
121
static void copyright(void)
124
- printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.121.2.12 $> apache-2.0");
125
+ printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.141 $> apache-2.0");
126
printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
127
printf("Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/\n");
132
- printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.121.2.12 $");
133
+ printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.141 $");
134
printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
135
printf(" Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/<br>\n");
136
printf("</p>\n<p>\n");