Bug#666797: Building for apache 2.4

Arno Töll <[email protected]> Sat, 21 Apr 2012 01:35:21 +0200
Newsgroups gmane.linux.debian.devel.bugs.general,gmane.comp.apache.mod-log-sql
Message-ID <[email protected]>
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enigA17FE1904E1E2831058CFFE1
Content-Type: multipart/mixed;
 boundary="------------040508010500030603030304"

This is a multi-part message in MIME format.
--------------040508010500030603030304
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

tags 666797 +upstream +patch
thanks

Hi Thomas,

please try the attached patch. I didn't verify whether it really does
what I think, but it compiles fine now. You may want to forward the
patch to upstream once you tested it.

--=20
with kind regards,
Arno T=C3=B6ll
IRC: daemonkeeper on Freenode/OFTC
GnuPG Key-ID: 0x9D80F36D

--------------040508010500030603030304
Content-Type: text/x-diff;
 name="apache24-port.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename="apache24-port.patch"

Description: Port connection object to Apache 2.4 API
 Replace conn_rec->remote_ip by request_rec->useragent_ip
 .
 See http://httpd.apache.org/docs/2.4/developer/new_api_2_4.html
Author: Arno T=C3=B6ll <[email protected]>

Last-Update: 2012-04-21

--- a/functions.h
+++ b/functions.h
@@ -14,7 +14,7 @@
=20
 static const char *extract_remote_address(request_rec *r, char *a)
 {
-    return r->connection->remote_ip;
+    return r->useragent_ip;
 }
=20
 static const char *extract_local_address(request_rec *r, char *a) __attr=
ibute__((unused));

--------------040508010500030603030304--

--------------enigA17FE1904E1E2831058CFFE1
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJPkfK7AAoJEMcrUe6dgPNt1vQQANMTuyq7QenxdBTuqZyOfHJI
GkX5uie2YISP2RBdvKEA2Ozrcy4DN2lRvUHQ1Jw2izJiZsHZPpkohwO4ugJVk5V4
SViE7A59cvZf6k2NE0qkjlbS/eTZpRaI0fzF32+SElRxp2o4zASvXzgfmZvosGkW
qtzpEj9pdPtNGooTZIo/DuhqZ8O0ZRdl30Qzu20IkmD5xcgMJs7X1/lnSK58cGFZ
nDltAqmTP2o58hPvZjIhizvLvaBCTt5VFzu25F1R2c6TsFguzdLvDtvvh4XY1eAH
BqG0xNgTJ+kfzjRDnkKgFF8oCTMQ/gk8HA2diijtgCuJC67UEywPna8WXj9/7kTB
3pmZ0xQdU0l/VRZ6z5odFcjRDQm8BwTiwOBKhHOE8bmpJ2BSG3OL5Wb5/CdIZQtk
YjhuAQFKq9WuQiVE0neoNqEtNpUgoQxnYyDWyx0lK7Yet6HJCSvB6MCx2js1L3KN
O+q1SDYBTp58dSdZUF14rwQ2/thMOlcjymf/3OYaXj6WI5HeM8f053vPUYhypdFC
l3ZGWDz4Pxln22iFdg0QdY+uB2Rk9ntzPl5cs4XS9PM4EhRuCv/gXehM50+TWFCa
NRoZQZfJDoXyuHg6QNt3WLmb+ezAxU6a1834n1iPKQAPeDAcQLCKDLUNz9tzYkWD
g9lImvgrsZwxGYshN3Dk
=ifPj
-----END PGP SIGNATURE-----

--------------enigA17FE1904E1E2831058CFFE1--