OSDN Git Service

(root) / modchxj / mod_chxj.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5b685dc)
* Added test for meta tag.
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Thu, 14 Feb 2008 08:44:10 +0000 (08:44 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Thu, 14 Feb 2008 08:44:10 +0000 (08:44 +0000)
  * Added meta tag convert routine.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1848 1a406e8e-add9-4483-a2c8-d8cac5b7c224

sample_site/1.php patch | blob | history
src/chxj_jhtml.c patch | blob | history

diff --git a/sample_site/1.php b/sample_site/1.php
index 124ba3b..7c008d1 100644 (file)
--- a/sample_site/1.php
+++ b/sample_site/1.php
@@ -5,6 +5,7 @@ header("Pragma: no-cache");
 ?>
 <html>
   <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=EUCJP-WIN">
     <title>mod_chxj\8eÃ\8e½\8eÄ\8e»\8e²\8eÄ</title>
   </head>
   <body>
diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 1e5efc7..cd33e3e 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -543,13 +543,12 @@ s_jhtml_start_meta_tag(void *pdoc, Node *node)
                         value,
                         "\"",
                         NULL);
-        if ((*value == 'c' || *value == 'C') 
-        && strcasecmp(value, "content-type") == 0) {
+        if (STRCASEEQ('c','C',"content-type", value)) {
           content_type_flag = 1;
         }
-        if ((*value == 'r' || *value == 'R')
-        && strcasecmp(value, "refresh") == 0)
+        if (STRCASEEQ('r','R',"refresh", value)) {
           refresh_flag = 1;
+        }
       }
       break;
 
@@ -560,14 +559,26 @@ s_jhtml_start_meta_tag(void *pdoc, Node *node)
         /* CHTML 2.0                                                            */
         /*----------------------------------------------------------------------*/
         if (content_type_flag)  {
-          jhtml->out = apr_pstrcat(r->pool,
-                                  jhtml->out,
-                                  " ",
-                                  name,
-                                  "=\"",
-                                  "text/html; charset=Windows-31J",
-                                  "\"",
-                                  NULL);
+          if (IS_SJIS_STRING(GET_SPEC_CHARSET(jhtml->spec))) {
+            jhtml->out = apr_pstrcat(r->pool,
+                                    jhtml->out,
+                                    " ",
+                                    name,
+                                    "=\"",
+                                    "text/html; charset=Windows-31J",
+                                    "\"",
+                                    NULL);
+          }
+          else {
+            jhtml->out = apr_pstrcat(r->pool,
+                                    jhtml->out,
+                                    " ",
+                                    name,
+                                    "=\"",
+                                    "text/html; charset=UTF-8",
+                                    "\"",
+                                    NULL);
+          }
         }
         else
         if (refresh_flag) {
mod_chxj
About OSDN
Find Software
Develop Software
Help