httpd-cvs mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1325644&view=rev
Log:
add missing charset conversion of subject in some places

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

Modified: httpd/mod_mbox/branches/convert-charsets/module-2.0/mod_mbox_out.c
URL: http://svn.apache.org/viewvc/httpd/mod_mbox/branches/convert-charsets/module-2.0/mod_mbox_out.c?rev=1325644&r1=1325643&r2=1325644&view=diff
==============================================================================
--- httpd/mod_mbox/branches/convert-charsets/module-2.0/mod_mbox_out.c (original)
+++ httpd/mod_mbox/branches/convert-charsets/module-2.0/mod_mbox_out.c Fri Apr 13 08:09:08
2012
@@ -1115,7 +1115,7 @@ int mbox_static_message(request_rec *r, 
     Message *m;
 
     const char *baseURI;
-    char *from, **context, *msgID, *escaped_msgID;
+    char *from, **context, *msgID, *escaped_msgID, *subject;
 
     conf = ap_get_module_config(r->per_dir_config, &mbox_module);
     baseURI = get_base_uri(r);
@@ -1141,8 +1141,9 @@ int mbox_static_message(request_rec *r, 
                                              m->charset,
                                              m->cte, m->boundary);
 
+    subject = mbox_cte_decode_header(r->pool, m->subject);
     send_page_header(r,
-                     ESCAPE_OR_BLANK(r->pool, m->subject),
+                     ESCAPE_OR_BLANK(r->pool, subject),
                      apr_psprintf(r->pool, "%s mailing list archives",
                                   get_base_name(r)),
                      0);
@@ -1191,7 +1192,7 @@ int mbox_static_message(request_rec *r, 
     ap_rprintf(r, "   <tr class=\"subject\">\n"
                "    <td class=\"left\">Subject</td>\n"
                "    <td class=\"right\">%s</td>\n"
-               "   </tr>\n", ESCAPE_OR_BLANK(r->pool, m->subject));
+               "   </tr>\n", ESCAPE_OR_BLANK(r->pool, subject));
 
     ap_rprintf(r, "   <tr class=\"date\">\n"
                "    <td class=\"left\">Date</td>\n"



Mime
View raw message