summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2008-06-28 00:22:31 -0400
committerAdrian Likins <alikins@redhat.com>2008-06-28 00:22:31 -0400
commit3de81d4352c5b423b2b1d71773749b1d96efd051 (patch)
tree10000bd5e2ae5e54ac75871c8e1745c2fd151117
parent4b43a604e5525e7295a26969d463e611befdd2f9 (diff)
parentf70000482a1290752698ccec10cbc6670f990d65 (diff)
downloadthird_party-func-3de81d4352c5b423b2b1d71773749b1d96efd051.tar.gz
third_party-func-3de81d4352c5b423b2b1d71773749b1d96efd051.tar.xz
third_party-func-3de81d4352c5b423b2b1d71773749b1d96efd051.zip
Merge branch 'master' of ssh://alikins@git.fedoraproject.org/git/hosted/func
-rw-r--r--AUTHORS4
-rw-r--r--func/minion/AuthedXMLRPCServer.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 21948a2..960367f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,7 +15,10 @@ Additional patches and contributions by ...
Eli Criffield <elicriffield@gmail.com>
John Eckersberg <jeckersb@redhat.com>
Luca Foppiano <lfoppiano@byte-code.com>
+ Matt Hicks <mhicks@redhat.com>
Scott Henson <shenson@redhat.com>
+ Pradeep Kilambi <pkilambi@redhat.com>
+ Denis Kurov <makkalot@gmail.com>
Vito Laurenza <vitolaurenza@gmail.com>
Brenton Leanhardt <bleanhar@redhat.com>
Luke Macken <lmacken@redhat.com>
@@ -24,6 +27,7 @@ Additional patches and contributions by ...
Robin Norwood <rnorwood@redhat.com>
Al Tobey <tobert@gmail.com>
Tim Verhoeven <tim.verhoeven.be@gmail.com>
+
...
[ send in patches (or modules!) to get your name here ]
diff --git a/func/minion/AuthedXMLRPCServer.py b/func/minion/AuthedXMLRPCServer.py
index 0ec9ce0..7bba160 100644
--- a/func/minion/AuthedXMLRPCServer.py
+++ b/func/minion/AuthedXMLRPCServer.py
@@ -50,7 +50,7 @@ class AuthedSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHan
print "Error (%s): socket error - '%s'" % (self.client_address, e)
-class BaseAuthedXMLRPCServer(SocketServer.ThreadingMixIn):
+class BaseAuthedXMLRPCServer(SocketServer.ForkingMixIn):
def __init__(self, address, authinfo_callback=None):
self.allow_reuse_address = 1
self.logRequests = 1