Fossil

Check-in [8b9c933c]
Login

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

Overview
Comment:Merge the ssl_peer_ip branch into trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8b9c933c283a472298ec32ebf76604951d9bfb9d
User & Date: drh 2011-09-01 21:51:40
Context
2011-09-01
21:56
Merge the symlinks branch into trunk. check-in: e4f1c1fe user: drh tags: trunk
21:51
Merge the ssl_peer_ip branch into trunk. check-in: 8b9c933c 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: 9ce6771c user: viriketo tags: ssl_peer_ip
20:23
Stop publishing x64 binaries for linux. x86 binaries are sufficient. check-in: bd04a489 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

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.
*/