Revision a8e01e9f

b/lib/http/__init__.py
111 111
  code = None
112 112
  message = None
113 113

  
114
  def __init__(self, message=None):
114
  def __init__(self, message=None, headers=None):
115 115
    Exception.__init__(self)
116
    if message is not None:
117
      self.message = message
116
    self.message = message
117
    self.headers = headers
118 118

  
119 119

  
120 120
class HttpBadRequest(HttpException):
b/lib/http/server.py
388 388
      }
389 389

  
390 390
    self.response_msg.start_line.code = err.code
391
    self.response_msg.headers = {
392
      http.HTTP_CONTENT_TYPE: self.error_content_type,
393
      }
391

  
392
    headers = {}
393
    if err.headers:
394
      headers.update(err.headers)
395
    headers[http.HTTP_CONTENT_TYPE] = self.error_content_type
396
    self.response_msg.headers = headers
397

  
394 398
    self.response_msg.body = self.error_message_format % values
395 399

  
396 400

  

Also available in: Unified diff