Fossil

Changes On Branch bad-merge
Login

Changes On Branch bad-merge

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch bad-merge Excluding Merge-Ins

This is equivalent to a diff from 9d2b7cab to 154f6484

2020-08-16
15:51
Fixed a recursion bug in fossil.dom.append(e,array) (currently unused, but will be soon). ... (check-in: 2018954b user: drh tags: trunk)
15:51
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. ... (check-in: ea6365a8 user: drh tags: trunk)
15:49
Fixed a recursion bug in fossil.dom.append(e,array) (currently unused, but will be soon). ... (Closed-Leaf check-in: 154f6484 user: stephan tags: bad-merge)
15:47
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. ... (check-in: edf63d73 user: drh tags: bad-merge)
15:30
Close multi-remote-fix branch because the issue is now resolved. See https://fossil-scm.org/forum/forumpost/158a67cc53 for some information on what was going on. The solution was to reopen the configuration after it was being prematurely closed. ... (check-in: 4c16a249 user: andygoth tags: bad-merge)
15:20
Fix the "fossil clone" command so that it works with "file:" URLs. ... (check-in: 9d2b7cab user: drh tags: trunk)
15:03
Put the date on the 2.12 release. Start a change-log for 2.13. ... (check-in: 522e7204 user: drh tags: trunk)

Changes to src/fossil.dom.js.

216
217
218
219
220
221
222
223
224
225
226


227
228
229
230
231
232
233
  */
  dom.append = function f(parent/*,...*/){
    const a = argsToArray(arguments);
    a.shift();
    for(let i in a) {
      var e = a[i];
      if(isArray(e) || e.forEach){
        e.forEach((x)=>f.call(this, parent,e));
        continue;
      }
      if('string'===typeof e || 'number'===typeof e) e = this.text(e);


      parent.appendChild(e);
    }
    return parent;
  };

  dom.input = function(type){
    return this.attr(this.create('input'), 'type', type);







|


|
>
>







216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
  */
  dom.append = function f(parent/*,...*/){
    const a = argsToArray(arguments);
    a.shift();
    for(let i in a) {
      var e = a[i];
      if(isArray(e) || e.forEach){
        e.forEach((x)=>f.call(this, parent,x));
        continue;
      }
      if('string'===typeof e
         || 'number'===typeof e
         || 'boolean'===typeof e) e = this.text(e);
      parent.appendChild(e);
    }
    return parent;
  };

  dom.input = function(type){
    return this.attr(this.create('input'), 'type', type);

Changes to src/main.c.

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);