Merge branch 'branch_0.11.0' into branch_0.12.0

Conflicts:

	configure
	configure.ac
	include/config.h
	src/mod_chxj.c

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

diff --git a/ChangeLog b/ChangeLog
index 3aa1896..4444eb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+libapache2-mod-chxj (0.11.1-1) unstable; urgency=low
+
+  * Fixed bug.
+    - ``Off'' did not work by the ChxjImageEngine directive.
+      (Reported by R. thanks!)
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Thu, 24 Apr 2008 19:54:14 +0900
+
 libapache2-mod-chxj (0.11.0-1) unstable; urgency=low
 
   * Fixed bug.

diff --git a/debian/changelog b/debian/changelog
index 651a141..daf1ae8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libapache2-mod-chxj (0.11.1-1) unstable; urgency=low
+
+  * Fixed bug. 
+    - ``Off'' did not work by the ChxjImageEngine directive. 
+      (Reported by R. thanks!)
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Thu, 24 Apr 2008 19:54:14 +0900
+
 libapache2-mod-chxj (0.11.0-1) unstable; urgency=low
 
   * Fixed bug.

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index 18e3842..5d649aa 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -379,8 +379,9 @@ typedef struct {
 
 module AP_MODULE_DECLARE_DATA chxj_module;
 
-#define CHXJ_IMG_ON     (1)
-#define CHXJ_IMG_OFF    (0)
+#define CHXJ_IMG_ON     (2)
+#define CHXJ_IMG_OFF    (1)
+#define CHXJ_IMG_NONE   (0)
 
 
 #define DBG(X,args...)  chxj_log_rerror(APLOG_MARK,APLOG_DEBUG,0,(request_rec*)(X),##args)

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index a50a3a2..d0505eb 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -675,7 +675,8 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
     if (! STRNCASEEQ('t','T',"text/html",r->content_type, sizeof("text/html")-1)
     &&  ! STRNCASEEQ('t','T',"text/xml", r->content_type, sizeof("text/xml")-1)
     &&  ! STRNCASEEQ('a','A',"application/xhtml+xml", r->content_type, sizeof("application/xhtml+xml")-1)
-    &&  ! (STRNCASEEQ('i','I',"image/",  r->content_type, sizeof("image/") -1)
+    &&  ! (dconf->image == CHXJ_IMG_ON
+          && STRNCASEEQ('i','I',"image/",  r->content_type, sizeof("image/") -1)
           && ( STRCASEEQ('j','J',"jpeg",            &r->content_type[6])         /* JPEG */
             || STRCASEEQ('j','J',"jp2",             &r->content_type[6])         /* JPEG2000 */
             || STRCASEEQ('j','J',"jpeg2000",        &r->content_type[6])         /* JPEG2000 */
@@ -863,6 +864,7 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
         if (spec->html_spec_type != CHXJ_SPEC_UNKNOWN 
             && r->content_type 
             && ( *r->content_type == 'i' || *r->content_type == 'I')
+            && dconf->image == CHXJ_IMG_ON
             && strncasecmp("image/", r->content_type, 6) == 0
             && ( STRCASEEQ('j','J',"jpeg",            &r->content_type[6])         /* JPEG */
               || STRCASEEQ('j','J',"jp2",             &r->content_type[6])         /* JPEG2000 */
@@ -1347,7 +1349,7 @@ chxj_create_per_dir_config(apr_pool_t *p, char *arg)
   conf->emoji_data_file  = NULL;
   conf->emoji            = NULL;
   conf->emoji_tail       = NULL;
-  conf->image            = CHXJ_IMG_OFF;
+  conf->image            = CHXJ_IMG_NONE;
   conf->image_cache_dir  = apr_psprintf(p, "%s",DEFAULT_IMAGE_CACHE_DIR);
   conf->image_cache_limit = 0;
   conf->server_side_encoding = NULL;
@@ -1400,7 +1402,7 @@ chxj_merge_per_dir_config(apr_pool_t *p, void *basev, void *addv)
   mrg->device_data_file = NULL;
   mrg->devices          = NULL;
   mrg->emoji_data_file  = NULL;
-  mrg->image            = CHXJ_IMG_OFF;
+  mrg->image            = CHXJ_IMG_NONE;
   mrg->image_cache_dir  = NULL;
   mrg->image_copyright  = NULL;
   mrg->image_cache_limit  = 0;
@@ -1429,11 +1431,12 @@ chxj_merge_per_dir_config(apr_pool_t *p, void *basev, void *addv)
     mrg->emoji_data_file = apr_pstrdup(p, add->emoji_data_file);
   }
 
-  if (add->image == CHXJ_IMG_OFF) 
+  if (add->image == CHXJ_IMG_NONE) {
     mrg->image = base->image;
-  else 
+  }
+  else {
     mrg->image = add->image;
-
+  }
 
   if (strcasecmp(add->image_cache_dir ,DEFAULT_IMAGE_CACHE_DIR)==0) {
     mrg->image_cache_dir = apr_pstrdup(p, base->image_cache_dir);
@@ -1847,11 +1850,13 @@ cmd_set_image_engine(cmd_parms * UNUSED(parms), void *mconfig, const char *arg)
   if (strlen(arg) > 256) 
     return "image uri is too long.";
 
-  conf = (mod_chxj_config *)mconfig;
-  if (strcasecmp("ON", arg) == 0)
+  conf = (mod_chxj_config*)mconfig;
+  if (strcasecmp("ON", arg) == 0) {
     conf->image = CHXJ_IMG_ON;
-  else
+  }
+  else {
     conf->image = CHXJ_IMG_OFF;
+  }
 
   return NULL;
 }