Differences From Artifact [782f6114fe]:

• File src/main.c — part of check-in [c965636958] at 2020-08-08 23:51:02 on branch trunk — Many updates to built-in help pages. No changes to code. (user: drh size: 109543) [more...]

To Artifact [983e335fee]:

• File src/main.c — part of check-in [edf63d73c5] at 2020-08-16 15:47:42 on branch bad-merge — Disable HTTPS redirect for the "test-http" command. That command is used by the "ssh:" transport method and redirects to https will break ssh: transport. (user: drh size: 109602) [more...]

2632
2633
2634
2635
2636
2637
2638

2639
2640
2641
2642
2643
2644
2645

  fossil_binary_mode(g.httpOut);
  fossil_binary_mode(g.httpIn);
  g.zExtRoot = find_option("extroot",0,1);
  find_server_repository(2, 0);
  g.cgiOutput = 1;
  g.fNoHttpCompress = 1;
  g.fullHttpReply = 1;

  zIpAddr = cgi_ssh_remote_addr(0);
  if( zIpAddr && zIpAddr[0] ){
    g.fSshClient |= CGI_SSH_CLIENT;
    ssh_request_loop(zIpAddr, 0);
  }else{
    cgi_set_parameter("REMOTE_ADDR", "127.0.0.1");
    cgi_handle_http_request(0);

>

2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646

  fossil_binary_mode(g.httpOut);
  fossil_binary_mode(g.httpIn);
  g.zExtRoot = find_option("extroot",0,1);
  find_server_repository(2, 0);
  g.cgiOutput = 1;
  g.fNoHttpCompress = 1;
  g.fullHttpReply = 1;
  g.sslNotAvailable = 1;  /* Avoid attempts to redirect */
  zIpAddr = cgi_ssh_remote_addr(0);
  if( zIpAddr && zIpAddr[0] ){
    g.fSshClient |= CGI_SSH_CLIENT;
    ssh_request_loop(zIpAddr, 0);
  }else{
    cgi_set_parameter("REMOTE_ADDR", "127.0.0.1");
    cgi_handle_http_request(0);