r6214 - in flumotion/branches/platform-3: . flumotion/component/misc/httpfile

[flumotion-commit at lists.fluendo.com]

Author: arek
Date: Wed Feb 13 11:24:08 2008
New Revision: 6214

Log:
	* flumotion/component/misc/httpfile/httpfile.py
	  (CancellableRequest.__init__, CancellableRequest.connectionLost):
	Backport small part of r5711: Store transport fd number so we can
	still use it after the file descriptor is no longer valid.
	Fixes #846.



Modified:
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/flumotion/component/misc/httpfile/httpfile.py

Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Wed Feb 13 11:24:08 2008
@@ -1,3 +1,11 @@
+2008-02-13  Arek Korbik  <arkadini at gmail.com>
+
+	* flumotion/component/misc/httpfile/httpfile.py
+	  (CancellableRequest.__init__, CancellableRequest.connectionLost):
+	Backport small part of r5711: Store transport fd number so we can
+	still use it after the file descriptor is no longer valid.
+	Fixes #846.
+
 2008-01-29  Arek Korbik  <arkadini at gmail.com>
 
 	* flumotion/component/producers/firewire/firewire.py

Modified: flumotion/branches/platform-3/flumotion/component/misc/httpfile/httpfile.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/component/misc/httpfile/httpfile.py	(original)
+++ flumotion/branches/platform-3/flumotion/component/misc/httpfile/httpfile.py	Wed Feb 13 11:24:08 2008
@@ -54,6 +54,8 @@
         self._start_time = time.time()
         self._lastTimeWritten = self._start_time
 
+        self._fd = self.transport.fileno()
+
         self._component.requestStarted(self)
 
     def write(self, data):
@@ -70,9 +72,8 @@
         self.requestCompleted(fd)
 
     def connectionLost(self, reason):
-        fd = self.transport.fileno()
         server.Request.connectionLost(self, reason)
-        self.requestCompleted(fd)
+        self.requestCompleted(self._fd)
 
     def requestCompleted(self, fd):
         if not self._completed: