Fossil SCM
Fix a typos and improve the wording on the failure-to-upgrade-to-HTTPS error screen.
Commit
01984ee0d22b540669a6a57d3ac3c9ad6e6bcbdb68b0874cc01a8097011aa249
Parent
55f6c765fb62b03…
1 file changed
+4
-4
+4
-4
| --- src/login.c | ||
| +++ src/login.c | ||
| @@ -502,17 +502,17 @@ | ||
| 502 | 502 | const char *zReferer; |
| 503 | 503 | |
| 504 | 504 | login_check_credentials(); |
| 505 | 505 | if( login_wants_https_redirect() ){ |
| 506 | 506 | const char *zQS = P("QUERY_STRING"); |
| 507 | - if( P("redir")!=0 || g.sslNotAvailable ){ | |
| 507 | + if( P("redir")!=0 ){ | |
| 508 | 508 | style_header("Insecure Connection"); |
| 509 | 509 | @ <h1>Unable To Establish An Encrypted Connection</h1> |
| 510 | 510 | @ <p>This website requires that login credentials be sent over |
| 511 | - @ an encrypted connection. The current connection, however, is | |
| 512 | - @ is not encrypted all the way from your browser to the server. | |
| 513 | - @ A prior attempt was made to redirect to %h(g.zHttpsURL) but | |
| 511 | + @ an encrypted connection. The current connection is not encrypted | |
| 512 | + @ across the entire route between your browser and the server. | |
| 513 | + @ An attempt was made to redirect to %h(g.zHttpsURL) but | |
| 514 | 514 | @ the connection is still insecure even after the redirect.</p> |
| 515 | 515 | @ <p>This is probably some kind of configuration problem. Please |
| 516 | 516 | @ contact your sysadmin.</p> |
| 517 | 517 | @ <p>Sorry it didn't work out.</p> |
| 518 | 518 | style_footer(); |
| 519 | 519 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -502,17 +502,17 @@ | |
| 502 | const char *zReferer; |
| 503 | |
| 504 | login_check_credentials(); |
| 505 | if( login_wants_https_redirect() ){ |
| 506 | const char *zQS = P("QUERY_STRING"); |
| 507 | if( P("redir")!=0 || g.sslNotAvailable ){ |
| 508 | style_header("Insecure Connection"); |
| 509 | @ <h1>Unable To Establish An Encrypted Connection</h1> |
| 510 | @ <p>This website requires that login credentials be sent over |
| 511 | @ an encrypted connection. The current connection, however, is |
| 512 | @ is not encrypted all the way from your browser to the server. |
| 513 | @ A prior attempt was made to redirect to %h(g.zHttpsURL) but |
| 514 | @ the connection is still insecure even after the redirect.</p> |
| 515 | @ <p>This is probably some kind of configuration problem. Please |
| 516 | @ contact your sysadmin.</p> |
| 517 | @ <p>Sorry it didn't work out.</p> |
| 518 | style_footer(); |
| 519 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -502,17 +502,17 @@ | |
| 502 | const char *zReferer; |
| 503 | |
| 504 | login_check_credentials(); |
| 505 | if( login_wants_https_redirect() ){ |
| 506 | const char *zQS = P("QUERY_STRING"); |
| 507 | if( P("redir")!=0 ){ |
| 508 | style_header("Insecure Connection"); |
| 509 | @ <h1>Unable To Establish An Encrypted Connection</h1> |
| 510 | @ <p>This website requires that login credentials be sent over |
| 511 | @ an encrypted connection. The current connection is not encrypted |
| 512 | @ across the entire route between your browser and the server. |
| 513 | @ An attempt was made to redirect to %h(g.zHttpsURL) but |
| 514 | @ the connection is still insecure even after the redirect.</p> |
| 515 | @ <p>This is probably some kind of configuration problem. Please |
| 516 | @ contact your sysadmin.</p> |
| 517 | @ <p>Sorry it didn't work out.</p> |
| 518 | style_footer(); |
| 519 |