Revision a8e01e9f lib/http/server.py

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