IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Return the correct Content-type on negotiated XML-RPC requests.

Browse Source 
https://fedorahosted.org/freeipa/ticket/3745
This commit is contained in:
Rob Crittenden
2013-07-11 16:46:34 -04:00
committed by Martin Kosek
parent 57fd275d7a
commit 689399fce9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ipaserver/rpcserver.py
View File

@@ -699,6 +699,7 @@ class xmlserver(WSGIExecutioner, HTTP_Status, KerberosSession):
self.debug('WSGI xmlserver.__call__:') self.debug('WSGI xmlserver.__call__:')
user_ccache=environ.get('KRB5CCNAME') user_ccache=environ.get('KRB5CCNAME')
headers = [('Content-Type', 'text/xml; charset=utf-8')]
if user_ccache is None: if user_ccache is None:
self.internal_error(environ, start_response, self.internal_error(environ, start_response,
'xmlserver.__call__: KRB5CCNAME not defined in HTTP request environment') 'xmlserver.__call__: KRB5CCNAME not defined in HTTP request environment')
@@ -708,11 +709,10 @@ class xmlserver(WSGIExecutioner, HTTP_Status, KerberosSession):
response = super(xmlserver, self).__call__(environ, start_response) response = super(xmlserver, self).__call__(environ, start_response)
if getattr(context, 'session_data', None) is None and \ if getattr(context, 'session_data', None) is None and \
self.env.context != 'lite': self.env.context != 'lite':
self.finalize_kerberos_acquisition('xmlserver', user_ccache, environ, start_response) self.finalize_kerberos_acquisition('xmlserver', user_ccache, environ, start_response, headers)
except PublicError, e: except PublicError, e:
status = HTTP_STATUS_SUCCESS status = HTTP_STATUS_SUCCESS
response = status response = status
headers = [('Content-Type', 'text/plain; charset=utf-8')]
start_response(status, headers) start_response(status, headers)
return self.marshal(None, e) return self.marshal(None, e)
finally: finally: