Fossil SCM
Minor help text additions for --jsmode.
Commit
cb2563de17ac0d5b7c43a52829bc889f575d3f9dc1bcaa1ef368293f14b1f581
Parent
b3f3cf6930176cb…
1 file changed
+27
-12
+27
-12
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2095,10 +2095,14 @@ | ||
| 2095 | 2095 | ** REPO for a check-in or ticket that matches the |
| 2096 | 2096 | ** value of "name", then redirect to URL. There |
| 2097 | 2097 | ** can be multiple "redirect:" lines that are |
| 2098 | 2098 | ** processed in order. If the REPO is "*", then |
| 2099 | 2099 | ** an unconditional redirect to URL is taken. |
| 2100 | +** | |
| 2101 | +** jsmode: VALUE Specifies the delivery mode for JavaScript | |
| 2102 | +** files. See the help text for the --jsmode | |
| 2103 | +** flag of the http command. | |
| 2100 | 2104 | ** |
| 2101 | 2105 | ** Most CGI files contain only a "repository:" line. It is uncommon to |
| 2102 | 2106 | ** use any other option. |
| 2103 | 2107 | ** |
| 2104 | 2108 | ** See also: http, server, winsrv |
| @@ -2274,15 +2278,17 @@ | ||
| 2274 | 2278 | continue; |
| 2275 | 2279 | } |
| 2276 | 2280 | if( blob_eq(&key, "jsmode:") && blob_token(&line, &value) ){ |
| 2277 | 2281 | /* jsmode: MODE |
| 2278 | 2282 | ** |
| 2279 | - ** Change how javascript resources are delivered with each HTML | |
| 2283 | + ** Change how JavaScript resources are delivered with each HTML | |
| 2280 | 2284 | ** page. MODE is "inline" to put all JS inline, or "separate" to |
| 2281 | 2285 | ** cause each JS file to be requested using a separate HTTP request, |
| 2282 | 2286 | ** or "bundled" to have all JS files to be fetched with a single |
| 2283 | - ** auxiliary HTTP request. | |
| 2287 | + ** auxiliary HTTP request. Noting, however, that "single" might | |
| 2288 | + ** actually mean more than one, depending on the script-timing | |
| 2289 | + ** requirements of any given page. | |
| 2284 | 2290 | */ |
| 2285 | 2291 | builtin_set_js_delivery_mode(blob_str(&value),0); |
| 2286 | 2292 | blob_reset(&value); |
| 2287 | 2293 | continue; |
| 2288 | 2294 | } |
| @@ -2468,18 +2474,23 @@ | ||
| 2468 | 2474 | ** --files GLOB comma-separate glob patterns for static file to serve |
| 2469 | 2475 | ** --host NAME specify hostname of the server |
| 2470 | 2476 | ** --https signal a request coming in via https |
| 2471 | 2477 | ** --in FILE Take input from FILE instead of standard input |
| 2472 | 2478 | ** --ipaddr ADDR Assume the request comes from the given IP address |
| 2473 | -** --jsmode MODE Determine how javascript is delivered with pages. | |
| 2479 | +** --jsmode MODE Determine how JavaScript is delivered with pages. | |
| 2474 | 2480 | ** Mode can be one of: |
| 2475 | -** inline All javascript is inserted inline at | |
| 2476 | -** the end of the HTML file. | |
| 2481 | +** inline All JavaScript is inserted inline at | |
| 2482 | +** one or more points in the HTML file. | |
| 2477 | 2483 | ** separate Separate HTTP requests are made for |
| 2478 | -** each javascript file. | |
| 2479 | -** bundled One single separate HTTP fetches all | |
| 2480 | -** javascript concatenated together. | |
| 2484 | +** each JavaScript file. | |
| 2485 | +** bundled Groups JavaScript files into one or | |
| 2486 | +** more bundled requests which | |
| 2487 | +** concatenate scripts together. | |
| 2488 | +** Depending on the needs of any given page, inline | |
| 2489 | +** and bundled modes might result in a single | |
| 2490 | +** amalgamated script or several, but both approaches | |
| 2491 | +** result in fewer HTTP requests than the separate mode. | |
| 2481 | 2492 | ** --localauth enable automatic login for local connections |
| 2482 | 2493 | ** --nocompress do not compress HTTP replies |
| 2483 | 2494 | ** --nodelay omit backoffice processing if it would delay process exit |
| 2484 | 2495 | ** --nojail drop root privilege but do not enter the chroot jail |
| 2485 | 2496 | ** --nossl signal that no SSL connections are available |
| @@ -2736,18 +2747,22 @@ | ||
| 2736 | 2747 | ** --files GLOBLIST Comma-separated list of glob patterns for static files |
| 2737 | 2748 | ** --localauth enable automatic login for requests from localhost |
| 2738 | 2749 | ** --localhost listen on 127.0.0.1 only (always true for "ui") |
| 2739 | 2750 | ** --https Indicates that the input is coming through a reverse |
| 2740 | 2751 | ** proxy that has already translated HTTPS into HTTP. |
| 2741 | -** --jsmode MODE Determine how javascript is delivered with pages. | |
| 2752 | +** --jsmode MODE Determine how JavaScript is delivered with pages. | |
| 2742 | 2753 | ** Mode can be one of: |
| 2743 | -** inline All javascript is inserted inline at | |
| 2754 | +** inline All JavaScript is inserted inline at | |
| 2744 | 2755 | ** the end of the HTML file. |
| 2745 | 2756 | ** separate Separate HTTP requests are made for |
| 2746 | -** each javascript file. | |
| 2757 | +** each JavaScript file. | |
| 2747 | 2758 | ** bundled One single separate HTTP fetches all |
| 2748 | -** javascript concatenated together. | |
| 2759 | +** JavaScript concatenated together. | |
| 2760 | +** Depending on the needs of any given page, inline | |
| 2761 | +** and bundled modes might result in a single | |
| 2762 | +** amalgamated script or several, but both approaches | |
| 2763 | +** result in fewer HTTP requests than the separate mode. | |
| 2749 | 2764 | ** --max-latency N Do not let any single HTTP request run for more than N |
| 2750 | 2765 | ** seconds (only works on unix) |
| 2751 | 2766 | ** --nocompress Do not compress HTTP replies |
| 2752 | 2767 | ** --nojail Drop root privileges but do not enter the chroot jail |
| 2753 | 2768 | ** --nossl signal that no SSL connections are available (Always |
| 2754 | 2769 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2095,10 +2095,14 @@ | |
| 2095 | ** REPO for a check-in or ticket that matches the |
| 2096 | ** value of "name", then redirect to URL. There |
| 2097 | ** can be multiple "redirect:" lines that are |
| 2098 | ** processed in order. If the REPO is "*", then |
| 2099 | ** an unconditional redirect to URL is taken. |
| 2100 | ** |
| 2101 | ** Most CGI files contain only a "repository:" line. It is uncommon to |
| 2102 | ** use any other option. |
| 2103 | ** |
| 2104 | ** See also: http, server, winsrv |
| @@ -2274,15 +2278,17 @@ | |
| 2274 | continue; |
| 2275 | } |
| 2276 | if( blob_eq(&key, "jsmode:") && blob_token(&line, &value) ){ |
| 2277 | /* jsmode: MODE |
| 2278 | ** |
| 2279 | ** Change how javascript resources are delivered with each HTML |
| 2280 | ** page. MODE is "inline" to put all JS inline, or "separate" to |
| 2281 | ** cause each JS file to be requested using a separate HTTP request, |
| 2282 | ** or "bundled" to have all JS files to be fetched with a single |
| 2283 | ** auxiliary HTTP request. |
| 2284 | */ |
| 2285 | builtin_set_js_delivery_mode(blob_str(&value),0); |
| 2286 | blob_reset(&value); |
| 2287 | continue; |
| 2288 | } |
| @@ -2468,18 +2474,23 @@ | |
| 2468 | ** --files GLOB comma-separate glob patterns for static file to serve |
| 2469 | ** --host NAME specify hostname of the server |
| 2470 | ** --https signal a request coming in via https |
| 2471 | ** --in FILE Take input from FILE instead of standard input |
| 2472 | ** --ipaddr ADDR Assume the request comes from the given IP address |
| 2473 | ** --jsmode MODE Determine how javascript is delivered with pages. |
| 2474 | ** Mode can be one of: |
| 2475 | ** inline All javascript is inserted inline at |
| 2476 | ** the end of the HTML file. |
| 2477 | ** separate Separate HTTP requests are made for |
| 2478 | ** each javascript file. |
| 2479 | ** bundled One single separate HTTP fetches all |
| 2480 | ** javascript concatenated together. |
| 2481 | ** --localauth enable automatic login for local connections |
| 2482 | ** --nocompress do not compress HTTP replies |
| 2483 | ** --nodelay omit backoffice processing if it would delay process exit |
| 2484 | ** --nojail drop root privilege but do not enter the chroot jail |
| 2485 | ** --nossl signal that no SSL connections are available |
| @@ -2736,18 +2747,22 @@ | |
| 2736 | ** --files GLOBLIST Comma-separated list of glob patterns for static files |
| 2737 | ** --localauth enable automatic login for requests from localhost |
| 2738 | ** --localhost listen on 127.0.0.1 only (always true for "ui") |
| 2739 | ** --https Indicates that the input is coming through a reverse |
| 2740 | ** proxy that has already translated HTTPS into HTTP. |
| 2741 | ** --jsmode MODE Determine how javascript is delivered with pages. |
| 2742 | ** Mode can be one of: |
| 2743 | ** inline All javascript is inserted inline at |
| 2744 | ** the end of the HTML file. |
| 2745 | ** separate Separate HTTP requests are made for |
| 2746 | ** each javascript file. |
| 2747 | ** bundled One single separate HTTP fetches all |
| 2748 | ** javascript concatenated together. |
| 2749 | ** --max-latency N Do not let any single HTTP request run for more than N |
| 2750 | ** seconds (only works on unix) |
| 2751 | ** --nocompress Do not compress HTTP replies |
| 2752 | ** --nojail Drop root privileges but do not enter the chroot jail |
| 2753 | ** --nossl signal that no SSL connections are available (Always |
| 2754 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2095,10 +2095,14 @@ | |
| 2095 | ** REPO for a check-in or ticket that matches the |
| 2096 | ** value of "name", then redirect to URL. There |
| 2097 | ** can be multiple "redirect:" lines that are |
| 2098 | ** processed in order. If the REPO is "*", then |
| 2099 | ** an unconditional redirect to URL is taken. |
| 2100 | ** |
| 2101 | ** jsmode: VALUE Specifies the delivery mode for JavaScript |
| 2102 | ** files. See the help text for the --jsmode |
| 2103 | ** flag of the http command. |
| 2104 | ** |
| 2105 | ** Most CGI files contain only a "repository:" line. It is uncommon to |
| 2106 | ** use any other option. |
| 2107 | ** |
| 2108 | ** See also: http, server, winsrv |
| @@ -2274,15 +2278,17 @@ | |
| 2278 | continue; |
| 2279 | } |
| 2280 | if( blob_eq(&key, "jsmode:") && blob_token(&line, &value) ){ |
| 2281 | /* jsmode: MODE |
| 2282 | ** |
| 2283 | ** Change how JavaScript resources are delivered with each HTML |
| 2284 | ** page. MODE is "inline" to put all JS inline, or "separate" to |
| 2285 | ** cause each JS file to be requested using a separate HTTP request, |
| 2286 | ** or "bundled" to have all JS files to be fetched with a single |
| 2287 | ** auxiliary HTTP request. Noting, however, that "single" might |
| 2288 | ** actually mean more than one, depending on the script-timing |
| 2289 | ** requirements of any given page. |
| 2290 | */ |
| 2291 | builtin_set_js_delivery_mode(blob_str(&value),0); |
| 2292 | blob_reset(&value); |
| 2293 | continue; |
| 2294 | } |
| @@ -2468,18 +2474,23 @@ | |
| 2474 | ** --files GLOB comma-separate glob patterns for static file to serve |
| 2475 | ** --host NAME specify hostname of the server |
| 2476 | ** --https signal a request coming in via https |
| 2477 | ** --in FILE Take input from FILE instead of standard input |
| 2478 | ** --ipaddr ADDR Assume the request comes from the given IP address |
| 2479 | ** --jsmode MODE Determine how JavaScript is delivered with pages. |
| 2480 | ** Mode can be one of: |
| 2481 | ** inline All JavaScript is inserted inline at |
| 2482 | ** one or more points in the HTML file. |
| 2483 | ** separate Separate HTTP requests are made for |
| 2484 | ** each JavaScript file. |
| 2485 | ** bundled Groups JavaScript files into one or |
| 2486 | ** more bundled requests which |
| 2487 | ** concatenate scripts together. |
| 2488 | ** Depending on the needs of any given page, inline |
| 2489 | ** and bundled modes might result in a single |
| 2490 | ** amalgamated script or several, but both approaches |
| 2491 | ** result in fewer HTTP requests than the separate mode. |
| 2492 | ** --localauth enable automatic login for local connections |
| 2493 | ** --nocompress do not compress HTTP replies |
| 2494 | ** --nodelay omit backoffice processing if it would delay process exit |
| 2495 | ** --nojail drop root privilege but do not enter the chroot jail |
| 2496 | ** --nossl signal that no SSL connections are available |
| @@ -2736,18 +2747,22 @@ | |
| 2747 | ** --files GLOBLIST Comma-separated list of glob patterns for static files |
| 2748 | ** --localauth enable automatic login for requests from localhost |
| 2749 | ** --localhost listen on 127.0.0.1 only (always true for "ui") |
| 2750 | ** --https Indicates that the input is coming through a reverse |
| 2751 | ** proxy that has already translated HTTPS into HTTP. |
| 2752 | ** --jsmode MODE Determine how JavaScript is delivered with pages. |
| 2753 | ** Mode can be one of: |
| 2754 | ** inline All JavaScript is inserted inline at |
| 2755 | ** the end of the HTML file. |
| 2756 | ** separate Separate HTTP requests are made for |
| 2757 | ** each JavaScript file. |
| 2758 | ** bundled One single separate HTTP fetches all |
| 2759 | ** JavaScript concatenated together. |
| 2760 | ** Depending on the needs of any given page, inline |
| 2761 | ** and bundled modes might result in a single |
| 2762 | ** amalgamated script or several, but both approaches |
| 2763 | ** result in fewer HTTP requests than the separate mode. |
| 2764 | ** --max-latency N Do not let any single HTTP request run for more than N |
| 2765 | ** seconds (only works on unix) |
| 2766 | ** --nocompress Do not compress HTTP replies |
| 2767 | ** --nojail Drop root privileges but do not enter the chroot jail |
| 2768 | ** --nossl signal that no SSL connections are available (Always |
| 2769 |