From 4bc48718b2eb98e3646a86af816f9c6db29d1612 Mon Sep 17 00:00:00 2001
From: Qi Wang <interwq@gwu.edu>
Date: Tue, 17 Jul 2018 14:09:31 -0700
Subject: [PATCH] Tolerate experimental features for abort_conf.

Not aborting with unrecognized experimental options.  This helps us testing
experimental features with abort_conf enabled.
---
 src/jemalloc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/jemalloc.c b/src/jemalloc.c
index e66735c8..8e0a581b 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -896,6 +896,11 @@ malloc_conf_error(const char *msg, const char *k, size_t klen, const char *v,
 	malloc_printf("<jemalloc>: %s: %.*s:%.*s\n", msg, (int)klen, k,
 	    (int)vlen, v);
 	/* If abort_conf is set, error out after processing all options. */
+	const char *experimental = "experimental_";
+	if (strncmp(k, experimental, strlen(experimental)) == 0) {
+		/* However, tolerate experimental features. */
+		return;
+	}
 	had_conf_error = true;
 }