Fossil SCM
Fix an instance of using a NULL database connection pointer when starting the Fossil server in multi-repository mode.
Commit
de17e35bf12a8585f5c151c8b4ab3f8d36b6f0c8
Parent
963c950cd6ac8cc…
1 file changed
+1
-1
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2200,11 +2200,11 @@ | ||
| 2200 | 2200 | }else{ |
| 2201 | 2201 | zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser); |
| 2202 | 2202 | } |
| 2203 | 2203 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2204 | 2204 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2205 | - }else{ | |
| 2205 | + }else if( g.db ){ | |
| 2206 | 2206 | db_setup_server_and_project_codes(1); |
| 2207 | 2207 | } |
| 2208 | 2208 | db_close(1); |
| 2209 | 2209 | if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){ |
| 2210 | 2210 | fossil_fatal("unable to listen on TCP socket %d", iPort); |
| 2211 | 2211 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2200,11 +2200,11 @@ | |
| 2200 | }else{ |
| 2201 | zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser); |
| 2202 | } |
| 2203 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2204 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2205 | }else{ |
| 2206 | db_setup_server_and_project_codes(1); |
| 2207 | } |
| 2208 | db_close(1); |
| 2209 | if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){ |
| 2210 | fossil_fatal("unable to listen on TCP socket %d", iPort); |
| 2211 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2200,11 +2200,11 @@ | |
| 2200 | }else{ |
| 2201 | zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser); |
| 2202 | } |
| 2203 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2204 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2205 | }else if( g.db ){ |
| 2206 | db_setup_server_and_project_codes(1); |
| 2207 | } |
| 2208 | db_close(1); |
| 2209 | if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){ |
| 2210 | fossil_fatal("unable to listen on TCP socket %d", iPort); |
| 2211 |