diff options
| author | roam <roam@FreeBSD.org> | 2001-04-17 11:10:34 +0000 |
|---|---|---|
| committer | roam <roam@FreeBSD.org> | 2001-04-17 11:10:34 +0000 |
| commit | 30581e24eda8d6f500ba639e0dab7bc276a9000d (patch) | |
| tree | 4c554b6415b922affed2bceb42a18f152998b622 /www/apache13-fp/files | |
| parent | 56d079e788912dad3f272c39fe6df88e7a0169b0 (diff) | |
| download | FreeBSD-ports-30581e24eda8d6f500ba639e0dab7bc276a9000d.zip FreeBSD-ports-30581e24eda8d6f500ba639e0dab7bc276a9000d.tar.gz | |
Update MASTER_SITES, fix build on -current, fix distfile extensions.
PR: 26444
Submitted by: maintainer
Diffstat (limited to 'www/apache13-fp/files')
| -rw-r--r-- | www/apache13-fp/files/patch-fj | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/www/apache13-fp/files/patch-fj b/www/apache13-fp/files/patch-fj index 083a668..b092e0e 100644 --- a/www/apache13-fp/files/patch-fj +++ b/www/apache13-fp/files/patch-fj @@ -9,7 +9,28 @@ pos = x; break; } -@@ -2040,7 +2040,6 @@ +@@ -2013,12 +2013,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); + } +@@ -2040,7 +2042,6 @@ ap_log_error(APLOG_MARK, APLOG_WARNING, NULL, "%s: gethostname() failed to determine ServerName\n", ap_server_argv0); @@ -17,12 +38,20 @@ } else { -@@ -2048,7 +2047,7 @@ +@@ -2048,14 +2049,14 @@ 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]) { ++ if (p && p->h_addr_list && 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 */ + } + } + else +- /* Since we found a fdqn, return it with no logged message. */ ++ /* Since we found a fqdn, return it with no logged message. */ + return server_hostname; + } + |
