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

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

diff --git a/include/chxj_add_device_env.h b/include/chxj_add_device_env.h
index a091b0b..82cae00 100644 (file)
--- a/include/chxj_add_device_env.h
+++ b/include/chxj_add_device_env.h
@@ -66,6 +66,8 @@
 /* "X-Chxj-Cache"        => { <cache> } */
 #define HTTP_X_CHXJ_CACHE    "X-Chxj-Cache"
 
+#define HTTP_X_CHXJ_VERSION  "X-Chxj-Version"
+
 extern void chxj_add_device_env(request_rec *r, device_table *spec);
 
 #endif

diff --git a/src/chxj_add_device_env.c b/src/chxj_add_device_env.c
index 78b16e6..4fa865f 100644 (file)
--- a/src/chxj_add_device_env.c
+++ b/src/chxj_add_device_env.c
@@ -78,5 +78,7 @@ chxj_add_device_env(request_rec *r, device_table *spec)
   apr_table_setn(r->headers_in, HTTP_X_CHXJ_WP_HEIGHT,apr_psprintf(r->pool, "%d", spec->wp_heigh));
   apr_table_setn(r->headers_in, HTTP_X_CHXJ_CACHE,    apr_psprintf(r->pool, "%d", spec->cache));
 
+  apr_table_setn(r->headers_in, HTTP_X_CHXJ_VERSION,  apr_pstrdup(r->pool, PACKAGE_VERSION));
+
   DBG(r, "REQ[%X] end chxj_add_device_env()", (unsigned int)(apr_size_t)r);
 }