Fossil SCM
Make sure the HTTP_SERVER_REPOLIST flag is set (if necessary) prior to calling the Win32 HTTP server. This allows the changes from check-in [a0b33ab4d4] to work as intended.
Commit
9186bf2a4669d16269f2dde409c202fac4aeab0d
Parent
83509c149eb0542…
1 file changed
+3
-1
+3
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2411,11 +2411,10 @@ | ||
| 2411 | 2411 | cgi_handle_http_request(0); |
| 2412 | 2412 | } |
| 2413 | 2413 | process_one_web_page(zNotFound, glob_create(zFileGlob), allowRepoList); |
| 2414 | 2414 | #else |
| 2415 | 2415 | /* Win32 implementation */ |
| 2416 | - (void)allowRepoList; /* Suppress warning */ | |
| 2417 | 2416 | if( isUiCmd ){ |
| 2418 | 2417 | zBrowser = db_get("web-browser", "start"); |
| 2419 | 2418 | if( zIpAddr ){ |
| 2420 | 2419 | zBrowserCmd = mprintf("%s http://%s:%%d/ &", zBrowser, zIpAddr); |
| 2421 | 2420 | }else{ |
| @@ -2423,10 +2422,13 @@ | ||
| 2423 | 2422 | } |
| 2424 | 2423 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2425 | 2424 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2426 | 2425 | } |
| 2427 | 2426 | db_close(1); |
| 2427 | + if( allowRepoList ){ | |
| 2428 | + flags |= HTTP_SERVER_REPOLIST; | |
| 2429 | + } | |
| 2428 | 2430 | if( win32_http_service(iPort, zNotFound, zFileGlob, flags) ){ |
| 2429 | 2431 | win32_http_server(iPort, mxPort, zBrowserCmd, |
| 2430 | 2432 | zStopperFile, zNotFound, zFileGlob, zIpAddr, flags); |
| 2431 | 2433 | } |
| 2432 | 2434 | #endif |
| 2433 | 2435 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2411,11 +2411,10 @@ | |
| 2411 | cgi_handle_http_request(0); |
| 2412 | } |
| 2413 | process_one_web_page(zNotFound, glob_create(zFileGlob), allowRepoList); |
| 2414 | #else |
| 2415 | /* Win32 implementation */ |
| 2416 | (void)allowRepoList; /* Suppress warning */ |
| 2417 | if( isUiCmd ){ |
| 2418 | zBrowser = db_get("web-browser", "start"); |
| 2419 | if( zIpAddr ){ |
| 2420 | zBrowserCmd = mprintf("%s http://%s:%%d/ &", zBrowser, zIpAddr); |
| 2421 | }else{ |
| @@ -2423,10 +2422,13 @@ | |
| 2423 | } |
| 2424 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2425 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2426 | } |
| 2427 | db_close(1); |
| 2428 | if( win32_http_service(iPort, zNotFound, zFileGlob, flags) ){ |
| 2429 | win32_http_server(iPort, mxPort, zBrowserCmd, |
| 2430 | zStopperFile, zNotFound, zFileGlob, zIpAddr, flags); |
| 2431 | } |
| 2432 | #endif |
| 2433 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2411,11 +2411,10 @@ | |
| 2411 | cgi_handle_http_request(0); |
| 2412 | } |
| 2413 | process_one_web_page(zNotFound, glob_create(zFileGlob), allowRepoList); |
| 2414 | #else |
| 2415 | /* Win32 implementation */ |
| 2416 | if( isUiCmd ){ |
| 2417 | zBrowser = db_get("web-browser", "start"); |
| 2418 | if( zIpAddr ){ |
| 2419 | zBrowserCmd = mprintf("%s http://%s:%%d/ &", zBrowser, zIpAddr); |
| 2420 | }else{ |
| @@ -2423,10 +2422,13 @@ | |
| 2422 | } |
| 2423 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2424 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2425 | } |
| 2426 | db_close(1); |
| 2427 | if( allowRepoList ){ |
| 2428 | flags |= HTTP_SERVER_REPOLIST; |
| 2429 | } |
| 2430 | if( win32_http_service(iPort, zNotFound, zFileGlob, flags) ){ |
| 2431 | win32_http_server(iPort, mxPort, zBrowserCmd, |
| 2432 | zStopperFile, zNotFound, zFileGlob, zIpAddr, flags); |
| 2433 | } |
| 2434 | #endif |
| 2435 |