++++ mod_fastcgi-2.4.2/fcgi_protocol.c 2004-10-06 20:49:14.570481275 +0200
+@@ -135,11 +135,11 @@
+ {
+ table *e = r->subprocess_env;
+
+- ap_table_setn(e, "GATEWAY_INTERFACE", "CGI/1.1");
+- ap_table_setn(e, "SERVER_PROTOCOL", r->protocol);
+- ap_table_setn(e, "REQUEST_METHOD", r->method);
+- ap_table_setn(e, "QUERY_STRING", r->args ? r->args : "");
+- ap_table_setn(e, "REQUEST_URI", apache_original_uri(r));
++ apr_table_setn(e, "GATEWAY_INTERFACE", "CGI/1.1");
++ apr_table_setn(e, "SERVER_PROTOCOL", r->protocol);
++ apr_table_setn(e, "REQUEST_METHOD", r->method);
++ apr_table_setn(e, "QUERY_STRING", r->args ? r->args : "");
++ apr_table_setn(e, "REQUEST_URI", apache_original_uri(r));
+
+ /* The FastCGI spec precludes sending of CONTENT_LENGTH, PATH_INFO,
+ * PATH_TRANSLATED, and SCRIPT_NAME (for some reason?). PATH_TRANSLATED we
+@@ -155,17 +155,17 @@
+ * args and path_info of the original request, and not any that may have
+ * come with the script URI in the include command. Ugh. */
+ if (!strcmp(r->protocol, "INCLUDED")) {
+- ap_table_setn(e, "SCRIPT_NAME", r->uri);
++ apr_table_setn(e, "SCRIPT_NAME", r->uri);
+ if (r->path_info && *r->path_info)
+- ap_table_setn(e, "PATH_INFO", r->path_info);
++ apr_table_setn(e, "PATH_INFO", r->path_info);
+ }
+ else if (!r->path_info || !*r->path_info)
+- ap_table_setn(e, "SCRIPT_NAME", r->uri);
++ apr_table_setn(e, "SCRIPT_NAME", r->uri);
+ else {
+ int path_info_start = ap_find_path_info(r->uri, r->path_info);
+
+- ap_table_setn(e, "SCRIPT_NAME", ap_pstrndup(r->pool, r->uri, path_info_start));
+- ap_table_setn(e, "PATH_INFO", r->path_info);
++ apr_table_setn(e, "SCRIPT_NAME", ap_pstrndup(r->pool, r->uri, path_info_start));
++ apr_table_setn(e, "PATH_INFO", r->path_info);
+ }
+ }
+
+@@ -178,9 +178,9 @@