Fossil SCM
Add a few environment variables mentioned in recent check-in comments to the documentation.
Commit
85cfdd192ab3e012e324f1de0b28e89cd7318b21bce33363802a2789ab01a3f3
Parent
b145f19df5de3a2…
2 files changed
+3
+7
M
src/db.c
+3
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -4291,10 +4291,13 @@ | ||
| 4291 | 4291 | ** OpenSSL CAs. If unset, the default list will be used. |
| 4292 | 4292 | ** Some platforms may add additional certificates. |
| 4293 | 4293 | ** Checking your platform behaviour is required if the |
| 4294 | 4294 | ** exact contents of the CA root is critical for your |
| 4295 | 4295 | ** application. |
| 4296 | +** | |
| 4297 | +** This setting is overridden by environment variables | |
| 4298 | +** SSL_CERT_FILE and SSL_CERT_DIR. | |
| 4296 | 4299 | */ |
| 4297 | 4300 | /* |
| 4298 | 4301 | ** SETTING: ssl-identity width=40 sensitive |
| 4299 | 4302 | ** The full pathname to a file containing a certificate |
| 4300 | 4303 | ** and private key in PEM format. Create by concatenating |
| 4301 | 4304 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4291,10 +4291,13 @@ | |
| 4291 | ** OpenSSL CAs. If unset, the default list will be used. |
| 4292 | ** Some platforms may add additional certificates. |
| 4293 | ** Checking your platform behaviour is required if the |
| 4294 | ** exact contents of the CA root is critical for your |
| 4295 | ** application. |
| 4296 | */ |
| 4297 | /* |
| 4298 | ** SETTING: ssl-identity width=40 sensitive |
| 4299 | ** The full pathname to a file containing a certificate |
| 4300 | ** and private key in PEM format. Create by concatenating |
| 4301 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4291,10 +4291,13 @@ | |
| 4291 | ** OpenSSL CAs. If unset, the default list will be used. |
| 4292 | ** Some platforms may add additional certificates. |
| 4293 | ** Checking your platform behaviour is required if the |
| 4294 | ** exact contents of the CA root is critical for your |
| 4295 | ** application. |
| 4296 | ** |
| 4297 | ** This setting is overridden by environment variables |
| 4298 | ** SSL_CERT_FILE and SSL_CERT_DIR. |
| 4299 | */ |
| 4300 | /* |
| 4301 | ** SETTING: ssl-identity width=40 sensitive |
| 4302 | ** The full pathname to a file containing a certificate |
| 4303 | ** and private key in PEM format. Create by concatenating |
| 4304 |
+7
| --- www/env-opts.md | ||
| +++ www/env-opts.md | ||
| @@ -227,12 +227,19 @@ | ||
| 227 | 227 | `REQUEST_METHOD`: If defined, included in error log messages. |
| 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 | + | |
| 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. | |
| 232 | 236 | |
| 233 | 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. | |
| 234 | 241 | |
| 235 | 242 | `SQLITE_FORCE_PROXY_LOCKING`: From `sqlite3.c`, 1 means force always |
| 236 | 243 | use proxy, 0 means never use proxy, and undefined means use proxy for |
| 237 | 244 | non-local files only. |
| 238 | 245 | |
| 239 | 246 |
| --- www/env-opts.md | |
| +++ www/env-opts.md | |
| @@ -227,12 +227,19 @@ | |
| 227 | `REQUEST_METHOD`: If defined, included in error log messages. |
| 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 | `SQLITE_FORCE_PROXY_LOCKING`: From `sqlite3.c`, 1 means force always |
| 236 | use proxy, 0 means never use proxy, and undefined means use proxy for |
| 237 | non-local files only. |
| 238 | |
| 239 |
| --- www/env-opts.md | |
| +++ www/env-opts.md | |
| @@ -227,12 +227,19 @@ | |
| 227 | `REQUEST_METHOD`: If defined, included in error log messages. |
| 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 | |
| 242 | `SQLITE_FORCE_PROXY_LOCKING`: From `sqlite3.c`, 1 means force always |
| 243 | use proxy, 0 means never use proxy, and undefined means use proxy for |
| 244 | non-local files only. |
| 245 | |
| 246 |