Sync

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index 6f142fb..d652fd5 100644 (file)
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,6 +1,11 @@
-* Tue Sep 25 2009 Andrew McNab <Andrew.McNab@cern.ch>
+* Thu Sep 17 2009 Andrew McNab <Andrew.McNab@cern.ch>
+- GRSThttpUrlEncode rather than GRSThttpUrlMildencode
+  in mod_gridsite directory listings.
+* Tue Sep 17 2009 Andrew McNab <Andrew.McNab@cern.ch>
+- ==== GridSite version 1.5.15 ====
+* Tue Sep 15 2009 Andrew McNab <Andrew.McNab@cern.ch>
 - Import GRSTgaclUserFree() fix from 1.7.x branch
-* Tue Sep 25 2009 Andrew McNab <Andrew.McNab@cern.ch>
+* Tue Sep 15 2009 Andrew McNab <Andrew.McNab@cern.ch>
 - ==== GridSite version 1.5.14 ====
 * Wed Sep 9 2009 Andrew McNab <Andrew.McNab@cern.ch>
 - Import fix of %016lx specification when creating 

diff --git a/org.gridsite.core/VERSION b/org.gridsite.core/VERSION
index 589b6a9..b0d83cf 100644 (file)
--- a/org.gridsite.core/VERSION
+++ b/org.gridsite.core/VERSION
@@ -1,5 +1,5 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1.5
-PATCH_VERSION=1.5.14
-DEFVERSION=010514
+PATCH_VERSION=1.5.15
+DEFVERSION=010515
 VERSION=$(PATCH_VERSION)

diff --git a/org.gridsite.core/src/mod_gridsite.c b/org.gridsite.core/src/mod_gridsite.c
index f556ca7..a2c3302 100644 (file)
--- a/org.gridsite.core/src/mod_gridsite.c
+++ b/org.gridsite.core/src/mod_gridsite.c
@@ -714,7 +714,7 @@ int html_dir_list(request_rec *r, mod_gridsite_dir_cfg *conf)
               "<td align=right>%R</td><td align=right>%e&nbsp;%b&nbsp;%y</td>",
                         &mtime_tm);    
 
-               encoded = GRSThttpUrlMildencode(namelist[n]->d_name);
+               encoded = GRSThttpUrlEncode(namelist[n]->d_name);
                escaped = html_escape(r->pool, namelist[n]->d_name);
 
                if (S_ISDIR(statbuf.st_mode))