diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-07-13 19:21:11 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-07-13 19:21:11 +0000 |
| commit | 527d18b6ca50c41db14c18ac4af93179f31507dd (patch) | |
| tree | 1bdddbd04fa831f32976986ebf93d269c80657fd | |
| parent | 1039437f77622968e2e0498672828a6d36d2093c (diff) | |
| download | httpd-527d18b6ca50c41db14c18ac4af93179f31507dd.tar.gz | |
Use APR_UNSPEC to allow startup on IP6-only systems.
PR: 50592
Submitted by: Joe Orton, 2510 <root linkage white-void net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146256 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | server/config.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -2,6 +2,9 @@ Changes with Apache 2.3.14 + *) core: Fix startup on IP6-only systems. PR 50592. [Joe Orton, + <root linkage white-void net>] + *) suexec: Add environment variables CONTEXT_DOCUMENT_ROOT, CONTEXT_PREFIX, REDIRECT_ERROR_NOTES, REDIRECT_SCRIPT_FILENAME, REQUEST_SCHEME to the whitelist in suexec. PR 51499. [Graham Laverty <graham reg ca>, diff --git a/server/config.c b/server/config.c index 8f78f1f4ce..cf379d426a 100644 --- a/server/config.c +++ b/server/config.c @@ -2255,7 +2255,7 @@ static server_rec *init_server_config(process_rec *process, apr_pool_t *p) /* NOT virtual host; don't match any real network interface */ rv = apr_sockaddr_info_get(&s->addrs->host_addr, - NULL, APR_INET, 0, 0, p); + NULL, APR_UNSPEC, 0, 0, p); if (rv != APR_SUCCESS) { /* should we test here for rv being an EAIERR? */ ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, rv, NULL, |