Index: jk/native2/server/apache13/jk_service_apache13.c
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c,v
retrieving revision 1.8
diff -u -r1.8 jk_service_apache13.c
--- jk/native2/server/apache13/jk_service_apache13.c	27 Sep 2002 17:49:01 -0000	1.8
+++ jk/native2/server/apache13/jk_service_apache13.c	1 Oct 2002 11:09:09 -0000
@@ -443,6 +443,17 @@
         s->headers_in->put( env, s->headers_in, "content-length", "0", NULL );
     }
 
+    /* If this an ErrorDocument request, pass the REDIRECT ENV variables as headers */
+    if (r->prev) {
+        if (r->prev->args) {
+            s->headers_in->put( env, s->headers_in, "REDIRECT_QUERY_STRING", r->prev->args, NULL );
+        }
+
+        if (r->prev->uri) {
+            s->headers_in->put( env, s->headers_in, "REDIRECT_URL", r->prev->uri, NULL );
+        }
+    }
+
     jk2_map_default_create(env, &s->headers_out, s->pool );
 
     return JK_OK;
Index: jk/native2/server/apache2/jk_service_apache2.c
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.29
diff -u -r1.29 jk_service_apache2.c
--- jk/native2/server/apache2/jk_service_apache2.c	27 Sep 2002 13:14:09 -0000	1.29
+++ jk/native2/server/apache2/jk_service_apache2.c	1 Oct 2002 11:09:10 -0000
@@ -548,6 +548,17 @@
         s->headers_in->put( env, s->headers_in, "content-length", "0", NULL );
     }
 
+    /* If this an ErrorDocument request, pass the REDIRECT ENV variables as headers */
+    if (r->prev) {
+        if (r->prev->args) {
+            s->headers_in->put( env, s->headers_in, "REDIRECT_QUERY_STRING", r->prev->args, NULL );
+        }
+
+        if (r->prev->uri) {
+            s->headers_in->put( env, s->headers_in, "REDIRECT_URL", r->prev->uri, NULL );
+        }
+    }
+
 #ifdef USE_APRTABLES
     jk2_map_aprtable_factory( env, s->pool, (void *)&s->headers_out,
                              "map", "aprtable" );