Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove still more legacy configuration sync logic. |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
9a68e6e1b0dd26cbc579bccc49468ca7 |
| User & Date: | drh 2017-09-20 12:42:57.426 |
Context
|
2017-09-20
| ||
| 12:58 | Fix permission processing on "configuration pull alias". check-in: b2b4af1356 user: drh tags: trunk | |
| 12:42 | Remove still more legacy configuration sync logic. check-in: 9a68e6e1b0 user: drh tags: trunk | |
| 12:34 | Add support for doing a "configuration sync" of URL aliases. check-in: 3d36a37a73 user: drh tags: trunk | |
Changes
Changes to src/configure.c.
| ︙ | ︙ | |||
272 273 274 275 276 277 278 |
int argc,
sqlite3_value **argv
){
int m = sqlite3_value_int(argv[0]);
configHasBeenReset |= m;
}
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 272 273 274 275 276 277 278 279 280 281 282 283 284 285 |
int argc,
sqlite3_value **argv
){
int m = sqlite3_value_int(argv[0]);
configHasBeenReset |= m;
}
/*
** Mask of modified configuration sets
*/
static int rebuildMask = 0;
/*
** Rebuild auxiliary tables as required by configuration changes.
|
| ︙ | ︙ |
Changes to src/xfer.c.
| ︙ | ︙ | |||
1133 1134 1135 1136 1137 1138 1139 | int isPush = 0; int nErr = 0; Xfer xfer; int deltaFlag = 0; int isClone = 0; int nGimme = 0; int size; | < | 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 | int isPush = 0; int nErr = 0; Xfer xfer; int deltaFlag = 0; int isClone = 0; int nGimme = 0; int size; char *zNow; int rc; const char *zScript = 0; char *zUuidList = 0; int nUuidList = 0; char **pzUuidList = 0; int *pnUuidList = 0; |
| ︙ | ︙ | |||
1443 1444 1445 1446 1447 1448 1449 |
blob_extract(xfer.pIn, size, &content);
if( !g.perm.Admin ){
cgi_reset_content();
@ error not\sauthorized\sto\spush\sconfiguration
nErr++;
break;
}
| < < < < | 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 |
blob_extract(xfer.pIn, size, &content);
if( !g.perm.Admin ){
cgi_reset_content();
@ error not\sauthorized\sto\spush\sconfiguration
nErr++;
break;
}
configure_receive(zName, &content, CONFIGSET_ALL);
blob_reset(&content);
blob_seek(xfer.pIn, 1, BLOB_SEEK_CUR);
}else
/* cookie TEXT
|
| ︙ | ︙ | |||
1588 1589 1590 1591 1592 1593 1594 |
send_all(&xfer);
if( xfer.syncPrivate ) send_private(&xfer);
}else if( isPull ){
create_cluster();
send_unclustered(&xfer);
if( xfer.syncPrivate ) send_private(&xfer);
}
| < < < | 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 |
send_all(&xfer);
if( xfer.syncPrivate ) send_private(&xfer);
}else if( isPull ){
create_cluster();
send_unclustered(&xfer);
if( xfer.syncPrivate ) send_private(&xfer);
}
db_multi_exec("DROP TABLE onremote");
manifest_crosslink_end(MC_PERMIT_HOOKS);
/* Send the server timestamp last, in case prior processing happened
** to use up a significant fraction of our time window.
*/
zNow = db_text(0, "SELECT strftime('%%Y-%%m-%%dT%%H:%%M:%%S', 'now')");
|
| ︙ | ︙ |