Merge r314844, r320796 from trunk:

Merge r314844, r320796 from trunk:

* support/ab.c (test): Increment count of started requests when a
non-blocking connect completes; avoids case where more requests are
made than intended.

* modules/ssl/ssl_engine_init.c (ssl_init_CheckServers): Fix IP/port
key generation which passed a bogus pointer for a %pA conversion,
hence could give false warnings for name-based-vhost use.

PR: 36966, 37051

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@320804 13f79535-47bb-0310-9956-ffa450edef68