Fossil SCM

Make sure the 'server' command checks for and processes the --files-urlenc option.

mistachkin 2014-08-04 03:40 trunk merge
Commit 608f0b2371667fd62e93ddcd6988351a5db510cd
1 file changed +8 -1
+8 -1
--- src/main.c
+++ src/main.c
@@ -2105,11 +2105,18 @@
21052105
#if defined(_WIN32)
21062106
const char *zStopperFile; /* Name of file used to terminate server */
21072107
zStopperFile = find_option("stopper", 0, 1);
21082108
#endif
21092109
2110
- zFileGlob = find_option("files", 0, 1);
2110
+ zFileGlob = find_option("files-urlenc",0,1);
2111
+ if( zFileGlob ){
2112
+ char *z = mprintf("%s", zFileGlob);
2113
+ dehttpize(z);
2114
+ zFileGlob = z;
2115
+ }else{
2116
+ zFileGlob = find_option("files",0,1);
2117
+ }
21112118
g.useLocalauth = find_option("localauth", 0, 0)!=0;
21122119
Th_InitTraceLog();
21132120
zPort = find_option("port", "P", 1);
21142121
zNotFound = find_option("notfound", 0, 1);
21152122
zAltBase = find_option("baseurl", 0, 1);
21162123
--- src/main.c
+++ src/main.c
@@ -2105,11 +2105,18 @@
2105 #if defined(_WIN32)
2106 const char *zStopperFile; /* Name of file used to terminate server */
2107 zStopperFile = find_option("stopper", 0, 1);
2108 #endif
2109
2110 zFileGlob = find_option("files", 0, 1);
 
 
 
 
 
 
 
2111 g.useLocalauth = find_option("localauth", 0, 0)!=0;
2112 Th_InitTraceLog();
2113 zPort = find_option("port", "P", 1);
2114 zNotFound = find_option("notfound", 0, 1);
2115 zAltBase = find_option("baseurl", 0, 1);
2116
--- src/main.c
+++ src/main.c
@@ -2105,11 +2105,18 @@
2105 #if defined(_WIN32)
2106 const char *zStopperFile; /* Name of file used to terminate server */
2107 zStopperFile = find_option("stopper", 0, 1);
2108 #endif
2109
2110 zFileGlob = find_option("files-urlenc",0,1);
2111 if( zFileGlob ){
2112 char *z = mprintf("%s", zFileGlob);
2113 dehttpize(z);
2114 zFileGlob = z;
2115 }else{
2116 zFileGlob = find_option("files",0,1);
2117 }
2118 g.useLocalauth = find_option("localauth", 0, 0)!=0;
2119 Th_InitTraceLog();
2120 zPort = find_option("port", "P", 1);
2121 zNotFound = find_option("notfound", 0, 1);
2122 zAltBase = find_option("baseurl", 0, 1);
2123

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button