Fossil SCM
Fix the previous check-in to list environment variables used by the CGI Server Extensions feature in the correct place.
Commit
6eeb7ec10e32d904aa828f6c4774ab963e10eae85ec256b22c50ca4f102d9fcd
Parent
85cfdd192ab3e01…
2 files changed
+6
-4
+2
-1
+6
-4
| --- www/env-opts.md | ||
| +++ www/env-opts.md | ||
| @@ -228,14 +228,10 @@ | ||
| 228 | 228 | |
| 229 | 229 | `REQUEST_URI`: If defined, included in error log messages. |
| 230 | 230 | |
| 231 | 231 | `SCRIPT_NAME`: If defined, included in error log messages. |
| 232 | 232 | |
| 233 | -`SERVER_SOFTWARE`: Set to the Fossil version when invoking [CGI-based | |
| 234 | -extensions](/help?cmd=/ext). Also includes the program name if the | |
| 235 | -variable was already defined for the current server environment. | |
| 236 | - | |
| 237 | 233 | `SSH_CONNECTION`: Informs CGI processing if the remote client is SSH. |
| 238 | 234 | |
| 239 | 235 | `SSL_CERT_FILE`, `SSL_CERT_DIR`: Override the [`ssl-ca-location`] |
| 240 | 236 | (/help?cmd=ssl-ca-location) setting. |
| 241 | 237 | |
| @@ -315,10 +311,16 @@ | ||
| 315 | 311 | See the comment above the implementation of [`json_getenv`][json.c] |
| 316 | 312 | for some further discussion. |
| 317 | 313 | |
| 318 | 314 | [json.c]: /artifact/6df1d80dece8968b?ln=277,290 |
| 319 | 315 | |
| 316 | +### CGI Server Extensions | |
| 317 | + | |
| 318 | +The [CGI Server Extensions](/doc/trunk/www/serverext.wiki) feature passes | |
| 319 | +parameters to the CGI program using environment variables, as listed in | |
| 320 | +the [CGI Inputs](/doc/trunk/www/serverext.wiki#cgi-inputs) section. | |
| 321 | + | |
| 320 | 322 | ### Comment Editor |
| 321 | 323 | |
| 322 | 324 | The editor used to edit a check-in or stash comment is named by the |
| 323 | 325 | local or global setting `editor`. If neither is set, then the environment |
| 324 | 326 | variables `VISUAL`, and `EDITOR` are checked in that order. |
| 325 | 327 |
| --- www/env-opts.md | |
| +++ www/env-opts.md | |
| @@ -228,14 +228,10 @@ | |
| 228 | |
| 229 | `REQUEST_URI`: If defined, included in error log messages. |
| 230 | |
| 231 | `SCRIPT_NAME`: If defined, included in error log messages. |
| 232 | |
| 233 | `SERVER_SOFTWARE`: Set to the Fossil version when invoking [CGI-based |
| 234 | extensions](/help?cmd=/ext). Also includes the program name if the |
| 235 | variable was already defined for the current server environment. |
| 236 | |
| 237 | `SSH_CONNECTION`: Informs CGI processing if the remote client is SSH. |
| 238 | |
| 239 | `SSL_CERT_FILE`, `SSL_CERT_DIR`: Override the [`ssl-ca-location`] |
| 240 | (/help?cmd=ssl-ca-location) setting. |
| 241 | |
| @@ -315,10 +311,16 @@ | |
| 315 | See the comment above the implementation of [`json_getenv`][json.c] |
| 316 | for some further discussion. |
| 317 | |
| 318 | [json.c]: /artifact/6df1d80dece8968b?ln=277,290 |
| 319 | |
| 320 | ### Comment Editor |
| 321 | |
| 322 | The editor used to edit a check-in or stash comment is named by the |
| 323 | local or global setting `editor`. If neither is set, then the environment |
| 324 | variables `VISUAL`, and `EDITOR` are checked in that order. |
| 325 |
| --- www/env-opts.md | |
| +++ www/env-opts.md | |
| @@ -228,14 +228,10 @@ | |
| 228 | |
| 229 | `REQUEST_URI`: If defined, included in error log messages. |
| 230 | |
| 231 | `SCRIPT_NAME`: If defined, included in error log messages. |
| 232 | |
| 233 | `SSH_CONNECTION`: Informs CGI processing if the remote client is SSH. |
| 234 | |
| 235 | `SSL_CERT_FILE`, `SSL_CERT_DIR`: Override the [`ssl-ca-location`] |
| 236 | (/help?cmd=ssl-ca-location) setting. |
| 237 | |
| @@ -315,10 +311,16 @@ | |
| 311 | See the comment above the implementation of [`json_getenv`][json.c] |
| 312 | for some further discussion. |
| 313 | |
| 314 | [json.c]: /artifact/6df1d80dece8968b?ln=277,290 |
| 315 | |
| 316 | ### CGI Server Extensions |
| 317 | |
| 318 | The [CGI Server Extensions](/doc/trunk/www/serverext.wiki) feature passes |
| 319 | parameters to the CGI program using environment variables, as listed in |
| 320 | the [CGI Inputs](/doc/trunk/www/serverext.wiki#cgi-inputs) section. |
| 321 | |
| 322 | ### Comment Editor |
| 323 | |
| 324 | The editor used to edit a check-in or stash comment is named by the |
| 325 | local or global setting `editor`. If neither is set, then the environment |
| 326 | variables `VISUAL`, and `EDITOR` are checked in that order. |
| 327 |
+2
-1
| --- www/serverext.wiki | ||
| +++ www/serverext.wiki | ||
| @@ -118,11 +118,11 @@ | ||
| 118 | 118 | technologies like Wapp.) The fileup1 script is a demo program that lets |
| 119 | 119 | the user upload a file using a form, and then displays that file in the reply. |
| 120 | 120 | There is a link on the page that causes the fileup1 script to return a copy |
| 121 | 121 | of its own source-code, so you can see how it works. |
| 122 | 122 | |
| 123 | -<h2>3.0 CGI Inputs</h2> | |
| 123 | +<h2 id="cgi-inputs">3.0 CGI Inputs</h2> | |
| 124 | 124 | |
| 125 | 125 | The /ext extension mechanism is an ordinary CGI interface. Parameters |
| 126 | 126 | are passed to the CGI program using environment variables. The following |
| 127 | 127 | standard CGI environment variables are supported: |
| 128 | 128 | |
| @@ -152,10 +152,11 @@ | ||
| 152 | 152 | * SCRIPT_FILENAME |
| 153 | 153 | * SCRIPT_NAME |
| 154 | 154 | * SERVER_NAME |
| 155 | 155 | * SERVER_PORT |
| 156 | 156 | * SERVER_PROTOCOL |
| 157 | + * SERVER_SOFTWARE | |
| 157 | 158 | |
| 158 | 159 | Do a web search for |
| 159 | 160 | "[https://duckduckgo.com/?q=cgi+environment_variables|cgi environment variables]" |
| 160 | 161 | to find more detail about what each of the above variables mean and how |
| 161 | 162 | they are used. |
| 162 | 163 |
| --- www/serverext.wiki | |
| +++ www/serverext.wiki | |
| @@ -118,11 +118,11 @@ | |
| 118 | technologies like Wapp.) The fileup1 script is a demo program that lets |
| 119 | the user upload a file using a form, and then displays that file in the reply. |
| 120 | There is a link on the page that causes the fileup1 script to return a copy |
| 121 | of its own source-code, so you can see how it works. |
| 122 | |
| 123 | <h2>3.0 CGI Inputs</h2> |
| 124 | |
| 125 | The /ext extension mechanism is an ordinary CGI interface. Parameters |
| 126 | are passed to the CGI program using environment variables. The following |
| 127 | standard CGI environment variables are supported: |
| 128 | |
| @@ -152,10 +152,11 @@ | |
| 152 | * SCRIPT_FILENAME |
| 153 | * SCRIPT_NAME |
| 154 | * SERVER_NAME |
| 155 | * SERVER_PORT |
| 156 | * SERVER_PROTOCOL |
| 157 | |
| 158 | Do a web search for |
| 159 | "[https://duckduckgo.com/?q=cgi+environment_variables|cgi environment variables]" |
| 160 | to find more detail about what each of the above variables mean and how |
| 161 | they are used. |
| 162 |
| --- www/serverext.wiki | |
| +++ www/serverext.wiki | |
| @@ -118,11 +118,11 @@ | |
| 118 | technologies like Wapp.) The fileup1 script is a demo program that lets |
| 119 | the user upload a file using a form, and then displays that file in the reply. |
| 120 | There is a link on the page that causes the fileup1 script to return a copy |
| 121 | of its own source-code, so you can see how it works. |
| 122 | |
| 123 | <h2 id="cgi-inputs">3.0 CGI Inputs</h2> |
| 124 | |
| 125 | The /ext extension mechanism is an ordinary CGI interface. Parameters |
| 126 | are passed to the CGI program using environment variables. The following |
| 127 | standard CGI environment variables are supported: |
| 128 | |
| @@ -152,10 +152,11 @@ | |
| 152 | * SCRIPT_FILENAME |
| 153 | * SCRIPT_NAME |
| 154 | * SERVER_NAME |
| 155 | * SERVER_PORT |
| 156 | * SERVER_PROTOCOL |
| 157 | * SERVER_SOFTWARE |
| 158 | |
| 159 | Do a web search for |
| 160 | "[https://duckduckgo.com/?q=cgi+environment_variables|cgi environment variables]" |
| 161 | to find more detail about what each of the above variables mean and how |
| 162 | they are used. |
| 163 |