[CalendarServer-changes] [8869] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 8869
          http://trac.macosforge.org/projects/calendarserver/changeset/8869
Author:   sagen at apple.com
Date:     2012-03-14 13:58:14 -0700 (Wed, 14 Mar 2012)
Log Message:
-----------
Turn off KeepAlive because it's having strange interactions with mod_proxy

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/provision/root.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/provision/root.py
===================================================================
--- CalendarServer/trunk/calendarserver/provision/root.py	2012-03-14 20:49:10 UTC (rev 8868)
+++ CalendarServer/trunk/calendarserver/provision/root.py	2012-03-14 20:58:14 UTC (rev 8869)
@@ -105,7 +105,8 @@
         if not config.EnableKeepAlive:
             def addConnectionClose(request, response):
                 response.headers.setHeader("connection", ("close",))
-                request.chanRequest.channel.setReadPersistent(False)
+                if request.chanRequest is not None:
+                    request.chanRequest.channel.setReadPersistent(False)
                 return response
             self.contentFilters.append((addConnectionClose, True))
 

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2012-03-14 20:49:10 UTC (rev 8868)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2012-03-14 20:58:14 UTC (rev 8869)
@@ -894,7 +894,7 @@
         "UseExternalProxies" : False,
     },
 
-    "EnableKeepAlive": True,
+    "EnableKeepAlive": False,
 
     "EnableResponseCache":  True,
     "ResponseCacheTimeout": 30, # Minutes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120314/687499a7/attachment.html>