summaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2002-07-15 10:05:11 +0200
committerWilliam A. Rowe Jr <wrowe@apache.org>2002-07-15 10:05:11 +0200
commited8fc9abaef1ff689c07588d2599be85353f0e86 (patch)
tree4f5545d23ddf88bbf9c4c778c3bc7b76ad71e933 /support
parentRemove a time lookup that's now unnecessary (diff)
downloadapache2-ed8fc9abaef1ff689c07588d2599be85353f0e86.tar.xz
apache2-ed8fc9abaef1ff689c07588d2599be85353f0e86.zip
http occurances to update for apr_socket_opt_get/set
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96057 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support')
-rw-r--r--support/ab.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/support/ab.c b/support/ab.c
index 6734bfe728..3849d3c194 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -717,7 +717,7 @@ static void write_request(struct connection * c)
#ifdef USE_SSL
if (ssl != 1)
#endif
- apr_setsocketopt(c->aprsock, APR_SO_TIMEOUT, 0);
+ apr_socket_timeout_set(c->aprsock, 0);
c->connect = tnow;
c->rwrite = reqlen;
c->rwrote = 0;
@@ -1225,7 +1225,7 @@ static void start_connect(struct connection * c)
SOCK_STREAM, c->ctx)) != APR_SUCCESS) {
apr_err("socket", rv);
}
- if ((rv = apr_setsocketopt(c->aprsock, APR_SO_NONBLOCK, 1))
+ if ((rv = apr_socket_opt_set(c->aprsock, APR_SO_NONBLOCK, 1))
!= APR_SUCCESS) {
apr_err("socket nonblock", rv);
}
@@ -1726,14 +1726,14 @@ static void test(void)
static void copyright(void)
{
if (!use_html) {
- printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.110 $> apache-2.0");
+ printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.111 $> 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.110 $");
+ printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.111 $");
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");