Gustavo Frederico Temple Pedrosa has uploaded a new change for review.
Change subject: xmlrpc: [Fix] Use correct base class for parsing request ......................................................................
xmlrpc: [Fix] Use correct base class for parsing request
Previously we always used SecureXMLRPCServer.parse_request, even when using SimpleXMLRPCServer. That happened to work since both inherit parse_request from BaseHTTPServer. This patch use the correct base class, so if one of them will override parse_request, we use the correct method. Note: Without this fix ssl=false does not work on python 2.7
Change-Id: I4ef737c02afb97580179f381e0f227ee94e1383f Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1074063 Signed-off-by: Gustavo Pedrosa gustavo.pedrosa@eldorado.org.br Reviewed-on: http://gerrit.ovirt.org/24289 --- M vdsm/BindingXMLRPC.py 1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/25524/5
diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py index bafc7c7..d23235b 100644 --- a/vdsm/BindingXMLRPC.py +++ b/vdsm/BindingXMLRPC.py @@ -207,8 +207,7 @@ exc_info=True)
def parse_request(self): - r = (SecureXMLRPCServer.SecureXMLRPCRequestHandler. - parse_request(self)) + r = basehandler.parse_request(self) threadLocal.flowID = self.headers.get(HTTP_HEADER_FLOWID) return r
Nir Soffer has posted comments on this change.
Change subject: xmlrpc: Use correct base class for parsing request ......................................................................
Patch Set 1: Code-Review+1
Nir Soffer has posted comments on this change.
Change subject: xmlrpc: Use correct base class for parsing request ......................................................................
Patch Set 2:
Gustavo, you must add a Bug-Url: with the bug url
Nir Soffer has posted comments on this change.
Change subject: xmlrpc: Use correct base class for parsing request ......................................................................
Patch Set 2:
(2 comments)
Check comments on the commit message
http://gerrit.ovirt.org/#/c/25524/2//COMMIT_MSG Commit Message:
Line 11: parse_request from BaseHTTPServer. This patch use the correct base Line 12: class, so if one of them will override parse_request, we use the correct Line 13: method. Line 14: Line 15: Change-Id: I4ef737c02afb97580179f381e0f227ee94e1383f Add Bug-Url: https://bugzilla.redhat.com/xxxxxx Line 16: Signed-off-by: Gustavo Pedrosa gustavo.pedrosa@eldorado.org.br
Line 13: method. Line 14: Line 15: Change-Id: I4ef737c02afb97580179f381e0f227ee94e1383f Line 16: Signed-off-by: Gustavo Pedrosa gustavo.pedrosa@eldorado.org.br Line 17: Reviewed-on: http://gerrit.ovirt.org/25524 Reviewed-on should point to http://gerrit.ovirt.org/#/c/24289/
Nir Soffer has posted comments on this change.
Change subject: xmlrpc: Use correct base class for parsing request ......................................................................
Patch Set 2:
(1 comment)
http://gerrit.ovirt.org/#/c/25524/2//COMMIT_MSG Commit Message:
Line 9: Previously we always used SecureXMLRPCServer.parse_request, even when Line 10: using SimpleXMLRPCServer. That happened to work since both inherit Line 11: parse_request from BaseHTTPServer. This patch use the correct base Line 12: class, so if one of them will override parse_request, we use the correct Line 13: method. Please add note that without this fix ssl=false does not work on python 2.7. This may be true also for python 2.6 but we need to verify this. Line 14: Line 15: Change-Id: I4ef737c02afb97580179f381e0f227ee94e1383f Line 16: Signed-off-by: Gustavo Pedrosa gustavo.pedrosa@eldorado.org.br
Nir Soffer has posted comments on this change.
Change subject: xmlrpc: [Fix] Use correct base class for parsing request ......................................................................
Patch Set 4:
Gustavo - check my comments: http://gerrit.ovirt.org/#/c/25524/2//COMMIT_MSG
Gustavo Frederico Temple Pedrosa has posted comments on this change.
Change subject: xmlrpc: [Fix] Use correct base class for parsing request ......................................................................
Patch Set 2:
(3 comments)
http://gerrit.ovirt.org/#/c/25524/2//COMMIT_MSG Commit Message:
Line 9: Previously we always used SecureXMLRPCServer.parse_request, even when Line 10: using SimpleXMLRPCServer. That happened to work since both inherit Line 11: parse_request from BaseHTTPServer. This patch use the correct base Line 12: class, so if one of them will override parse_request, we use the correct Line 13: method.
Please add note that without this fix ssl=false does not work on python 2.7
Done Line 14: Line 15: Change-Id: I4ef737c02afb97580179f381e0f227ee94e1383f Line 16: Signed-off-by: Gustavo Pedrosa gustavo.pedrosa@eldorado.org.br
Line 11: parse_request from BaseHTTPServer. This patch use the correct base Line 12: class, so if one of them will override parse_request, we use the correct Line 13: method. Line 14: Line 15: Change-Id: I4ef737c02afb97580179f381e0f227ee94e1383f
Add Bug-Url: https://bugzilla.redhat.com/xxxxxx
Done Line 16: Signed-off-by: Gustavo Pedrosa gustavo.pedrosa@eldorado.org.br
Line 13: method. Line 14: Line 15: Change-Id: I4ef737c02afb97580179f381e0f227ee94e1383f Line 16: Signed-off-by: Gustavo Pedrosa gustavo.pedrosa@eldorado.org.br Line 17: Reviewed-on: http://gerrit.ovirt.org/25524
Reviewed-on should point to http://gerrit.ovirt.org/#/c/24289/
Done
Gustavo Frederico Temple Pedrosa has posted comments on this change.
Change subject: xmlrpc: [Fix] Use correct base class for parsing request ......................................................................
Patch Set 5: Verified+1
@Nir: Done.
Nir Soffer has posted comments on this change.
Change subject: xmlrpc: [Fix] Use correct base class for parsing request ......................................................................
Patch Set 5:
Can you tell on which platforms you verified, and if you verified both ssl=true and ssl=false?
Dan Kenigsberg has posted comments on this change.
Change subject: xmlrpc: Use correct base class for parsing request ......................................................................
Patch Set 5: Code-Review-1
Thanks Gustavo! This is a very important fix - but for keeping things straight, I'd rather take master branch's I4ef737c02afb97580179f381e0f227ee94e1383f
Dan Kenigsberg has posted comments on this change.
Change subject: xmlrpc: [Fix] Use correct base class for parsing request ......................................................................
Patch Set 7: Verified+1 Code-Review+2
Sorry, I did not notice that you already use the correct change-id, and that you have agreed on the text of the commit message. This has to be rushed into this branch.
copying flags.
Dan Kenigsberg has submitted this change and it was merged.
Change subject: xmlrpc: [Fix] Use correct base class for parsing request ......................................................................
xmlrpc: [Fix] Use correct base class for parsing request
Previously we always used SecureXMLRPCServer.parse_request, even when using SimpleXMLRPCServer. That happened to work since both inherit parse_request from BaseHTTPServer. This patch use the correct base class, so if one of them will override parse_request, we use the correct method.
Note: Without this fix ssl=false does not work on python 2.7
Change-Id: I4ef737c02afb97580179f381e0f227ee94e1383f Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1074063 Signed-off-by: Gustavo Pedrosa gustavo.pedrosa@eldorado.org.br Reviewed-on: http://gerrit.ovirt.org/24289 Reviewed-on: http://gerrit.ovirt.org/25524 Reviewed-by: Dan Kenigsberg danken@redhat.com Tested-by: Dan Kenigsberg danken@redhat.com --- M vdsm/BindingXMLRPC.py 1 file changed, 1 insertion(+), 2 deletions(-)
Approvals: Dan Kenigsberg: Verified; Looks good to me, approved
vdsm-patches@lists.fedorahosted.org