orca r3445 - in trunk: . src/orca test/harness

[wwalker svn gnome org]

Author: wwalker
Date: Fri Jan 11 17:05:52 2008
New Revision: 3445
URL: http://svn.gnome.org/viewvc/orca?rev=3445&view=rev

Log:
Fix for bug #508777 - HTTP-based Recording ability should not be enabled by default


Modified:
   trunk/ChangeLog
   trunk/src/orca/httpserver.py
   trunk/src/orca/settings.py
   trunk/test/harness/orca-customizations.py.in

Modified: trunk/src/orca/httpserver.py
==============================================================================
--- trunk/src/orca/httpserver.py	(original)
+++ trunk/src/orca/httpserver.py	Fri Jan 11 17:05:52 2008
@@ -92,7 +92,7 @@
                 self.send_header("Content-type", "text/html")
                 self.end_headers()
                 self.wfile.write("%s" % speech.isSpeaking())
-            elif inputBody.startswith("log:"):
+            elif settings.enableRemoteLogging and inputBody.startswith("log:"):
                 import logging
                 logFile = inputBody[4:]
                 for logger in ['braille', 'speech']:
@@ -111,7 +111,7 @@
                         log.addHandler(loggingFileHandlers[logger])
                     log.setLevel(logging.INFO)
                 self.send_response(200, 'OK')
-            elif inputBody == "recordStart":
+            elif settings.enableRemoteLogging and inputBody == "recordStart":
                 import logging
                 import StringIO
                 for logger in ['braille', 'speech']:
@@ -131,7 +131,7 @@
                     loggingStreamHandlers[logger] = [stringIO, handler]
                     log.setLevel(logging.INFO)
                 self.send_response(200, 'OK')
-            elif inputBody == "recordStop":
+            elif settings.enableRemoteLogging and inputBody == "recordStop":
                 import logging
                 import StringIO
                 result = ''

Modified: trunk/src/orca/settings.py
==============================================================================
--- trunk/src/orca/settings.py	(original)
+++ trunk/src/orca/settings.py	Fri Jan 11 17:05:52 2008
@@ -259,7 +259,11 @@
 # The number of attempts to retry setting up an HTTP server
 # connection (each time incrementing the port number by 1).
 #
-maxHttpServerRetries   = 20
+maxHttpServerRetries    = 20
+
+# Whether or not recording is enabled via the HTTP server. 
+#
+enableRemoteLogging     = False
 
 # If True, enable speech.
 #

Modified: trunk/test/harness/orca-customizations.py.in
==============================================================================
--- trunk/test/harness/orca-customizations.py.in	(original)
+++ trunk/test/harness/orca-customizations.py.in	Fri Jan 11 17:05:52 2008
@@ -7,6 +7,7 @@
 orca.debug.debugLevel = orca.debug.LEVEL_ALL
 
 import orca.settings
+orca.settings.enableRemoteLogging = True
 orca.settings.enableSpeech = True
 orca.settings.speechFactoryModules = []
 orca.settings.speechServerFactory = None