From f78ee9d42e0f841b95db64de62da2df72e1c48f4 Mon Sep 17 00:00:00 2001
From: Dmitry Frank <mail@dmitryfrank.com>
Date: Thu, 25 May 2017 17:53:49 +0300
Subject: [PATCH] Don't ignore non-merge commits when publishing
Merge commits are not explicitly ignored either: they're just naturally
ignored as empty commits.
PUBLISHED_FROM=2c814104eedd76ee90813488277ecaaf2baf6315
---
mongoose.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/mongoose.c b/mongoose.c
index c22c9dc52..aaadc2ba8 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -4602,12 +4602,6 @@ static void mg_ssl_if_mbed_free_certs_and_keys(struct mg_ssl_if_ctx *ctx) {
}
if (ctx->ca_cert != NULL) {
mbedtls_ssl_conf_ca_chain(ctx->conf, NULL, NULL);
-#ifdef MBEDTLS_X509_CA_CHAIN_ON_DISK
- if (ctx->ca_cert->ca_chain_file != NULL) {
- MG_FREE((void *) ctx->ca_cert->ca_chain_file);
- ctx->ca_cert->ca_chain_file = NULL;
- }
-#endif
mbedtls_x509_crt_free(ctx->ca_cert);
MG_FREE(ctx->ca_cert);
ctx->ca_cert = NULL;
@@ -4693,16 +4687,9 @@ static enum mg_ssl_if_result mg_use_ca_cert(struct mg_ssl_if_ctx *ctx,
}
ctx->ca_cert = (mbedtls_x509_crt *) MG_CALLOC(1, sizeof(*ctx->ca_cert));
mbedtls_x509_crt_init(ctx->ca_cert);
-#ifdef MBEDTLS_X509_CA_CHAIN_ON_DISK
- ca_cert = strdup(ca_cert);
- if (mbedtls_x509_crt_set_ca_chain_file(ctx->ca_cert, ca_cert) != 0) {
- return MG_SSL_ERROR;
- }
-#else
if (mbedtls_x509_crt_parse_file(ctx->ca_cert, ca_cert) != 0) {
return MG_SSL_ERROR;
}
-#endif
mbedtls_ssl_conf_ca_chain(ctx->conf, ctx->ca_cert, NULL);
mbedtls_ssl_conf_authmode(ctx->conf, MBEDTLS_SSL_VERIFY_REQUIRED);
return MG_SSL_OK;
@@ -11129,7 +11116,6 @@ int mg_resolve_async_opt(struct mg_mgr *mgr, const char *name, int query,
void mg_set_nameserver(struct mg_mgr *mgr, const char *nameserver) {
MG_FREE((char *) mgr->nameserver);
- mgr->nameserver = NULL;
if (nameserver != NULL) {
mgr->nameserver = strdup(nameserver);
}
--
GitLab