diff options
| author | spz <spz@pkgsrc.org> | 2012-12-23 21:32:41 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2012-12-23 21:32:41 +0000 |
| commit | 3e2529009beeff38cd2fc90a7df963ea84868842 (patch) | |
| tree | e81a9fd0265c9c31c7a44037ff921c88a19d1263 /www/apache22 | |
| parent | c4ba3c6018256a0545b4f4c80b6dc411017e992e (diff) | |
| download | pkgsrc-3e2529009beeff38cd2fc90a7df963ea84868842.tar.gz | |
Apply patch https://issues.apache.org/bugzilla/show_bug.cgi?id=49491
from upstream for a bug that lets the devel/rt3 mailgate fail rather
dismally when present. Reviewed by tron.
Diffstat (limited to 'www/apache22')
| -rw-r--r-- | www/apache22/Makefile | 4 | ||||
| -rw-r--r-- | www/apache22/distinfo | 3 | ||||
| -rw-r--r-- | www/apache22/patches/patch-modules_ssl_ssl__engine__kernel.c | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 4b6b4467511..5bd4cce17f9 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.84 2012/12/16 01:52:37 obache Exp $ +# $NetBSD: Makefile,v 1.85 2012/12/23 21:32:41 spz Exp $ DISTNAME= httpd-2.2.23 PKGNAME= ${DISTNAME:S/httpd/apache/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ http://archive.apache.org/dist/httpd/ \ diff --git a/www/apache22/distinfo b/www/apache22/distinfo index 8152b5b6fe1..fb8044f1599 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.52 2012/09/16 03:33:10 taca Exp $ +$NetBSD: distinfo,v 1.53 2012/12/23 21:32:42 spz Exp $ SHA1 (httpd-2.2.23.tar.bz2) = 2776145201068045d4ed83157a0e2e1c28c4c453 RMD160 (httpd-2.2.23.tar.bz2) = 16b15876d8296a2733d4d28a8a78362d0677792d @@ -15,4 +15,5 @@ SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08 SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4 SHA1 (patch-docs_man_apxs.8) = 70797ea73ae6379492971bec1106a8427ae7fdaa SHA1 (patch-lock.c) = 770ca03f1cb4421879bd5baa5a7c30cc91acb6e1 +SHA1 (patch-modules_ssl_ssl__engine__kernel.c) = fd6f425d18231f0daca9fc2553638891a7241a4a SHA1 (patch-repos.c) = 0e0361b91d4b0fe6c7c55a12fdfd2e6aacc710e1 diff --git a/www/apache22/patches/patch-modules_ssl_ssl__engine__kernel.c b/www/apache22/patches/patch-modules_ssl_ssl__engine__kernel.c new file mode 100644 index 00000000000..dff3d1ce26c --- /dev/null +++ b/www/apache22/patches/patch-modules_ssl_ssl__engine__kernel.c @@ -0,0 +1,15 @@ +$NetBSD: patch-modules_ssl_ssl__engine__kernel.c,v 1.1 2012/12/23 21:32:42 spz Exp $ + +https://issues.apache.org/bugzilla/show_bug.cgi?id=49491 + +--- ./modules/ssl/ssl_engine_kernel.c.orig 2012-08-20 15:53:11.000000000 +0000 ++++ ./modules/ssl/ssl_engine_kernel.c 2012-12-21 08:18:57.000000000 +0000 +@@ -136,7 +136,7 @@ int ssl_hook_ReadReq(request_rec *r) + if (rv != APR_SUCCESS || scope_id) { + return HTTP_BAD_REQUEST; + } +- if (strcmp(host, servername)) { ++ if (strcasecmp(host, servername)) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, + "Hostname %s provided via SNI and hostname %s provided" + " via HTTP are different", servername, host); |