Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Clean up the detection of BIO_ADDR_hostname_string by removing redundant definitions; apparently autosetup has a feature which automatically creates a define with HAVE_ prepended for whatever function is intended to be detected. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
3d827943481e96aae83cbef2af5484e8 |
| User & Date: | andybradford 2019-04-01 00:43:49 |
| Original Comment: | Clean up the detection of BIO_ADDR_hostname-string by removing redundant definitions; apparently autosetup has a feature which automatically creates a define with HAVE_ prepended for whatever function is intended to be detected. |
Context
|
2019-04-18
| ||
| 14:06 | (cherry-pick): Clean up the detection of BIO_ADDR_hostname_string by removing redundant definitions; apparently autosetup has a feature which automatically creates a define with HAVE_ prepended for whatever function is intended to be detected. (check-in: 9ef58dcf user: jan.nijtmans tags: branch-2.8) | |
|
2019-04-02
| ||
| 03:26 | The abbreviated certbot command didn't work here on my first Let's Encrypt renewal after writing the tls-nginx.md document, so changed that advice to use the full-strength form. (check-in: dadd1342 user: wyoung tags: trunk) | |
|
2019-04-01
| ||
| 00:43 | Clean up the detection of BIO_ADDR_hostname_string by removing redundant definitions; apparently autosetup has a feature which automatically creates a define with HAVE_ prepended for whatever function is intended to be detected. (check-in: 3d827943 user: andybradford tags: trunk) | |
|
2019-03-30
| ||
| 15:40 | Backout [f517cb7f] because they both come together anyway and this one is a macro. See https://fossil-scm.org/forum/forumpost/da64c38d6a for discussion. (check-in: 3b23b328 user: andybradford tags: trunk) | |
Changes
Changes to auto.def.
374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 |
# Silence OpenSSL deprecation warnings on Mac OS X 10.7.
if {[string match *-darwin* [get-define host]]} {
if {[cctest -cflags {-Wdeprecated-declarations}]} {
define-append EXTRA_CFLAGS -Wdeprecated-declarations
}
}
if {[cc-check-function-in-lib BIO_ADDR_hostname_string ssl]} {
define HAVE_BIO_ADDR_HS 1
}
} else {
user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
}
} else {
if {[info exists ::zlib_lib]} {
define-append LIBS $::zlib_lib
}
|
| < < |
374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 |
# Silence OpenSSL deprecation warnings on Mac OS X 10.7.
if {[string match *-darwin* [get-define host]]} {
if {[cctest -cflags {-Wdeprecated-declarations}]} {
define-append EXTRA_CFLAGS -Wdeprecated-declarations
}
}
cc-check-function-in-lib BIO_ADDR_hostname_string ssl
} else {
user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
}
} else {
if {[info exists ::zlib_lib]} {
define-append LIBS $::zlib_lib
}
|
Changes to src/http_ssl.c.
385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 |
}
/* 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.
*/
{
#ifdef HAVE_BIO_ADDR_HS
char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1);
g.zIpAddr = mprintf("%s", ip);
OPENSSL_free(ip);
#else
/* IPv4 only code */
const unsigned char *ip;
ip = (const unsigned char*)BIO_ptr_ctrl(iBio,BIO_C_GET_CONNECT,2);
|
| |
385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 |
}
/* 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.
*/
{
#ifdef HAVE_BIO_ADDR_HOSTNAME_STRING
char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1);
g.zIpAddr = mprintf("%s", ip);
OPENSSL_free(ip);
#else
/* IPv4 only code */
const unsigned char *ip;
ip = (const unsigned char*)BIO_ptr_ctrl(iBio,BIO_C_GET_CONNECT,2);
|