httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1325645 - /httpd/mod_mbox/branches/convert-charsets/module-2.0/mod_mbox_mime.c
Date Fri, 13 Apr 2012 08:09:22 GMT
Author: sf
Date: Fri Apr 13 08:09:22 2012
New Revision: 1325645

URL: http://svn.apache.org/viewvc?rev=1325645&view=rev
Log:
html-escape untrusted data, always print content-type in MIME-structure

Modified:
    httpd/mod_mbox/branches/convert-charsets/module-2.0/mod_mbox_mime.c

Modified: httpd/mod_mbox/branches/convert-charsets/module-2.0/mod_mbox_mime.c
URL: http://svn.apache.org/viewvc/httpd/mod_mbox/branches/convert-charsets/module-2.0/mod_mbox_mime.c?rev=1325645&r1=1325644&r2=1325645&view=diff
==============================================================================
--- httpd/mod_mbox/branches/convert-charsets/module-2.0/mod_mbox_mime.c (original)
+++ httpd/mod_mbox/branches/convert-charsets/module-2.0/mod_mbox_mime.c Fri Apr 13 08:09:22
2012
@@ -437,10 +437,12 @@ void mbox_mime_display_static_structure(
     }
 
     if (m->content_name) {
-        ap_rprintf(r, "%s", m->content_name);
+        ap_rprintf(r, "%s (%s)",
+                   ESCAPE_OR_BLANK(r->pool, m->content_name),
+                   ESCAPE_OR_BLANK(r->pool, m->content_type));
     }
     else {
-        ap_rprintf(r, "Unnamed %s", m->content_type);
+        ap_rprintf(r, "Unnamed %s", ESCAPE_OR_BLANK(r->pool, m->content_type));
     }
 
     if (m->body_len) {



Mime
View raw message