1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00

* 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1351737 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2012-06-19 15:13:37 +00:00
parent 430ab1d4db
commit 6c85d01a06

View File

@@ -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 */