OSDN Git Service
(root)
/
modchxj
/
mod_chxj.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
70c6b80
)
* ChxjForwardUrlBase
author
Atsushi Konno
<konn@users.sourceforge.jp>
Fri, 12 Dec 2008 09:32:08 +0000
(18:32 +0900)
committer
Atsushi Konno
<konn@users.sourceforge.jp>
Fri, 12 Dec 2008 09:32:08 +0000
(18:32 +0900)
src/mod_chxj.c
patch
|
blob
|
history
diff --git
a/src/mod_chxj.c
b/src/mod_chxj.c
index
fe183c2
..
17bf27b
100644
(file)
--- a/
src/mod_chxj.c
+++ b/
src/mod_chxj.c
@@
-1820,6
+1820,13
@@
chxj_merge_per_dir_config(apr_pool_t *p, void *basev, void *addv)
else {
mrg->new_line_type = NLTYPE_NIL;
}
+
+ if (add->forward_url_base) {
+ mrg->forward_url_base = add->forward_url_base;
+ }
+ else if (base->forward_url_base) {
+ mrg->forward_url_base = base->forward_url_base;
+ }
return mrg;
}