Merge branch 'branch_0.12.0' into branch_0.12.0-svn

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

diff --git a/include/chxj_add_device_env.h b/include/chxj_add_device_env.h
index f29fe60..8533b1b 100644 (file)
--- a/include/chxj_add_device_env.h
+++ b/include/chxj_add_device_env.h
@@ -61,7 +61,7 @@
 #define HTTP_X_CHXJ_WP_WIDTH "X-Chxj-WP-Width"
 
 /* "X-Chxj-WP-Height"    => { <wp_height> } */
-#define HTTP_X_CHXJ_WP_HEIGHT "X-Chxj-WP-Width"
+#define HTTP_X_CHXJ_WP_HEIGHT "X-Chxj-WP-Height"
 
 /* "X-Chxj-Cache"        => { <cache> } */
 #define HTTP_X_CHXJ_CACHE    "X-Chxj-Cache"

diff --git a/src/chxj_add_device_env.c b/src/chxj_add_device_env.c
index 8ef3729..3006156 100644 (file)
--- a/src/chxj_add_device_env.c
+++ b/src/chxj_add_device_env.c
@@ -57,7 +57,7 @@ chxj_add_device_env(request_rec *r, device_table *spec)
   case CHXJ_SPEC_Chtml_3_0:        apr_table_setn(r->headers_in, HTTP_X_CHXJ_HTMLSPECTYPE, "CHTML3.0"); break;
   case CHXJ_SPEC_Chtml_4_0:        apr_table_setn(r->headers_in, HTTP_X_CHXJ_HTMLSPECTYPE, "CHTML4.0"); break;
   case CHXJ_SPEC_Chtml_5_0:        apr_table_setn(r->headers_in, HTTP_X_CHXJ_HTMLSPECTYPE, "CHTML5.0"); break;
-  case CHXJ_SPEC_Chtml_6_0:        apr_table_setn(r->headers_in, HTTP_X_CHXJ_HTMLSPECTYPE, "CHXJL6.0"); break;
+  case CHXJ_SPEC_Chtml_6_0:        apr_table_setn(r->headers_in, HTTP_X_CHXJ_HTMLSPECTYPE, "CHTML6.0"); break;
   case CHXJ_SPEC_Chtml_7_0:        apr_table_setn(r->headers_in, HTTP_X_CHXJ_HTMLSPECTYPE, "CHTML7.0"); break;
   case CHXJ_SPEC_XHtml_Mobile_1_0: apr_table_setn(r->headers_in, HTTP_X_CHXJ_HTMLSPECTYPE, "XHTML");    break;
   case CHXJ_SPEC_Hdml:             apr_table_setn(r->headers_in, HTTP_X_CHXJ_HTMLSPECTYPE, "HDML");     break;