From df730af6efcf74f41905e137f880b593a6c22613 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 25 Oct 2004 08:44:16 +0000 Subject: Update "apache" package to version 1.3.32. Changes since version 1.3.31: - mod_rewrite: Fix query string handling for proxied URLs. PR 14518. [michael teitler , Jan Kratochvil ] - mod_rewrite: Fix 0 bytes write into random memory position. PR 31036. [André Malo] - mod_digest: Fix nonce string calculation since 1.3.31 which would force re-authentication for every connection if AuthDigestRealmSeed was not configured. PR 30920. [Joe Orton] - Trigger an error when a LoadModule directive attempts to load a module which is built-in. This is a common error when switching from a DSO build to a static build. [Jeff Trawick, Geoffrey Young] - Fix trivial bug in mod_log_forensic that caused the child to seg fault when certain invalid requests were fired at it with forensic logging is enabled. PR 29313. [Will Slater ] - Fix memory leak in the cache handling of mod_rewrite. PR 27862. [chunyan sheng , André Malo] - mod_rewrite no longer confuses the RewriteMap caches if different maps defined in different virtual hosts use the same map name. PR 26462. [André Malo] - mod_setenvif: Remove "support" for Remote_User variable which never worked at all. PR 25725. [André Malo] - mod_usertrack: Escape the cookie name before pasting into the regexp. [André Malo] - Win32: Improve error reporting after a failed attempt to spawn a piped log process or rewrite map process. [Jeff Trawick] - SECURITY: CAN-2004-0492 (cve.mitre.org) Reject responses from a remote server if sent an invalid (negative) Content-Length. [Mark Cox] - Fix a bunch of cases where the return code of the regex compiler was not checked properly. This affects mod_usertrack and core. PR 28218. [André Malo] - No longer breaks mod_dav, frontpage and others. Repair a patch in 1.3.31 which prevented discarding the request body for requests that will be keptalive but are not currently keptalive. PR 29237. [Jim Jagielski, Rasmus Lerdorf] - COMPATIBILITY: Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It controls how UseCanonicalName Off determines the port value if the client doesn't provide one in the Host header. If defined during compilation, UseCanonicalName Off will use the physical port number to generate the canonical name. If not defined, it tries the current Port value followed by the default port for the current scheme. [Jim Jagielski] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/apache/Makefile | 9 ++++----- www/apache/PLIST | 9 +++------ www/apache/distinfo | 11 +++++------ www/apache/patches/patch-ap | 18 ------------------ 4 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 www/apache/patches/patch-ap (limited to 'www/apache') diff --git a/www/apache/Makefile b/www/apache/Makefile index 91c8c93959c..3f101d81a4b 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.153 2004/10/18 09:28:08 tron Exp $ +# $NetBSD: Makefile,v 1.154 2004/10/25 08:44:16 tron Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). -DISTNAME= apache_1.3.31 +DISTNAME= apache_1.3.32 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 7 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} @@ -18,8 +17,8 @@ COMMENT= Apache HTTP (Web) server NETBSD_LOGO= sitedrivenby.gif SITES_${NETBSD_LOGO}= http://www.NetBSD.org/images/logos/ -MODSSL_VERSION= 2.8.20 -MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.31 +MODSSL_VERSION= 2.8.21 +MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.32 MODSSL_DIST= ${MODSSL_DISTNAME}.tar.gz MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME} SITES_${MODSSL_DIST}= http://www.modssl.org/source/ \ diff --git a/www/apache/PLIST b/www/apache/PLIST index 41d5e5b9404..9c19318edfc 100644 --- a/www/apache/PLIST +++ b/www/apache/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2004/05/13 11:39:09 taca Exp $ +@comment $NetBSD: PLIST,v 1.12 2004/10/25 08:44:16 tron Exp $ bin/checkgid bin/dbmmanage bin/htdigest @@ -108,10 +108,6 @@ share/httpd/htdocs/manual/bind.html.en share/httpd/htdocs/manual/bind.html.fr share/httpd/htdocs/manual/bind.html.html share/httpd/htdocs/manual/bind.html.ja.jis -share/httpd/htdocs/manual/cgi_path.html.en -share/httpd/htdocs/manual/cgi_path.html.fr -share/httpd/htdocs/manual/cgi_path.html.html -share/httpd/htdocs/manual/cgi_path.html.ja.jis share/httpd/htdocs/manual/configuring.html.en share/httpd/htdocs/manual/configuring.html.fr share/httpd/htdocs/manual/configuring.html.html @@ -126,6 +122,7 @@ share/httpd/htdocs/manual/custom-error.html.ja.jis share/httpd/htdocs/manual/cygwin.html share/httpd/htdocs/manual/dns-caveats.html.en share/httpd/htdocs/manual/dns-caveats.html.fr +share/httpd/htdocs/manual/dns-caveats.html.ja.jis share/httpd/htdocs/manual/dns-caveats.html.html share/httpd/htdocs/manual/dso.html share/httpd/htdocs/manual/ebcdic.html @@ -169,6 +166,7 @@ share/httpd/htdocs/manual/install.html.html share/httpd/htdocs/manual/install.html.ja.jis share/httpd/htdocs/manual/invoking.html.en share/httpd/htdocs/manual/invoking.html.fr +share/httpd/htdocs/manual/invoking.html.ja.jis share/httpd/htdocs/manual/invoking.html.html share/httpd/htdocs/manual/keepalive.html.en share/httpd/htdocs/manual/keepalive.html.html @@ -321,7 +319,6 @@ share/httpd/htdocs/manual/new_features_1_2.html share/httpd/htdocs/manual/new_features_1_3.html.en share/httpd/htdocs/manual/new_features_1_3.html.html share/httpd/htdocs/manual/new_features_1_3.html.ja.jis -share/httpd/htdocs/manual/new_features_2_0.html share/httpd/htdocs/manual/process-model.html.en share/httpd/htdocs/manual/process-model.html.html share/httpd/htdocs/manual/process-model.html.ja.jis diff --git a/www/apache/distinfo b/www/apache/distinfo index d70556d7005..9286c9e7717 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.38 2004/10/18 09:28:08 tron Exp $ +$NetBSD: distinfo,v 1.39 2004/10/25 08:44:16 tron Exp $ -SHA1 (apache_1.3.31.tar.gz) = a5d4298e8f99cae220ba65b5ef128d5742c7298d -Size (apache_1.3.31.tar.gz) = 2467371 bytes +SHA1 (apache_1.3.32.tar.gz) = 815148a0a070fe6058a426026d77c45aefdf3d2a +Size (apache_1.3.32.tar.gz) = 2472811 bytes SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes -SHA1 (mod_ssl-2.8.20-1.3.31.tar.gz) = 10b4017241c7970d661521d4f04b7269bab8acb3 -Size (mod_ssl-2.8.20-1.3.31.tar.gz) = 754568 bytes +SHA1 (mod_ssl-2.8.21-1.3.32.tar.gz) = 6bbf83d716254e157b2c6ba9fd13e6b3bfc43239 +Size (mod_ssl-2.8.21-1.3.32.tar.gz) = 754629 bytes SHA1 (patch-aa) = 3a655678f5e99769f27fca06a8279b14a8e8e8be SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd @@ -20,4 +20,3 @@ SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955 SHA1 (patch-al) = a27b9676998621229dc3a1d920ea44b8e622feb2 SHA1 (patch-am) = d05f7c30b73c0e90daf17d9d1c4838be7fd73b02 SHA1 (patch-ao) = 5930f9ea0f5080b260a6e0c66a37c6d1ad0df4d4 -SHA1 (patch-ap) = da8016c534bbed4036837d8e494ea3d5bb4342ea diff --git a/www/apache/patches/patch-ap b/www/apache/patches/patch-ap deleted file mode 100644 index 02a1090d33e..00000000000 --- a/www/apache/patches/patch-ap +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ap,v 1.5 2004/09/24 06:04:00 tron Exp $ - ---- src/modules/proxy/proxy_http.c.orig 29 Mar 2004 17:47:15 -0000 1.106 -+++ src/modules/proxy/proxy_http.c 11 Jun 2004 07:54:38 -0000 1.107 -@@ -485,6 +485,13 @@ - content_length = ap_table_get(resp_hdrs, "Content-Length"); - if (content_length != NULL) { - c->len = ap_strtol(content_length, NULL, 10); -+ -+ if (c->len < 0) { -+ ap_kill_timeout(r); -+ return ap_proxyerror(r, HTTP_BAD_GATEWAY, ap_pstrcat(r->pool, -+ "Invalid Content-Length from remote server", -+ NULL)); -+ } - } - - } -- cgit v1.2.3