On 7/20/07, Jeff Trawick <[EMAIL PROTECTED]> wrote:
On 7/20/07, Sander Temme <[EMAIL PROTECTED]> wrote:
>
> On Jul 20, 2007, at 7:30 AM, Jeff Trawick wrote:
>
> > Index: src/modules/standard/mod_status.c
>
> +1, it's the same stuff we did for 2.2 in r549159.
>
> What about the ap_escape_logitem stuff in that same commit, does that
> apply to 1.3?

unidiotified patch attached
(indentation looks slightly off due to use of tabs in original code)

browser appearance of ExtendedStatus section w/o ap_escape_logitem():

GET /cgi-bin/sleep.pl/fooýüûúùø÷ö HTTP/1.1

with:

GET /cgi-bin/sleep.pl/foo\xfd\xfc\xfb\xfa\xf9\xf8\xf7\xf6 HTTP/1.1
Index: src/modules/standard/mod_status.c
===================================================================
--- src/modules/standard/mod_status.c   (revision 558006)
+++ src/modules/standard/mod_status.c   (working copy)
@@ -221,7 +221,7 @@
     if (r->method_number != M_GET)
        return DECLINED;
 
-    r->content_type = "text/html";
+    r->content_type = "text/html; charset=ISO-8859-1";
 
     /*
      * Simple table-driven form data set parser that lets you alter the header
@@ -247,7 +247,7 @@
                    no_table_report = 1;
                    break;
                case STAT_OPT_AUTO:
-                   r->content_type = "text/plain";
+                   r->content_type = "text/plain; charset=ISO-8859-1";
                    short_report = 1;
                    break;
                }
@@ -570,7 +570,8 @@
                        ap_rputs(")\n", r);
                        ap_rprintf(r, " <i>%s {%s}</i> <b>[%s]</b><br>\n\n",
                            ap_escape_html(r->pool, score_record.client),
-                           ap_escape_html(r->pool, score_record.request),
+                           ap_escape_html(r->pool,
+                                           ap_escape_logitem(r->pool, 
score_record.request)),
                            vhost ? ap_escape_html(r->pool, 
                                vhost->server_hostname) : "(unavailable)");
                    }
@@ -657,7 +658,8 @@
                             ap_escape_html(r->pool, score_record.client),
                             vhost ? ap_escape_html(r->pool, 
                                vhost->server_hostname) : "(unavailable)",
-                            ap_escape_html(r->pool, score_record.request));
+                            ap_escape_html(r->pool,
+                                            ap_escape_logitem(r->pool, 
score_record.request)));
                    }           /* no_table_report */
                }                       /* !short_report */
            }                   /* if (<active child>) */

Reply via email to