Fossil SCM
Better solution than [344a3331d34d896], which doesn't involve runtime-detection. Works with both Openssl 1.0.1 and 1.1.0.
Commit
f23d509b4866d380f524b443054e0bd5590872e5e97f232e2cb72cd1618d63d7
Parent
f08b93daa5260b5…
2 files changed
-1
+1
-1
M
auto.def
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -376,11 +376,10 @@ | ||
| 376 | 376 | if {[string match *-darwin* [get-define host]]} { |
| 377 | 377 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 378 | 378 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 379 | 379 | } |
| 380 | 380 | } |
| 381 | - cc-check-function-in-lib BIO_ADDR_hostname_string ssl | |
| 382 | 381 | } else { |
| 383 | 382 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 384 | 383 | } |
| 385 | 384 | } else { |
| 386 | 385 | if {[info exists ::zlib_lib]} { |
| 387 | 386 |
| --- auto.def | |
| +++ auto.def | |
| @@ -376,11 +376,10 @@ | |
| 376 | if {[string match *-darwin* [get-define host]]} { |
| 377 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 378 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 379 | } |
| 380 | } |
| 381 | cc-check-function-in-lib BIO_ADDR_hostname_string ssl |
| 382 | } else { |
| 383 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 384 | } |
| 385 | } else { |
| 386 | if {[info exists ::zlib_lib]} { |
| 387 |
| --- auto.def | |
| +++ auto.def | |
| @@ -376,11 +376,10 @@ | |
| 376 | if {[string match *-darwin* [get-define host]]} { |
| 377 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 378 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 379 | } |
| 380 | } |
| 381 | } else { |
| 382 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 383 | } |
| 384 | } else { |
| 385 | if {[info exists ::zlib_lib]} { |
| 386 |
+1
-1
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -387,11 +387,11 @@ | ||
| 387 | 387 | /* Set the Global.zIpAddr variable to the server we are talking to. |
| 388 | 388 | ** This is used to populate the ipaddr column of the rcvfrom table, |
| 389 | 389 | ** if any files are received from the server. |
| 390 | 390 | */ |
| 391 | 391 | { |
| 392 | -#ifdef HAVE_BIO_ADDR_HOSTNAME_STRING | |
| 392 | +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L | |
| 393 | 393 | char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1); |
| 394 | 394 | g.zIpAddr = mprintf("%s", ip); |
| 395 | 395 | OPENSSL_free(ip); |
| 396 | 396 | #else |
| 397 | 397 | /* IPv4 only code */ |
| 398 | 398 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -387,11 +387,11 @@ | |
| 387 | /* Set the Global.zIpAddr variable to the server we are talking to. |
| 388 | ** This is used to populate the ipaddr column of the rcvfrom table, |
| 389 | ** if any files are received from the server. |
| 390 | */ |
| 391 | { |
| 392 | #ifdef HAVE_BIO_ADDR_HOSTNAME_STRING |
| 393 | char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1); |
| 394 | g.zIpAddr = mprintf("%s", ip); |
| 395 | OPENSSL_free(ip); |
| 396 | #else |
| 397 | /* IPv4 only code */ |
| 398 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -387,11 +387,11 @@ | |
| 387 | /* Set the Global.zIpAddr variable to the server we are talking to. |
| 388 | ** This is used to populate the ipaddr column of the rcvfrom table, |
| 389 | ** if any files are received from the server. |
| 390 | */ |
| 391 | { |
| 392 | #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L |
| 393 | char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1); |
| 394 | g.zIpAddr = mprintf("%s", ip); |
| 395 | OPENSSL_free(ip); |
| 396 | #else |
| 397 | /* IPv4 only code */ |
| 398 |