kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add official patch to not coredump on missing ServerName

Browse source 
PR:		26237
Submitted by:	Scot W. Hetzel <hetzels@westbend.net>
This commit is contained in:
Munechika SUMIKAWA 2001-04-02 05:33:20 +00:00
parent 8e0191fc0f
commit a8ce216b04
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=40714
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/apache13+ipv6/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= apache+ipv6
PORTVERSION= 1.3.19
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \

31
www/apache13+ipv6/files/patch-util.c Normal file
View file

@ -0,0 +1,31 @@
--- src/main/util.c.orig Mon Apr 2 13:21:27 2001
+++ src/main/util.c Mon Apr 2 13:21:28 2001
@@ -2048,12 +2048,14 @@
int x;
if (!strchr(p->h_name, '.')) {
- for (x = 0; p->h_aliases[x]; ++x) {
- if (strchr(p->h_aliases[x], '.') &&
- (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
- return ap_pstrdup(a, p->h_aliases[x]);
- }
- return NULL;
+ if (p->h_aliases) {
+ for (x = 0; p->h_aliases[x]; ++x) {
+ if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') &&
+ (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
+ return ap_pstrdup(a, p->h_aliases[x]);
+ }
+ }
+ return NULL;
}
return ap_pstrdup(a, (void *) p->h_name);
}
@@ -2077,7 +2079,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
{