Fossil SCM
Rename the 'http-allow-regexp' setting to 'th1-uri-regexp'.
Commit
aeedba68b656feb53513233874e2b1ff08bcfdac
Parent
0e1f94732c354b9…
2 files changed
+5
-5
+1
-1
M
src/db.c
+5
-5
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2121,11 +2121,11 @@ | ||
| 2121 | 2121 | { "editor", 0, 32, 0, "" }, |
| 2122 | 2122 | { "empty-dirs", 0, 40, 1, "" }, |
| 2123 | 2123 | { "encoding-glob", 0, 40, 1, "" }, |
| 2124 | 2124 | { "gdiff-command", 0, 40, 0, "gdiff" }, |
| 2125 | 2125 | { "gmerge-command",0, 40, 0, "" }, |
| 2126 | - { "http-allow-regexp",0, 40, 0, "" }, | |
| 2126 | + { "th1-uri-regexp",0, 40, 0, "" }, | |
| 2127 | 2127 | { "http-port", 0, 16, 0, "8080" }, |
| 2128 | 2128 | { "https-login", 0, 0, 0, "off" }, |
| 2129 | 2129 | { "ignore-glob", 0, 40, 1, "" }, |
| 2130 | 2130 | { "keep-glob", 0, 40, 1, "" }, |
| 2131 | 2131 | { "localauth", 0, 0, 0, "off" }, |
| @@ -2252,14 +2252,10 @@ | ||
| 2252 | 2252 | ** on four files. |
| 2253 | 2253 | ** Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| 2254 | 2254 | ** Ex: xxdiff "%original" "%baseline" "%merge" -M "%output" |
| 2255 | 2255 | ** Ex: meld "%baseline" "%original" "%merge" "%output" |
| 2256 | 2256 | ** |
| 2257 | -** http-allow-regexp Specify which URL's are allowed in http requests for | |
| 2258 | -** commit and ticket hooks. If empty, no http requests | |
| 2259 | -** are allowed whatsoever. Default: "". | |
| 2260 | -** | |
| 2261 | 2257 | ** http-port The TCP/IP port number to use by the "server" |
| 2262 | 2258 | ** and "ui" commands. Default: 8080 |
| 2263 | 2259 | ** |
| 2264 | 2260 | ** https-login Send login credentials using HTTPS instead of HTTP |
| 2265 | 2261 | ** even if the login page request came via HTTP. |
| @@ -2344,10 +2340,14 @@ | ||
| 2344 | 2340 | ** is empty and no extra setup is performed. |
| 2345 | 2341 | ** |
| 2346 | 2342 | ** th1-setup This is the setup script to be evaluated after creating |
| 2347 | 2343 | ** and initializing the TH1 interpreter. By default, this |
| 2348 | 2344 | ** is empty and no extra setup is performed. |
| 2345 | +** | |
| 2346 | +** th1-uri-regexp Specify which URI's are allowed in HTTP requests from | |
| 2347 | +** TH1 scripts. If empty, no HTTP requests are allowed | |
| 2348 | +** whatsoever. The default is an empty string. | |
| 2349 | 2349 | ** |
| 2350 | 2350 | ** web-browser A shell command used to launch your preferred |
| 2351 | 2351 | ** web browser when given a URL as an argument. |
| 2352 | 2352 | ** Defaults to "start" on windows, "open" on Mac, |
| 2353 | 2353 | ** and "firefox" on Unix. |
| 2354 | 2354 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2121,11 +2121,11 @@ | |
| 2121 | { "editor", 0, 32, 0, "" }, |
| 2122 | { "empty-dirs", 0, 40, 1, "" }, |
| 2123 | { "encoding-glob", 0, 40, 1, "" }, |
| 2124 | { "gdiff-command", 0, 40, 0, "gdiff" }, |
| 2125 | { "gmerge-command",0, 40, 0, "" }, |
| 2126 | { "http-allow-regexp",0, 40, 0, "" }, |
| 2127 | { "http-port", 0, 16, 0, "8080" }, |
| 2128 | { "https-login", 0, 0, 0, "off" }, |
| 2129 | { "ignore-glob", 0, 40, 1, "" }, |
| 2130 | { "keep-glob", 0, 40, 1, "" }, |
| 2131 | { "localauth", 0, 0, 0, "off" }, |
| @@ -2252,14 +2252,10 @@ | |
| 2252 | ** on four files. |
| 2253 | ** Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| 2254 | ** Ex: xxdiff "%original" "%baseline" "%merge" -M "%output" |
| 2255 | ** Ex: meld "%baseline" "%original" "%merge" "%output" |
| 2256 | ** |
| 2257 | ** http-allow-regexp Specify which URL's are allowed in http requests for |
| 2258 | ** commit and ticket hooks. If empty, no http requests |
| 2259 | ** are allowed whatsoever. Default: "". |
| 2260 | ** |
| 2261 | ** http-port The TCP/IP port number to use by the "server" |
| 2262 | ** and "ui" commands. Default: 8080 |
| 2263 | ** |
| 2264 | ** https-login Send login credentials using HTTPS instead of HTTP |
| 2265 | ** even if the login page request came via HTTP. |
| @@ -2344,10 +2340,14 @@ | |
| 2344 | ** is empty and no extra setup is performed. |
| 2345 | ** |
| 2346 | ** th1-setup This is the setup script to be evaluated after creating |
| 2347 | ** and initializing the TH1 interpreter. By default, this |
| 2348 | ** is empty and no extra setup is performed. |
| 2349 | ** |
| 2350 | ** web-browser A shell command used to launch your preferred |
| 2351 | ** web browser when given a URL as an argument. |
| 2352 | ** Defaults to "start" on windows, "open" on Mac, |
| 2353 | ** and "firefox" on Unix. |
| 2354 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2121,11 +2121,11 @@ | |
| 2121 | { "editor", 0, 32, 0, "" }, |
| 2122 | { "empty-dirs", 0, 40, 1, "" }, |
| 2123 | { "encoding-glob", 0, 40, 1, "" }, |
| 2124 | { "gdiff-command", 0, 40, 0, "gdiff" }, |
| 2125 | { "gmerge-command",0, 40, 0, "" }, |
| 2126 | { "th1-uri-regexp",0, 40, 0, "" }, |
| 2127 | { "http-port", 0, 16, 0, "8080" }, |
| 2128 | { "https-login", 0, 0, 0, "off" }, |
| 2129 | { "ignore-glob", 0, 40, 1, "" }, |
| 2130 | { "keep-glob", 0, 40, 1, "" }, |
| 2131 | { "localauth", 0, 0, 0, "off" }, |
| @@ -2252,14 +2252,10 @@ | |
| 2252 | ** on four files. |
| 2253 | ** Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| 2254 | ** Ex: xxdiff "%original" "%baseline" "%merge" -M "%output" |
| 2255 | ** Ex: meld "%baseline" "%original" "%merge" "%output" |
| 2256 | ** |
| 2257 | ** http-port The TCP/IP port number to use by the "server" |
| 2258 | ** and "ui" commands. Default: 8080 |
| 2259 | ** |
| 2260 | ** https-login Send login credentials using HTTPS instead of HTTP |
| 2261 | ** even if the login page request came via HTTP. |
| @@ -2344,10 +2340,14 @@ | |
| 2340 | ** is empty and no extra setup is performed. |
| 2341 | ** |
| 2342 | ** th1-setup This is the setup script to be evaluated after creating |
| 2343 | ** and initializing the TH1 interpreter. By default, this |
| 2344 | ** is empty and no extra setup is performed. |
| 2345 | ** |
| 2346 | ** th1-uri-regexp Specify which URI's are allowed in HTTP requests from |
| 2347 | ** TH1 scripts. If empty, no HTTP requests are allowed |
| 2348 | ** whatsoever. The default is an empty string. |
| 2349 | ** |
| 2350 | ** web-browser A shell command used to launch your preferred |
| 2351 | ** web browser when given a URL as an argument. |
| 2352 | ** Defaults to "start" on windows, "open" on Mac, |
| 2353 | ** and "firefox" on Unix. |
| 2354 |
+1
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -859,11 +859,11 @@ | ||
| 859 | 859 | url_parse(argv[1], 0); |
| 860 | 860 | if( g.urlIsSsh || g.urlIsFile ){ |
| 861 | 861 | Th_ErrorMessage(interp, "url must be http:// or https://", 0, 0); |
| 862 | 862 | return TH_ERROR; |
| 863 | 863 | } |
| 864 | - regexp = db_get("http-allow-regexp", 0); | |
| 864 | + regexp = db_get("th1-uri-regexp", 0); | |
| 865 | 865 | if( regexp && regexp[0] ){ |
| 866 | 866 | const char * zErr = re_compile(&pRe, regexp, 0); |
| 867 | 867 | if( zErr ){ |
| 868 | 868 | Th_SetResult(interp, zErr, -1); |
| 869 | 869 | return TH_ERROR; |
| 870 | 870 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -859,11 +859,11 @@ | |
| 859 | url_parse(argv[1], 0); |
| 860 | if( g.urlIsSsh || g.urlIsFile ){ |
| 861 | Th_ErrorMessage(interp, "url must be http:// or https://", 0, 0); |
| 862 | return TH_ERROR; |
| 863 | } |
| 864 | regexp = db_get("http-allow-regexp", 0); |
| 865 | if( regexp && regexp[0] ){ |
| 866 | const char * zErr = re_compile(&pRe, regexp, 0); |
| 867 | if( zErr ){ |
| 868 | Th_SetResult(interp, zErr, -1); |
| 869 | return TH_ERROR; |
| 870 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -859,11 +859,11 @@ | |
| 859 | url_parse(argv[1], 0); |
| 860 | if( g.urlIsSsh || g.urlIsFile ){ |
| 861 | Th_ErrorMessage(interp, "url must be http:// or https://", 0, 0); |
| 862 | return TH_ERROR; |
| 863 | } |
| 864 | regexp = db_get("th1-uri-regexp", 0); |
| 865 | if( regexp && regexp[0] ){ |
| 866 | const char * zErr = re_compile(&pRe, regexp, 0); |
| 867 | if( zErr ){ |
| 868 | Th_SetResult(interp, zErr, -1); |
| 869 | return TH_ERROR; |
| 870 |