Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Pull in the latest fixes from the trunk. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | ssl |
Files: | files | file ages | folders |
SHA1: |
ac8902beec5d8e096c7494d6f21a0f8e |
User & Date: | drh 2010-01-20 15:56:28.000 |
Context
2010-01-20
| ||
16:23 | Add the --cherrypick option to the "merge" command. ... (check-in: 3005080796 user: drh tags: ssl) | |
15:56 | Pull in the latest fixes from the trunk. ... (check-in: ac8902beec user: drh tags: ssl) | |
15:48 | Fix the object ID decoding on the /info page. Ticket [a5403e6eee]. ... (check-in: 5eea3db6c1 user: drh tags: trunk) | |
2010-01-19
| ||
18:16 | Pull in all the latest changes from the trunk as of 2010-01-19. ... (check-in: b8df912e2d user: drh tags: ssl) | |
Changes
Changes to src/db.c.
︙ | ︙ | |||
1471 1472 1473 1474 1475 1476 1477 | ** The "unset" command clears a property setting. ** ** ** auto-captcha If enabled, the Login page will provide a button ** which uses JavaScript to fill out the captcha for ** the "anonymous" user. (Most bots cannot use JavaScript.) ** | | | > | | 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 | ** The "unset" command clears a property setting. ** ** ** auto-captcha If enabled, the Login page will provide a button ** which uses JavaScript to fill out the captcha for ** the "anonymous" user. (Most bots cannot use JavaScript.) ** ** autosync If enabled, automatically pull prior to commit ** or update and automatically push after commit or ** tag or branch creation. If the the value is "pullonly" ** then only pull operations occur automatically. ** ** clearsign When enabled (the default), fossil will attempt to ** sign all commits with gpg. When disabled, commits will ** be unsigned. ** ** diff-command External command to run when performing a diff. ** If undefined, the internal text diff will be used. |
︙ | ︙ |
Changes to src/info.c.
︙ | ︙ | |||
1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 | void info_page(void){ const char *zName; Blob uuid; int rid; zName = P("name"); if( zName==0 ) fossil_redirect_home(); blob_set(&uuid, zName); if( name_to_uuid(&uuid, 1) ){ fossil_redirect_home(); } zName = blob_str(&uuid); | > > > > > < < < < | 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 | void info_page(void){ const char *zName; Blob uuid; int rid; zName = P("name"); if( zName==0 ) fossil_redirect_home(); if( validate16(zName, strlen(zName)) && db_exists("SELECT 1 FROM ticket WHERE tkt_uuid LIKE '%q%%'", zName) ){ tktview_page(); return; } blob_set(&uuid, zName); if( name_to_uuid(&uuid, 1) ){ fossil_redirect_home(); } zName = blob_str(&uuid); rid = db_int(0, "SELECT rid FROM blob WHERE uuid='%s'", zName); if( rid==0 ){ style_header("Broken Link"); @ <p>No such object: %h(zName)</p> style_footer(); return; } |
︙ | ︙ |
Changes to src/sync.c.
︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 | /* ** If the respository is configured for autosyncing, then do an ** autosync. This will be a pull if the argument is true or a push ** if the argument is false. */ void autosync(int flags){ const char *zUrl; if( g.fNoSync ){ return; } | > | > > > > > | > > > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | /* ** If the respository is configured for autosyncing, then do an ** autosync. This will be a pull if the argument is true or a push ** if the argument is false. */ void autosync(int flags){ const char *zUrl; const char *zAutosync; if( g.fNoSync ){ return; } zAutosync = db_get("autosync", 0); if( zAutosync ){ if( (flags & AUTOSYNC_PUSH)!=0 && memcmp(zAutosync,"pull",4)==0 ){ return; /* Do not auto-push when autosync=pullonly */ } if( is_false(zAutosync) ){ return; /* Autosync is completely off */ } }else{ /* Autosync defaults on. To make it default off, "return" here. */ } zUrl = db_get("last-sync-url", 0); if( zUrl==0 ){ return; /* No default server */ } url_parse(zUrl); if( g.urlPort!=g.urlDfltPort ){ |
︙ | ︙ |
Changes to src/vfile.c.
︙ | ︙ | |||
233 234 235 236 237 238 239 240 241 242 243 244 245 246 | id = db_column_int(&q, 0); zName = db_column_text(&q, 1); rid = db_column_int(&q, 2); content_get(rid, &content); if( verbose ) printf("%s\n", &zName[nRepos]); blob_write_to_file(&content, zName); db_multi_exec("UPDATE vfile SET mtime=%lld WHERE id=%d", file_mtime(zName), id); } db_finalize(&q); } | > | 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 | id = db_column_int(&q, 0); zName = db_column_text(&q, 1); rid = db_column_int(&q, 2); content_get(rid, &content); if( verbose ) printf("%s\n", &zName[nRepos]); blob_write_to_file(&content, zName); blob_reset(&content); db_multi_exec("UPDATE vfile SET mtime=%lld WHERE id=%d", file_mtime(zName), id); } db_finalize(&q); } |
︙ | ︙ |