Revision ab221ddf lib/http/server.py

b/lib/http/server.py
78 78
    self.request_method = request_msg.start_line.method
79 79
    self.request_path = request_msg.start_line.path
80 80
    self.request_headers = request_msg.headers
81
    self.request_body = request_msg.decoded_body
81
    self.request_body = request_msg.body
82 82

  
83 83
    # Response attributes
84 84
    self.resp_headers = {}
......
333 333
        logging.exception("Unknown exception")
334 334
        raise http.HttpInternalServerError(message="Unknown error")
335 335

  
336
      # TODO: Content-type
337
      encoder = http.HttpJsonConverter()
336
      if not isinstance(result, basestring):
337
        raise http.HttpError("Handler function didn't return string type")
338

  
338 339
      self.response_msg.start_line.code = http.HTTP_OK
339
      self.response_msg.body = encoder.Encode(result)
340 340
      self.response_msg.headers = handler_context.resp_headers
341
      self.response_msg.headers[http.HTTP_CONTENT_TYPE] = encoder.CONTENT_TYPE
341
      self.response_msg.body = result
342 342
    finally:
343 343
      # No reason to keep this any longer, even for exceptions
344 344
      handler_context.private = None

Also available in: Unified diff