Fossil SCM
Since libressl abuses OPENSSL_VERSION_NUMBER, don't let fossil being confused by that.
Commit
5c40d6b0d4cbcafb8fc662465c4f76066a21ea4c38964e3d7e2bc8d8d277c26f
Parent
d19df6161f01cea…
1 file changed
+4
-1
+4
-1
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -387,11 +387,14 @@ | ||
| 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 | -#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L | |
| 392 | + /* As soon as libressl implements BIO_ADDR_hostname_string/BIO_get_conn_address. | |
| 393 | + * check here for the correct LIBRESSL_VERSION_NUMBER too. For now: disable */ | |
| 394 | + #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L \ | |
| 395 | + && !defined(LIBRESSL_VERSION_NUMBER) | |
| 393 | 396 | char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1); |
| 394 | 397 | g.zIpAddr = mprintf("%s", ip); |
| 395 | 398 | OPENSSL_free(ip); |
| 396 | 399 | #else |
| 397 | 400 | /* IPv4 only code */ |
| 398 | 401 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -387,11 +387,14 @@ | |
| 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 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -387,11 +387,14 @@ | |
| 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 | /* As soon as libressl implements BIO_ADDR_hostname_string/BIO_get_conn_address. |
| 393 | * check here for the correct LIBRESSL_VERSION_NUMBER too. For now: disable */ |
| 394 | #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L \ |
| 395 | && !defined(LIBRESSL_VERSION_NUMBER) |
| 396 | char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1); |
| 397 | g.zIpAddr = mprintf("%s", ip); |
| 398 | OPENSSL_free(ip); |
| 399 | #else |
| 400 | /* IPv4 only code */ |
| 401 |