Changeset 1471

Timestamp:

07/01/08 00:04:33 (3 months ago)

Author:

thijs

Message:

Merged revisions 1466-1467 via svnmerge from
https://svn.pyamf.org/pyamf/trunk

........

r1466 | thijs | 2008-06-30 21:51:09 +0200 (ma, 30 jun 2008) | 5 lines

Fix issue #316: Referer missing in remoting client

Review by: njoyce

........

r1467 | thijs | 2008-06-30 21:54:54 +0200 (ma, 30 jun 2008) | 2 lines

Adding #316 to changelog

........

Location:

pyamf/branches/client-headers

Files:

• . (modified) (1 prop)
• CHANGES.txt (modified) (1 diff)
• pyamf/remoting/client/__init__.py (modified) (6 diffs)

pyamf/branches/client-headers/CHANGES.txt

@@ -5 +5 @@
 of PyAMF.
 
-0.3.2 (unreleased)
+0.4.0 (unreleased)
 ------------------
+ - Added ability to set the HTTP referer in remoting client (Ticket:316)
  - Fixed issue where the AMF3 encoder assumed objects with a 'tag' attribute
    needed XML encoding. Reported by cy-man (Ticket:303)

pyamf/branches/client-headers/pyamf/remoting/client/__init__.py

@@ -19 +19 @@
 #: Default user agent is C{PyAMF/x.x.x}.
 DEFAULT_USER_AGENT = 'PyAMF/%s' % '.'.join(map(lambda x: str(x), pyamf.__version__))
-
-#: Default referer is blank.
-DEFAULT_REFERER = None
 
 HTTP_OK = 200
@@ -183 +180 @@
         See L{ENCODING_TYPES<pyamf.ENCODING_TYPES>}.
     @type amf_version: C{int}
+    @ivar referer: The referer, or HTTP referer, identifies the address of the
+        client. Ignored by default.
+    @type referer: C{str}
     @ivar client_type: The client type. See L{ClientTypes<pyamf.ClientTypes>}.
     @ivar connection: The underlying connection to the remoting server.
@@ -190 +190 @@
     """
 
+
     def __init__(self, url, amf_version=pyamf.AMF0, client_type=DEFAULT_CLIENT_TYPE,
-                 user_agent=DEFAULT_USER_AGENT, referer=DEFAULT_REFERER):
+                 user_agent=DEFAULT_USER_AGENT, referer=None):
         self.logger = logging.instance_logger(self)
         self.original_url = url
         self.requests = []
         self.request_number = 1
+
 
         self.user_agent = user_agent
@@ -251 +253 @@
         self.logger.debug('User-Agent: %s' % self.user_agent)
         self.logger.debug('Referer: %s' % self.referer)
-        
+
     def addHeader(self, name, value, must_understand=False):
         """
@@ -356 +358 @@
                    'User-Agent': self.user_agent}
         
-        if self.referer != None:
+        if self.referer is not None:
             headers['Referer'] = self.referer
             
         self.logger.debug('Sending POST request to: %s' % self._root_url)
-        self.connection.request('POST', self._root_url, body.getvalue(), headers)
+        self.connection.request('POST', self._root_url, body.getvalue(),
+                                headers)
 
         envelope = self._getResponse()
@@ -375 +378 @@
         headers = {'Content-Type': remoting.CONTENT_TYPE,
                    'User-Agent': self.user_agent}
-
-        if self.referer != None:
+        
+        if self.referer is not None:
             headers['Referer'] = self.referer
-            
-        self.logger.debug('Sending POST request to: %s' % self._root_url)
-        self.connection.request('POST', self._root_url, body.getvalue(), headers)
-
+
+        self.logger.debug('Sending POST request to %s' % self._root_url)
+        self.connection.request('POST', self._root_url, body.getvalue(),
+                                headers)
+        
         envelope = self._getResponse()