sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade to 1.3.20

Browse source
This commit is contained in:
Andrey A. Chernov 2001-05-22 15:34:38 +00:00
parent cadcbc7274
commit 9c18a27c4c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=42910
4 changed files with 26 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
www/apache13/Makefile
View file

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

2
www/apache13/distinfo
View file

@ -1 +1 @@
MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
MD5 (apache_1.3.20.tar.gz) = d58d373b5f528a61a3490daec5e8f91f

53
www/apache13/files/patch-util.c
View file

@ -1,53 +0,0 @@
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.194
retrieving revision 1.197
diff -u -r1.194 -r1.197
--- src/main/util.c 2001/02/01 10:06:37 1.194
+++ src/main/util.c 2001/03/30 17:37:54 1.197
@@ -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);
- server_hostname = ap_pstrdup(a, "127.0.0.1");
}
else
{
@@ -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 && 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;
}

30
www/apache13/pkg-plist
View file

@ -23,6 +23,7 @@ include/apache/ap_compat.h
include/apache/ap_config.h
include/apache/ap_config_auto.h
include/apache/ap_ctype.h
include/apache/ap_ebcdic.h
include/apache/ap_md5.h
include/apache/ap_mmn.h
include/apache/ap_sha1.h
@ -134,11 +135,12 @@ share/doc/apache/index.html.ru.ucs2
share/doc/apache/index.html.ru.ucs4
share/doc/apache/index.html.ru.utf8
share/doc/apache/index.html.se
share/doc/apache/index.html.tw.Big5
share/doc/apache/index.html.zh.Big5
share/doc/apache/manual/LICENSE
share/doc/apache/manual/bind.html
share/doc/apache/manual/cgi_path.html
share/doc/apache/manual/configuring.html.en
share/doc/apache/manual/configuring.html.fr
share/doc/apache/manual/configuring.html.html
share/doc/apache/manual/configuring.html.ja.jis
share/doc/apache/manual/content-negotiation.html
@ -178,11 +180,13 @@ share/doc/apache/manual/index.html.html
share/doc/apache/manual/index.html.ja.jis
share/doc/apache/manual/install-tpf.html
share/doc/apache/manual/install.html.en
share/doc/apache/manual/install.html.es
share/doc/apache/manual/install.html.fr
share/doc/apache/manual/install.html.html
share/doc/apache/manual/install.html.ja.jis
share/doc/apache/manual/invoking.html
share/doc/apache/manual/invoking.html.fr
share/doc/apache/manual/invoking.html.html
share/doc/apache/manual/keepalive.html
share/doc/apache/manual/location.html
share/doc/apache/manual/man-template.html
@ -218,7 +222,9 @@ share/doc/apache/manual/mod/directives.html
share/doc/apache/manual/mod/footer.html
share/doc/apache/manual/mod/header.html
share/doc/apache/manual/mod/index-bytype.html
share/doc/apache/manual/mod/index-bytype.html.fr
share/doc/apache/manual/mod/index.html
share/doc/apache/manual/mod/index.html.fr
share/doc/apache/manual/mod/mod_access.html
share/doc/apache/manual/mod/mod_actions.html
share/doc/apache/manual/mod/mod_alias.html
@ -236,7 +242,9 @@ share/doc/apache/manual/mod/mod_cookies.html
share/doc/apache/manual/mod/mod_digest.html
share/doc/apache/manual/mod/mod_dir.html
share/doc/apache/manual/mod/mod_dld.html
share/doc/apache/manual/mod/mod_env.html
share/doc/apache/manual/mod/mod_env.html.en
share/doc/apache/manual/mod/mod_env.html.html
share/doc/apache/manual/mod/mod_env.html.ja.jis
share/doc/apache/manual/mod/mod_example.html
share/doc/apache/manual/mod/mod_expires.html
share/doc/apache/manual/mod/mod_headers.html
@ -248,7 +256,9 @@ share/doc/apache/manual/mod/mod_log_agent.html
share/doc/apache/manual/mod/mod_log_common.html
share/doc/apache/manual/mod/mod_log_config.html
share/doc/apache/manual/mod/mod_log_referer.html
share/doc/apache/manual/mod/mod_mime.html
share/doc/apache/manual/mod/mod_mime.html.en
share/doc/apache/manual/mod/mod_mime.html.html
share/doc/apache/manual/mod/mod_mime.html.ja.jis
share/doc/apache/manual/mod/mod_mime_magic.html
share/doc/apache/manual/mod/mod_mmap_static.html
share/doc/apache/manual/mod/mod_negotiation.html.en
@ -256,7 +266,9 @@ share/doc/apache/manual/mod/mod_negotiation.html.html
share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
share/doc/apache/manual/mod/mod_proxy.html
share/doc/apache/manual/mod/mod_rewrite.html
share/doc/apache/manual/mod/mod_setenvif.html
share/doc/apache/manual/mod/mod_setenvif.html.en
share/doc/apache/manual/mod/mod_setenvif.html.html
share/doc/apache/manual/mod/mod_setenvif.html.ja.jis
share/doc/apache/manual/mod/mod_so.html
share/doc/apache/manual/mod/mod_speling.html
share/doc/apache/manual/mod/mod_status.html
@ -287,7 +299,9 @@ share/doc/apache/manual/programs/header.html
share/doc/apache/manual/programs/htdigest.html
share/doc/apache/manual/programs/htpasswd.html
share/doc/apache/manual/programs/httpd.html
share/doc/apache/manual/programs/index.html
share/doc/apache/manual/programs/index.html.en
share/doc/apache/manual/programs/index.html.html
share/doc/apache/manual/programs/index.html.ja.jis
share/doc/apache/manual/programs/logresolve.html
share/doc/apache/manual/programs/other.html
share/doc/apache/manual/programs/rotatelogs.html
@ -301,7 +315,11 @@ share/doc/apache/manual/server-wide.html.html
share/doc/apache/manual/server-wide.html.ja.jis
share/doc/apache/manual/sourcereorg.html
share/doc/apache/manual/stopping.html
share/doc/apache/manual/suexec.html
share/doc/apache/manual/stopping.html.fr
share/doc/apache/manual/stopping.html.html
share/doc/apache/manual/suexec.html.en
share/doc/apache/manual/suexec.html.html
share/doc/apache/manual/suexec.html.ja.jis
share/doc/apache/manual/suexec_1_2.html
share/doc/apache/manual/unixware.html
share/doc/apache/manual/upgrading_to_1_3.html