*** django/http/__init__.py	Sun Nov 18 13:44:28 2007
--- django/http/__init__.py	Sun Dec  9 22:10:26 2007
***************
*** 44,51 ****
          return key in self.GET or key in self.POST
  
      __contains__ = has_key
! 
!     def get_host(self):
          "Returns the HTTP host using the environment or request headers."
          # We try three options, in order of decreasing preference.
          if 'HTTP_X_FORWARDED_HOST' in self.META:
--- 44,51 ----
          return key in self.GET or key in self.POST
  
      __contains__ = has_key
!     
!     def _get_host(self):
          "Returns the HTTP host using the environment or request headers."
          # We try three options, in order of decreasing preference.
          if 'HTTP_X_FORWARDED_HOST' in self.META:
***************
*** 59,65 ****
              if server_port != (self.is_secure() and 443 or 80):
                  host = '%s:%s' % (host, server_port)
          return host
! 
      def get_full_path(self):
          return ''
  
--- 59,71 ----
              if server_port != (self.is_secure() and 443 or 80):
                  host = '%s:%s' % (host, server_port)
          return host
!     
!     host = property(_get_host)
!     
!     def get_host(self):
! 	"DEPRECIATED. Use host property instead"
! 	return self.host
!     
      def get_full_path(self):
          return ''