- allow building with ipv6 patch

Changed files:
    apache-mod_watch-PLD-v6stuff.patch -> 1.1
    apache1-mod_watch-PLD-v6stuff.patch -> 1.1

diff --git a/apache-mod_watch-PLD-v6stuff.patch b/apache-mod_watch-PLD-v6stuff.patch
new file mode 100644 (file)
index 0000000..4500895
--- /dev/null
+++ b/apache-mod_watch-PLD-v6stuff.patch
@@ -0,0 +1,24 @@
+--- mod_watch.c        Sun Aug  4 16:10:50 2002
++++ mod_watch.c.new    Thu Aug 29 21:26:09 2002
+@@ -719,8 +719,8 @@
+       struct watchConfDir *dconf;
+ 
+       /* Do not count if the connection is excluded. */
+-      if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr)
+-      && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr))
++      if (ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)
++      && !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr))
+               return DECLINED;
+ 
+ /*    ap_register_cleanup(r->pool, r, watchClean, ap_null_cleanup); */
+@@ -831,8 +831,8 @@
+       }
+ 
+       /* Do not count if the connection is excluded. */
+-      if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr)
+-      && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr))
++      if (ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)
++      && !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr))
+               return DECLINED;
+ 
+       /* Find last sub-request for bytes actually sent. */

diff --git a/apache1-mod_watch-PLD-v6stuff.patch b/apache1-mod_watch-PLD-v6stuff.patch
new file mode 100644 (file)
index 0000000..4500895
--- /dev/null
+++ b/apache1-mod_watch-PLD-v6stuff.patch
@@ -0,0 +1,24 @@
+--- mod_watch.c        Sun Aug  4 16:10:50 2002
++++ mod_watch.c.new    Thu Aug 29 21:26:09 2002
+@@ -719,8 +719,8 @@
+       struct watchConfDir *dconf;
+ 
+       /* Do not count if the connection is excluded. */
+-      if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr)
+-      && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr))
++      if (ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)
++      && !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr))
+               return DECLINED;
+ 
+ /*    ap_register_cleanup(r->pool, r, watchClean, ap_null_cleanup); */
+@@ -831,8 +831,8 @@
+       }
+ 
+       /* Do not count if the connection is excluded. */
+-      if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr)
+-      && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr))
++      if (ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)
++      && !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr))
+               return DECLINED;
+ 
+       /* Find last sub-request for bytes actually sent. */