Fossil SCM
Disable the the --max-latency option on "fossil server" on windows, as it has always been a no-op there.
Commit
6b5cfc861a86c5cfdc9a5a373b07b97a53aa5def836a7545979a39c6763e5784
Parent
d4c6f3c439e369e…
1 file changed
+2
-2
+2
-2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2409,15 +2409,15 @@ | ||
| 2409 | 2409 | int isUiCmd; /* True if command is "ui", not "server' */ |
| 2410 | 2410 | const char *zNotFound; /* The --notfound option or NULL */ |
| 2411 | 2411 | int flags = 0; /* Server flags */ |
| 2412 | 2412 | #if !defined(_WIN32) |
| 2413 | 2413 | int noJail; /* Do not enter the chroot jail */ |
| 2414 | + const char *zMaxLatency; /* Maximum runtime of any single HTTP request */ | |
| 2414 | 2415 | #endif |
| 2415 | 2416 | int allowRepoList; /* List repositories on URL "/" */ |
| 2416 | 2417 | const char *zAltBase; /* Argument to the --baseurl option */ |
| 2417 | 2418 | const char *zFileGlob; /* Static content must match this */ |
| 2418 | - const char *zMaxLatency; /* Maximum runtime of any single HTTP request */ | |
| 2419 | 2419 | char *zIpAddr = 0; /* Bind to this IP address */ |
| 2420 | 2420 | int fCreate = 0; /* The --create flag */ |
| 2421 | 2421 | const char *zInitPage = 0; /* Start on this page. --page option */ |
| 2422 | 2422 | #if defined(_WIN32) && USE_SEE |
| 2423 | 2423 | const char *zPidKey; |
| @@ -2426,11 +2426,10 @@ | ||
| 2426 | 2426 | #if defined(_WIN32) |
| 2427 | 2427 | const char *zStopperFile; /* Name of file used to terminate server */ |
| 2428 | 2428 | zStopperFile = find_option("stopper", 0, 1); |
| 2429 | 2429 | #endif |
| 2430 | 2430 | |
| 2431 | - zMaxLatency = find_option("max-latency",0,1); | |
| 2432 | 2431 | zFileGlob = find_option("files-urlenc",0,1); |
| 2433 | 2432 | if( zFileGlob ){ |
| 2434 | 2433 | char *z = mprintf("%s", zFileGlob); |
| 2435 | 2434 | dehttpize(z); |
| 2436 | 2435 | zFileGlob = z; |
| @@ -2438,10 +2437,11 @@ | ||
| 2438 | 2437 | zFileGlob = find_option("files",0,1); |
| 2439 | 2438 | } |
| 2440 | 2439 | skin_override(); |
| 2441 | 2440 | #if !defined(_WIN32) |
| 2442 | 2441 | noJail = find_option("nojail",0,0)!=0; |
| 2442 | + zMaxLatency = find_option("max-latency",0,1); | |
| 2443 | 2443 | #endif |
| 2444 | 2444 | g.useLocalauth = find_option("localauth", 0, 0)!=0; |
| 2445 | 2445 | Th_InitTraceLog(); |
| 2446 | 2446 | zPort = find_option("port", "P", 1); |
| 2447 | 2447 | isUiCmd = g.argv[1][0]=='u'; |
| 2448 | 2448 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2409,15 +2409,15 @@ | |
| 2409 | int isUiCmd; /* True if command is "ui", not "server' */ |
| 2410 | const char *zNotFound; /* The --notfound option or NULL */ |
| 2411 | int flags = 0; /* Server flags */ |
| 2412 | #if !defined(_WIN32) |
| 2413 | int noJail; /* Do not enter the chroot jail */ |
| 2414 | #endif |
| 2415 | int allowRepoList; /* List repositories on URL "/" */ |
| 2416 | const char *zAltBase; /* Argument to the --baseurl option */ |
| 2417 | const char *zFileGlob; /* Static content must match this */ |
| 2418 | const char *zMaxLatency; /* Maximum runtime of any single HTTP request */ |
| 2419 | char *zIpAddr = 0; /* Bind to this IP address */ |
| 2420 | int fCreate = 0; /* The --create flag */ |
| 2421 | const char *zInitPage = 0; /* Start on this page. --page option */ |
| 2422 | #if defined(_WIN32) && USE_SEE |
| 2423 | const char *zPidKey; |
| @@ -2426,11 +2426,10 @@ | |
| 2426 | #if defined(_WIN32) |
| 2427 | const char *zStopperFile; /* Name of file used to terminate server */ |
| 2428 | zStopperFile = find_option("stopper", 0, 1); |
| 2429 | #endif |
| 2430 | |
| 2431 | zMaxLatency = find_option("max-latency",0,1); |
| 2432 | zFileGlob = find_option("files-urlenc",0,1); |
| 2433 | if( zFileGlob ){ |
| 2434 | char *z = mprintf("%s", zFileGlob); |
| 2435 | dehttpize(z); |
| 2436 | zFileGlob = z; |
| @@ -2438,10 +2437,11 @@ | |
| 2438 | zFileGlob = find_option("files",0,1); |
| 2439 | } |
| 2440 | skin_override(); |
| 2441 | #if !defined(_WIN32) |
| 2442 | noJail = find_option("nojail",0,0)!=0; |
| 2443 | #endif |
| 2444 | g.useLocalauth = find_option("localauth", 0, 0)!=0; |
| 2445 | Th_InitTraceLog(); |
| 2446 | zPort = find_option("port", "P", 1); |
| 2447 | isUiCmd = g.argv[1][0]=='u'; |
| 2448 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2409,15 +2409,15 @@ | |
| 2409 | int isUiCmd; /* True if command is "ui", not "server' */ |
| 2410 | const char *zNotFound; /* The --notfound option or NULL */ |
| 2411 | int flags = 0; /* Server flags */ |
| 2412 | #if !defined(_WIN32) |
| 2413 | int noJail; /* Do not enter the chroot jail */ |
| 2414 | const char *zMaxLatency; /* Maximum runtime of any single HTTP request */ |
| 2415 | #endif |
| 2416 | int allowRepoList; /* List repositories on URL "/" */ |
| 2417 | const char *zAltBase; /* Argument to the --baseurl option */ |
| 2418 | const char *zFileGlob; /* Static content must match this */ |
| 2419 | char *zIpAddr = 0; /* Bind to this IP address */ |
| 2420 | int fCreate = 0; /* The --create flag */ |
| 2421 | const char *zInitPage = 0; /* Start on this page. --page option */ |
| 2422 | #if defined(_WIN32) && USE_SEE |
| 2423 | const char *zPidKey; |
| @@ -2426,11 +2426,10 @@ | |
| 2426 | #if defined(_WIN32) |
| 2427 | const char *zStopperFile; /* Name of file used to terminate server */ |
| 2428 | zStopperFile = find_option("stopper", 0, 1); |
| 2429 | #endif |
| 2430 | |
| 2431 | zFileGlob = find_option("files-urlenc",0,1); |
| 2432 | if( zFileGlob ){ |
| 2433 | char *z = mprintf("%s", zFileGlob); |
| 2434 | dehttpize(z); |
| 2435 | zFileGlob = z; |
| @@ -2438,10 +2437,11 @@ | |
| 2437 | zFileGlob = find_option("files",0,1); |
| 2438 | } |
| 2439 | skin_override(); |
| 2440 | #if !defined(_WIN32) |
| 2441 | noJail = find_option("nojail",0,0)!=0; |
| 2442 | zMaxLatency = find_option("max-latency",0,1); |
| 2443 | #endif |
| 2444 | g.useLocalauth = find_option("localauth", 0, 0)!=0; |
| 2445 | Th_InitTraceLog(); |
| 2446 | zPort = find_option("port", "P", 1); |
| 2447 | isUiCmd = g.argv[1][0]=='u'; |
| 2448 |