diff options
| author | Rob Austein <sra@hactrn.net> | 2015-07-21 17:41:54 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-07-21 17:41:54 +0000 |
| commit | c82f46c999a2dbd147dc5f126c368b84ad663234 (patch) | |
| tree | 73efa0705d4abb76e5afe743d052fc90b2a042e6 /rpki/left_right.py | |
| parent | 9376f9afbade89253f354e9164a6f40328fa494a (diff) | |
Last batch of catch-up merges. Still need to test, but this is a
development branch, so committing the merge before testing shouldn't
break anything.
svn path=/branches/tk705/; revision=6084
Diffstat (limited to 'rpki/left_right.py')
| -rw-r--r-- | rpki/left_right.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rpki/left_right.py b/rpki/left_right.py index ed344a0a..55f893b8 100644 --- a/rpki/left_right.py +++ b/rpki/left_right.py @@ -956,10 +956,11 @@ class parent_elt(data_elt): cb(r_msg) rpki.http.client( - msg = q_der, - url = self.peer_contact_uri, - callback = unwrap, - errback = eb) + msg = q_der, + url = self.peer_contact_uri, + callback = unwrap, + errback = eb, + content_type = rpki.up_down.content_type) class child_elt(data_elt): """ |