OSDN Git Service

img rewrite url tag mode
authorcoltware <coltware@94a86f0a-4377-0410-8349-a3afc59ff858>
Wed, 9 Jun 2010 10:52:37 +0000 (10:52 +0000)
committerAtsushi Konno <konn@users.sourceforge.jp>
Wed, 29 Sep 2010 18:16:31 +0000 (03:16 +0900)
src/chxj_img_conv.c

index 24e3c9c..5fea45a 100644 (file)
@@ -58,10 +58,16 @@ chxj_img_rewrite_parameter(
     mod_chxj_config *conf,
     const char *href)
 {
-  if(strstr(href,"?")){
-    return apr_pstrcat(r->pool,href,"&",CHXJ_IMG_REWRITE_URL_STRING,NULL);
+  if (conf->image_rewrite == CHXJ_IMG_REWRITE_ON &&
+      conf->image_rewrite_mode == CHXJ_IMG_REWRITE_MODE_TAG){
+    if(strstr(href,"?")){
+      return apr_pstrcat(r->pool,href,"&",CHXJ_IMG_REWRITE_URL_STRING,NULL);
+    }
+    else{
+      return apr_pstrcat(r->pool,href,"?",CHXJ_IMG_REWRITE_URL_STRING,NULL);
+    }
   }
   else{
-    return apr_pstrcat(r->pool,href,"?",CHXJ_IMG_REWRITE_URL_STRING,NULL);
+    return apr_pstrcat(r->pool,href,NULL);
   }
 }