Fossil SCM
Merge from trunk.
Commit
201004367baed3d6593ada3b6007d5cb40dfe60687feb65d54b71626a16df7d6
Parent
62077d3fd4e3050…
1 file changed
+1
-1
M
src/db.c
+1
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -4841,11 +4841,11 @@ | ||
| 4841 | 4841 | ** URL of the HTTP proxy. If undefined or "system", the "http_proxy" |
| 4842 | 4842 | ** environment variable is consulted. If "off", a direct HTTP connection is |
| 4843 | 4843 | ** used. |
| 4844 | 4844 | */ |
| 4845 | 4845 | /* |
| 4846 | -** SETTING: redirect-to-https default=0 width=-1 | |
| 4846 | +** SETTING: redirect-to-https default=0 width=2 | |
| 4847 | 4847 | ** Specifies whether or not to redirect http:// requests to |
| 4848 | 4848 | ** https:// URIs. A value of 0 (the default) means not to |
| 4849 | 4849 | ** redirect, 1 means to redirect only the /login page, and 2 |
| 4850 | 4850 | ** means to always redirect. |
| 4851 | 4851 | */ |
| 4852 | 4852 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4841,11 +4841,11 @@ | |
| 4841 | ** URL of the HTTP proxy. If undefined or "system", the "http_proxy" |
| 4842 | ** environment variable is consulted. If "off", a direct HTTP connection is |
| 4843 | ** used. |
| 4844 | */ |
| 4845 | /* |
| 4846 | ** SETTING: redirect-to-https default=0 width=-1 |
| 4847 | ** Specifies whether or not to redirect http:// requests to |
| 4848 | ** https:// URIs. A value of 0 (the default) means not to |
| 4849 | ** redirect, 1 means to redirect only the /login page, and 2 |
| 4850 | ** means to always redirect. |
| 4851 | */ |
| 4852 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4841,11 +4841,11 @@ | |
| 4841 | ** URL of the HTTP proxy. If undefined or "system", the "http_proxy" |
| 4842 | ** environment variable is consulted. If "off", a direct HTTP connection is |
| 4843 | ** used. |
| 4844 | */ |
| 4845 | /* |
| 4846 | ** SETTING: redirect-to-https default=0 width=2 |
| 4847 | ** Specifies whether or not to redirect http:// requests to |
| 4848 | ** https:// URIs. A value of 0 (the default) means not to |
| 4849 | ** redirect, 1 means to redirect only the /login page, and 2 |
| 4850 | ** means to always redirect. |
| 4851 | */ |
| 4852 |