New upstream version 26.1.0+dfsg1

This commit is contained in:
Sebastian Ramacher 2020-12-22 18:32:50 +01:00
parent 040dcc3fc2
commit 013818c4af
594 changed files with 19576 additions and 4478 deletions

View file

@ -348,6 +348,12 @@ RTMP_TLS_LoadCerts(RTMP *r) {
"/etc/ssl/certs");
goto error;
}
#elif defined(__OpenBSD__)
if (mbedtls_x509_crt_parse_file(chain, "/etc/ssl/cert.pem") < 0) {
RTMP_Log(RTMP_LOGERROR, "mbedtls_x509_crt_parse_file: Couldn't parse "
"/etc/ssl/cert.pem");
goto error;
}
#endif
mbedtls_ssl_conf_ca_chain(&r->RTMP_TLS_ctx->conf, chain, NULL);
@ -814,8 +820,10 @@ add_addr_info(struct sockaddr_storage *service, socklen_t *addrlen, AVal *host,
*socket_error = WSANO_DATA;
#elif __FreeBSD__
*socket_error = ENOATTR;
#else
#elif defined(ENODATA)
*socket_error = ENODATA;
#else
*socket_error = EAFNOSUPPORT;
#endif
RTMP_Log(RTMP_LOGERROR, "Could not resolve server '%s': no valid address found", hostname);
@ -3382,10 +3390,9 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize)
else
{
RTMP_Log(RTMP_LOGWARNING, "Unhandled: %s:\n%s", r->Link.tcUrl.av_val, code.av_val);
if (description.av_len)
RTMP_Log(RTMP_LOGWARNING, "Unhandled: %s:\n%s (%s)", r->Link.tcUrl.av_val, code.av_val, description.av_val);
else
RTMP_Log(RTMP_LOGWARNING, "Unhandled: %s:\n%s", r->Link.tcUrl.av_val, code.av_val);
RTMP_Log(RTMP_LOGDEBUG, "Description: %s", description.av_val);
}
}
else if (AVMATCH(&method, &av_playlist_ready))