From a862e7ae05bd4ad236cb2b031f9baf747c98c964 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 23 Jul 2012 15:19:37 +0000 Subject: [PATCH] Merge r1351737 from trunk: * support/ab.c (test, start_connect): Only bind the local end of the socket (and look up an address for it) if -B is specified. Reviewed by: trawick, rjung, jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364674 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 ++ support/ab.c | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 3cb2c9eebc..b375d746ec 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,8 @@ Changes with Apache 2.4.3 possible XSS for a site where untrusted users can upload files to a location with MultiViews enabled. [Niels Heinen ] + *) ab: Fix bind() errors. [Joe Orton] + *) mpm_event: Don't do a blocking write when starting a lingering close from the listener thread. PR 52229. [Stefan Fritsch] diff --git a/support/ab.c b/support/ab.c index 6b1e98954f..d2b1a986f9 100644 --- a/support/ab.c +++ b/support/ab.c @@ -1186,8 +1186,10 @@ static void start_connect(struct connection * c) apr_err("socket", rv); } - if ((rv = apr_socket_bind(c->aprsock, mysa)) != APR_SUCCESS) { - apr_err("bind", rv); + if (myhost) { + if ((rv = apr_socket_bind(c->aprsock, mysa)) != APR_SUCCESS) { + apr_err("bind", rv); + } } c->pollfd.desc_type = APR_POLL_SOCKET; @@ -1686,13 +1688,15 @@ static void test(void) exit(1); } #endif /* NOT_ASCII */ - - /* This only needs to be done once */ - if ((rv = apr_sockaddr_info_get(&mysa, myhost, APR_UNSPEC, 0, 0, cntxt)) != APR_SUCCESS) { - char buf[120]; - apr_snprintf(buf, sizeof(buf), - "apr_sockaddr_info_get() for %s", myhost); - apr_err(buf, rv); + + if (myhost) { + /* This only needs to be done once */ + if ((rv = apr_sockaddr_info_get(&mysa, myhost, APR_UNSPEC, 0, 0, cntxt)) != APR_SUCCESS) { + char buf[120]; + apr_snprintf(buf, sizeof(buf), + "apr_sockaddr_info_get() for %s", myhost); + apr_err(buf, rv); + } } /* This too */ -- 2.50.1