summaryrefslogtreecommitdiff
path: root/apache-mod_watch-PLD-v6stuff.patch
blob: 50221231ceb163060dc6ef974e8cbd70507fa7bb (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
--- mod_watch-3.13/mod_watch.c	Sun Aug  4 16:10:50 2002
+++ mod_watch.c	Fri Aug 30 11:51:22 2002
@@ -719,8 +719,14 @@
 	struct watchConfDir *dconf;
 
 	/* Do not count if the connection is excluded. */
+#ifdef INET6
+	if (r->connection->remote_addr.ss_family != AF_INET
+	||  ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)
+	&& !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr))
+#else
 	if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr)
 	&& !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr))
+#endif
 		return DECLINED;
 
 /*	ap_register_cleanup(r->pool, r, watchClean, ap_null_cleanup); */
@@ -831,8 +837,14 @@
 	}
 
 	/* Do not count if the connection is excluded. */
+#ifdef INET6
+	if (r->connection->remote_addr.ss_family != AF_INET
+	||  ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)
+	&& !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr))
+#else
 	if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr)
 	&& !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr))
+#endif
 		return DECLINED;
 
 	/* Find last sub-request for bytes actually sent. */