Fossil

Check-in [35bf217336]
Login

Check-in [35bf217336]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Move the check for "server-code"/"project-code" into the function db_setup_server_and_project_codes()
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 35bf2173367c9adbb650464602229a32897daadb
User & Date: jan.nijtmans 2014-09-24 09:01:03.547
Context
2014-09-26
16:35
Merged in inherit-priv-mark-sub branch (readability improvements for user administration page). ... (check-in: 4bba5e1ca4 user: stephan tags: trunk)
14:04
merge trunk ... (check-in: 9ba4ebaa66 user: jan.nijtmans tags: multi-thread)
2014-09-25
05:13
Merge updates from trunk. ... (check-in: c420715158 user: sdr tags: winsymlink)
2014-09-24
09:01
Move the check for "server-code"/"project-code" into the function db_setup_server_and_project_codes() ... (check-in: 35bf217336 user: jan.nijtmans tags: trunk)
2014-09-23
16:02
When generating the "manifest" file in a checkout because "fossil setting manifest" is turned on, add an extra line of text to the end of the file to prevent the file from being interpreted as a valid control artifact in case the complete source tree is imported into another unrelated Fossil project. ... (check-in: 1dd4be80ca user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/db.c.
1327
1328
1329
1330
1331
1332
1333

1334
1335
1336
1337


1338
1339
1340
1341

1342
1343
1344
1345
1346
1347
1348
    db_multi_exec(
        "INSERT INTO config(name,value,mtime)"
        " VALUES('server-code', lower(hex(randomblob(20))),now());"
        "INSERT INTO config(name,value,mtime)"
        " VALUES('project-code', lower(hex(randomblob(20))),now());"
    );
  }else{

    db_optional_sql("repository",
        "INSERT INTO config(name,value,mtime)"
        " VALUES('server-code', lower(hex(randomblob(20))),now());"
    );


    db_optional_sql("repository",
        "INSERT INTO config(name,value,mtime)"
        " VALUES('project-code', lower(hex(randomblob(20))),now());"
    );

  }
}

/*
** Return a pointer to a string that contains the RHS of an IN operator
** that will select CONFIG table names that are in the list of control
** settings.







>
|
|
|
|
>
>
|
|
|
|
>







1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
    db_multi_exec(
        "INSERT INTO config(name,value,mtime)"
        " VALUES('server-code', lower(hex(randomblob(20))),now());"
        "INSERT INTO config(name,value,mtime)"
        " VALUES('project-code', lower(hex(randomblob(20))),now());"
    );
  }else{
    if( db_get("server-code", 0)==0 ) {
      db_optional_sql("repository",
          "INSERT INTO config(name,value,mtime)"
          " VALUES('server-code', lower(hex(randomblob(20))),now());"
      );
    }
    if( db_get("project-code", 0)==0 ) {
      db_optional_sql("repository",
          "INSERT INTO config(name,value,mtime)"
          " VALUES('project-code', lower(hex(randomblob(20))),now());"
      );
    }
  }
}

/*
** Return a pointer to a string that contains the RHS of an IN operator
** that will select CONFIG table names that are in the list of control
** settings.
Changes to src/main.c.
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
    if( zIpAddr ){
      zBrowserCmd = mprintf("%s http://%s:%%d/ &", zBrowser, zIpAddr);
    }else{
      zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
    }
    if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY;
    if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT;
  }else if( db_get("server-code", 0)==0 || db_get("project-code", 0)==0 ){
    db_setup_server_and_project_codes(1);
  }
  db_close(1);
  if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
    fossil_fatal("unable to listen on TCP socket %d", iPort);
  }
  g.sslNotAvailable = 1;







|







2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
    if( zIpAddr ){
      zBrowserCmd = mprintf("%s http://%s:%%d/ &", zBrowser, zIpAddr);
    }else{
      zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
    }
    if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY;
    if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT;
  }else{
    db_setup_server_and_project_codes(1);
  }
  db_close(1);
  if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
    fossil_fatal("unable to listen on TCP socket %d", iPort);
  }
  g.sslNotAvailable = 1;