Changes On Branch ssl_peer_ip
Not logged in

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

Changes In Branch ssl_peer_ip Excluding Merge-Ins

This is equivalent to a diff from a22c381757 to 9ce6771c78

2011-09-01
21:51
Merge the ssl_peer_ip branch into trunk. check-in: 8b9c933c28 user: drh tags: trunk
20:38
I think I fix a possible bug on platforms where 'char' has signed meaning, on the code about noting the 'rcvfrom' ipv4 address. Closed-Leaf check-in: 9ce6771c78 user: viriketo tags: ssl_peer_ip
20:33
Adding some ipv4-only code to get the ip where we took the content from for the https connections. The "rcvfrom" information was lost in the case of https connections.    I don't know how to make it work well for ipv6 too. check-in: daa6a0eb9b user: viriketo tags: ssl_peer_ip
18:25
Version 1.19. check-in: 6517b5c857 user: drh tags: trunk, release, version-1.19
17:45
Merging the unwanted two trunk leaves. check-in: a22c381757 user: viriketo tags: trunk
17:44
Fixing typo in the 'fossil configuration' command line help. check-in: cd8041b159 user: viriketo tags: trunk
17:04
Disable the use of <canvas> for rendering the graph. The canvas is busted in recent versions of Firefox. And canvas is mostly busted by design anyhow, since apparently it can not be taller than 32768 pixels, and Fossil graphs frequently need to be taller than that. check-in: 9eb4575295 user: drh tags: trunk

Changes to src/http_ssl.c.

278
279
280
281
282
283
284











285
286
287
288
289
290
291
      return 1;
    }
    if( blob_str(&ans)[0]=='a' ) {
      ssl_save_certificate(cert);
    }
    blob_reset(&ans);
  }











  X509_free(cert);
  return 0;
}

/*
** Save certificate to global config.
*/






>
>
>
>
>
>
>
>
>
>
>







278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
      return 1;
    }
    if( blob_str(&ans)[0]=='a' ) {
      ssl_save_certificate(cert);
    }
    blob_reset(&ans);
  }

  /* Set the Global.zIpAddr variable to the server we are talking to.
  ** This is used to populate the ipaddr column of the rcvfrom table,
  ** if any files are received from the server.
  */
  {
      /* IPv4 only code */
      const unsigned char *ip = (const unsigned char *) BIO_get_conn_ip(iBio);
      g.zIpAddr = mprintf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
  }

  X509_free(cert);
  return 0;
}

/*
** Save certificate to global config.
*/