Attachment 575065 Details for Bug 809742 – proposed patch

[patch] proposed patch

0001-Fix-compilation-with-httpd-2.4.patch (text/plain), 2.92 KB, created by Jan Kaluža on 2012-04-04 09:11:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kaluža

Created: 2012-04-04 09:11:49 UTC

Size: 2.92 KB

patch

obsolete

>From 9d2dec0ea8c61add8406e65c86b5106f16c90f6e Mon Sep 17 00:00:00 2001
>From: Jan Kaluza <hanzz.k@gmail.com>
>Date: Wed, 4 Apr 2012 10:05:10 +0200
>Subject: [PATCH] Fix compilation with httpd-2.4
>
>---
> mod_bw-httpd24.patch |   31 +++++++++++++++++++++++++++++++
> mod_bw.spec          |    9 +++++++--
> 2 files changed, 38 insertions(+), 2 deletions(-)
> create mode 100644 mod_bw-httpd24.patch
>
>diff --git a/mod_bw-httpd24.patch b/mod_bw-httpd24.patch
>new file mode 100644
>index 0000000..0d9e8c3
>--- /dev/null
>+++ b/mod_bw-httpd24.patch
>@@ -0,0 +1,31 @@
>+diff --git a/mod_bw.c b/mod_bw.c
>+index a49caf8..8b75973 100644
>+--- a/mod_bw.c
>++++ b/mod_bw.c
>+@@ -519,7 +519,7 @@ static long get_bw_rate(request_rec * r, apr_array_header_t * a)
>+             return e[i].rate;
>+ 
>+         case T_IP:
>+-            if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
>++            if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) {
>+                 return e[i].rate;
>+             }
>+             break;
>+@@ -608,7 +608,7 @@ static int get_maxconn(request_rec * r, apr_array_header_t * a)
>+             return e[i].max;
>+ 
>+         case T_IP:
>+-            if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
>++            if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) {
>+                 return e[i].max;
>+             }
>+             break;
>+@@ -659,7 +659,7 @@ static int get_sid(request_rec * r, apr_array_header_t * a)
>+             return e[i].sid;
>+ 
>+         case T_IP:
>+-            if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
>++            if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) {
>+                 return e[i].sid;
>+             }
>+             break;
>diff --git a/mod_bw.spec b/mod_bw.spec
>index 8f3f639..336dc61 100644
>--- a/mod_bw.spec
>+++ b/mod_bw.spec
>@@ -2,7 +2,7 @@
> 
> Name:           mod_bw
> Version:        0.8
>-Release:        7%{?dist}
>+Release:        8%{?dist}
> Summary:        Bandwidth Limiter For Apache
> 
> Group:          System Environment/Daemons
>@@ -10,6 +10,7 @@ License:        ASL 2.0
> URL:            http://www.ivn.cl/apache
> Source0:        http://www.ivn.cl/apache/files/source/mod_bw-%{version}.tgz
> Source1:        mod_bw.conf
>+Patch0:         mod_bw-httpd24.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  httpd-devel
>@@ -23,12 +24,13 @@ mod_bw is a bandwidth administration module for Apache httpd 2.x
> 
> %prep
> %setup -q -n mod_bw
>+%patch0 -p1 -b .httpd24
> mv mod_bw.txt mod_bw.txt.iso8859
> iconv -f ISO-8859-1 -t UTF-8 mod_bw.txt.iso8859 > mod_bw.txt 
> 
> 
> %build
>-%{_sbindir}/apxs -Wc,"%{optflags}" -c mod_bw.c
>+%{_bindir}/apxs -Wc,"%{optflags}" -c mod_bw.c
> 
> 
> %install
>@@ -51,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Wed Apr 04 2012 Jan Kaluza <jkaluza@redhat.com> - 0.8-8
>+- Fix compilation with httpd-2.4
>+
> * Wed Mar 14 2012 Jakub Hrozek <jhrozek@redhat.com> - 0.8-7
> - Do not require httpd itself
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 809742: 575065