From dad1a01f471204ecbaccb0215a62fc139f7edd9e Mon Sep 17 00:00:00 2001
From: Jim Fulton <jim@zope.com>
Date: Thu, 12 Jan 2017 11:04:11 -0500
Subject: [PATCH] Only look at ZEO_MSGPACK if msgpack ZConfig option wasn't
 used.

---
 src/ZEO/runzeo.py  | 3 ++-
 src/ZEO/server.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ZEO/runzeo.py b/src/ZEO/runzeo.py
index 6d28b18f3..23eba5394 100644
--- a/src/ZEO/runzeo.py
+++ b/src/ZEO/runzeo.py
@@ -343,7 +343,8 @@ def create_server(storages, options):
         storages,
         read_only = options.read_only,
         client_conflict_resolution=options.client_conflict_resolution,
-        msgpack=options.msgpack or os.environ.get('ZEO_MSGPACK'),
+        msgpack=(options.msgpack if isinstance(options.msgpack, bool)
+                 else os.environ.get('ZEO_MSGPACK')),
         invalidation_queue_size = options.invalidation_queue_size,
         invalidation_age = options.invalidation_age,
         transaction_timeout = options.transaction_timeout,
diff --git a/src/ZEO/server.xml b/src/ZEO/server.xml
index faffb7aae..12fa112ca 100644
--- a/src/ZEO/server.xml
+++ b/src/ZEO/server.xml
@@ -115,7 +115,7 @@
       </description>
     </key>
 
-    <key name="msgpack" datatype="boolean" required="no" default="false">
+    <key name="msgpack" datatype="boolean" required="no">
       <description>
         Use msgpack to serialize and de-serialize ZEO protocol messages.