summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--websockify/websocketproxy.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py
index c636d54..feed588 100644
--- a/websockify/websocketproxy.py
+++ b/websockify/websocketproxy.py
@@ -325,8 +325,11 @@ class WebSocketProxy(websockifyserver.WebSockifyServer):
self.target_port = sock.getsockname()[1]
sock.close()
+ # Insert rebinder at the head of the (possibly empty) LD_PRELOAD pathlist
+ ld_preloads = filter(None, [ self.rebinder, os.environ.get("LD_PRELOAD", None) ])
+
os.environ.update({
- "LD_PRELOAD": self.rebinder,
+ "LD_PRELOAD": os.pathsep.join(ld_preloads),
"REBIND_OLD_PORT": str(kwargs['listen_port']),
"REBIND_NEW_PORT": str(self.target_port)})