diff options
| author | James E. Housley <jeh@FreeBSD.org> | 2001-03-23 00:20:45 +0000 |
|---|---|---|
| committer | James E. Housley <jeh@FreeBSD.org> | 2001-03-23 00:20:45 +0000 |
| commit | b3cac66815ce01334e3b5edf8806b4b74bdd0d48 (patch) | |
| tree | 04ba5d75278e466620086834517081885bf36ed7 /www/apache13-fp | |
| parent | Correct logic who's result was OpenJade not being used to satisfy the (diff) | |
When ServerName directive in httpd.conf is not set the Apache server will
cause a Sig 11 in ap_get_local_host().
PR: 25979
Submitted by: Scot W. Hetzel <hetzels@westbend.net> MAINTAINER
Notes
Notes:
svn path=/head/; revision=40224
Diffstat (limited to 'www/apache13-fp')
| -rw-r--r-- | www/apache13-fp/files/patch-fj | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/www/apache13-fp/files/patch-fj b/www/apache13-fp/files/patch-fj index ebc0268dcda2..083a668e52a1 100644 --- a/www/apache13-fp/files/patch-fj +++ b/www/apache13-fp/files/patch-fj @@ -1,6 +1,6 @@ ---- src/main/util.c.orig Sat Aug 14 03:35:50 1999 -+++ src/main/util.c Mon Sep 6 13:12:55 1999 -@@ -635,7 +635,7 @@ +--- src/main/util.c.orig Thu Feb 1 04:06:37 2001 ++++ src/main/util.c Wed Mar 21 21:12:35 2001 +@@ -708,7 +708,7 @@ char *res; for (x = 0; (*line)[x]; x++) { @@ -9,3 +9,20 @@ pos = x; break; } +@@ -2040,7 +2040,6 @@ + ap_log_error(APLOG_MARK, APLOG_WARNING, NULL, + "%s: gethostname() failed to determine ServerName\n", + ap_server_argv0); +- server_hostname = ap_pstrdup(a, "127.0.0.1"); + } + else + { +@@ -2048,7 +2047,7 @@ + if ((!(p = gethostbyname(str))) + || (!(server_hostname = find_fqdn(a, p)))) { + /* Recovery - return the default servername by IP: */ +- if (p->h_addr_list[0]) { ++ if (p && p->h_addr_list[0]) { + ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]); + server_hostname = ap_pstrdup(a, str); + /* We will drop through to report the IP-named server */ |