aboutsummaryrefslogtreecommitdiffstats
path: root/testing/apache2-mod-perl/mod_perl-remote-ip.patch
blob: e39d629d2eafd7dce37fd976bc1359fa8f324c02 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
Index: xs/tables/current/Apache2/StructureTable.pm
===================================================================
--- a/xs/tables/current/Apache2/StructureTable.pm	(revision 1324590)
+++ b/xs/tables/current/Apache2/StructureTable.pm	(working copy)
@@ -2708,11 +2708,11 @@
       },
       {
         'type' => 'apr_sockaddr_t *',
-        'name' => 'remote_addr'
+        'name' => 'client_addr'
       },
       {
         'type' => 'char *',
-        'name' => 'remote_ip'
+        'name' => 'client_ip'
       },
       {
         'type' => 'char *',
@@ -2955,6 +2955,14 @@
       },
       {
         'type' => 'char *',
+        'name' => 'useragent_ip'
+      },
+      {
+        'type' => 'apr_sockaddr_t *',
+        'name' => 'useragent_addr'
+      },
+      {
+        'type' => 'char *',
         'name' => 'the_request'
       },
       {
@@ -3245,10 +3253,6 @@
       },
       {
         'type' => 'int',
-        'name' => 'loglevel'
-      },
-      {
-        'type' => 'int',
         'name' => 'is_virtual'
       },
       {
Index: Apache-Reload/Makefile.PL
===================================================================
--- a/Apache-Reload/Makefile.PL	(revision 1324590)
+++ b/Apache-Reload/Makefile.PL	(working copy)
@@ -11,7 +11,7 @@
 # MOD_PERL_2_BUILD is set from building from mod_perl Makefile.PL which should
 # also set MP_APXS
 if ($ENV{MOD_PERL_2_BUILD}) {
-    push @ARGV, "-apxs", $ENV{MP_APXS};
+    push @ARGV, "-apxs $ENV{MP_APXS}";
     my $mp_gen = satisfy_mp_generation(2);
 }
 else {
Index: Apache-SizeLimit/Makefile.PL
===================================================================
--- a/Apache-SizeLimit/Makefile.PL	(revision 1324590)
+++ b/Apache-SizeLimit/Makefile.PL	(working copy)
@@ -11,7 +11,7 @@
 # MOD_PERL_2_BUILD is set from building from mod_perl Makefile.PL which should
 # also set MP_APXS
 if ($ENV{MOD_PERL_2_BUILD}) {
-    push @ARGV, "-apxs", $ENV{MP_APXS};
+    push @ARGV, "-apxs $ENV{MP_APXS}";
     my $mp_gen = satisfy_mp_generation(2);
 }
 else {