Fossil SCM
Do not assume that the method is CGI just because the GATEWAY_INTERFACE environment variable is set. Only do CGI if GATEWAY_INTERFACE is set and there either is no argument specified, or the specified argument is not a valid command. Ticket [e49f245975f89a8a9]
Commit
dcf839e4a6cd787eda162f5d8b803850cf714f99
Parent
cb2ff51c4badd3e…
1 file changed
+15
-8
+15
-8
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -223,32 +223,39 @@ | ||
| 223 | 223 | */ |
| 224 | 224 | int main(int argc, char **argv){ |
| 225 | 225 | const char *zCmdName = "unknown"; |
| 226 | 226 | int idx; |
| 227 | 227 | int rc; |
| 228 | + int mightBeCgi; | |
| 228 | 229 | |
| 229 | 230 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 230 | 231 | g.now = time(0); |
| 231 | 232 | g.argc = argc; |
| 232 | 233 | g.argv = argv; |
| 233 | - if( getenv("GATEWAY_INTERFACE")!=0 ){ | |
| 234 | - zCmdName = "cgi"; | |
| 235 | - }else if( argc<2 ){ | |
| 236 | - fprintf(stderr, "Usage: %s COMMAND ...\n" | |
| 237 | - "\"%s help\" for a list of available commands\n" | |
| 238 | - "\"%s help COMMAND\" for specific details\n", | |
| 239 | - argv[0], argv[0], argv[0]); | |
| 240 | - fossil_exit(1); | |
| 234 | + mightBeCgi = getenv("GATEWAY_INTERFACE")!=0; | |
| 235 | + if( argc<2 ){ | |
| 236 | + if( mightBeCgi ){ | |
| 237 | + zCmdName = "cgi"; | |
| 238 | + }else{ | |
| 239 | + fprintf(stderr, "Usage: %s COMMAND ...\n" | |
| 240 | + "\"%s help\" for a list of available commands\n" | |
| 241 | + "\"%s help COMMAND\" for specific details\n", | |
| 242 | + argv[0], argv[0], argv[0]); | |
| 243 | + fossil_exit(1); | |
| 244 | + } | |
| 241 | 245 | }else{ |
| 242 | 246 | g.fQuiet = find_option("quiet", 0, 0)!=0; |
| 243 | 247 | g.fSqlTrace = find_option("sqltrace", 0, 0)!=0; |
| 244 | 248 | g.fSqlPrint = find_option("sqlprint", 0, 0)!=0; |
| 245 | 249 | g.fHttpTrace = find_option("httptrace", 0, 0)!=0; |
| 246 | 250 | g.zLogin = find_option("user", "U", 1); |
| 247 | 251 | zCmdName = argv[1]; |
| 248 | 252 | } |
| 249 | 253 | rc = name_search(zCmdName, aCommand, count(aCommand), &idx); |
| 254 | + if( rc==1 && mightBeCgi ){ | |
| 255 | + rc = name_search("cgi", aCommand, count(aCommand), &idx); | |
| 256 | + } | |
| 250 | 257 | if( rc==1 ){ |
| 251 | 258 | fprintf(stderr,"%s: unknown command: %s\n" |
| 252 | 259 | "%s: use \"help\" for more information\n", |
| 253 | 260 | argv[0], zCmdName, argv[0]); |
| 254 | 261 | fossil_exit(1); |
| 255 | 262 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -223,32 +223,39 @@ | |
| 223 | */ |
| 224 | int main(int argc, char **argv){ |
| 225 | const char *zCmdName = "unknown"; |
| 226 | int idx; |
| 227 | int rc; |
| 228 | |
| 229 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 230 | g.now = time(0); |
| 231 | g.argc = argc; |
| 232 | g.argv = argv; |
| 233 | if( getenv("GATEWAY_INTERFACE")!=0 ){ |
| 234 | zCmdName = "cgi"; |
| 235 | }else if( argc<2 ){ |
| 236 | fprintf(stderr, "Usage: %s COMMAND ...\n" |
| 237 | "\"%s help\" for a list of available commands\n" |
| 238 | "\"%s help COMMAND\" for specific details\n", |
| 239 | argv[0], argv[0], argv[0]); |
| 240 | fossil_exit(1); |
| 241 | }else{ |
| 242 | g.fQuiet = find_option("quiet", 0, 0)!=0; |
| 243 | g.fSqlTrace = find_option("sqltrace", 0, 0)!=0; |
| 244 | g.fSqlPrint = find_option("sqlprint", 0, 0)!=0; |
| 245 | g.fHttpTrace = find_option("httptrace", 0, 0)!=0; |
| 246 | g.zLogin = find_option("user", "U", 1); |
| 247 | zCmdName = argv[1]; |
| 248 | } |
| 249 | rc = name_search(zCmdName, aCommand, count(aCommand), &idx); |
| 250 | if( rc==1 ){ |
| 251 | fprintf(stderr,"%s: unknown command: %s\n" |
| 252 | "%s: use \"help\" for more information\n", |
| 253 | argv[0], zCmdName, argv[0]); |
| 254 | fossil_exit(1); |
| 255 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -223,32 +223,39 @@ | |
| 223 | */ |
| 224 | int main(int argc, char **argv){ |
| 225 | const char *zCmdName = "unknown"; |
| 226 | int idx; |
| 227 | int rc; |
| 228 | int mightBeCgi; |
| 229 | |
| 230 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 231 | g.now = time(0); |
| 232 | g.argc = argc; |
| 233 | g.argv = argv; |
| 234 | mightBeCgi = getenv("GATEWAY_INTERFACE")!=0; |
| 235 | if( argc<2 ){ |
| 236 | if( mightBeCgi ){ |
| 237 | zCmdName = "cgi"; |
| 238 | }else{ |
| 239 | fprintf(stderr, "Usage: %s COMMAND ...\n" |
| 240 | "\"%s help\" for a list of available commands\n" |
| 241 | "\"%s help COMMAND\" for specific details\n", |
| 242 | argv[0], argv[0], argv[0]); |
| 243 | fossil_exit(1); |
| 244 | } |
| 245 | }else{ |
| 246 | g.fQuiet = find_option("quiet", 0, 0)!=0; |
| 247 | g.fSqlTrace = find_option("sqltrace", 0, 0)!=0; |
| 248 | g.fSqlPrint = find_option("sqlprint", 0, 0)!=0; |
| 249 | g.fHttpTrace = find_option("httptrace", 0, 0)!=0; |
| 250 | g.zLogin = find_option("user", "U", 1); |
| 251 | zCmdName = argv[1]; |
| 252 | } |
| 253 | rc = name_search(zCmdName, aCommand, count(aCommand), &idx); |
| 254 | if( rc==1 && mightBeCgi ){ |
| 255 | rc = name_search("cgi", aCommand, count(aCommand), &idx); |
| 256 | } |
| 257 | if( rc==1 ){ |
| 258 | fprintf(stderr,"%s: unknown command: %s\n" |
| 259 | "%s: use \"help\" for more information\n", |
| 260 | argv[0], zCmdName, argv[0]); |
| 261 | fossil_exit(1); |
| 262 |