Changeset 545 for trunk/daemon/orbited/transports/htmlfile.py

Show
Ignore:
Timestamp:
09/20/08 15:44:51 (4 months ago)
Author:
rgl
Message:

Merge the 0.7 branch into trunk.

For now on, trunk will contain the bleeding-edge version of Orbited.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/daemon/orbited/transports/htmlfile.py

    r522 r545  
    1414            <html> 
    1515             <head> 
    16               <script src="../../static/HTMLFileFrame.js"></script> 
     16              <script src="../static/HTMLFileFrame.js"></script> 
    1717             </head> 
    1818             <body> 
     
    2929        self.request.setHeader('pragma', 'no-cache') 
    3030        self.request.setHeader('expires', '-1') 
     31        logger.debug('send initialData: ', self.initialData) 
    3132        self.request.write(self.initialData) 
    3233 
     
    3839        #      after they are executed. 
    3940        payload = '<script>e(%s)</script>' % (json.encode(packets),) 
     41        logger.debug('write ', payload) 
    4042        self.request.write(payload); 
    4143        self.totalBytes += len(payload)