Index: /trunk/src/VBox/Main/webservice/vboxweb.cpp
===================================================================
--- /trunk/src/VBox/Main/webservice/vboxweb.cpp	(revision 31230)
+++ /trunk/src/VBox/Main/webservice/vboxweb.cpp	(revision 31231)
@@ -182,39 +182,43 @@
             case 'h':
                 pcszDescr = "Print this help message and exit.";
-            break;
+                break;
 
 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
             case 'b':
                 pcszDescr = "Run in background (daemon mode).";
-            break;
+                break;
 #endif
 
             case 'H':
                 pcszDescr = "The host to bind to (localhost).";
-            break;
+                break;
 
             case 'p':
                 pcszDescr = "The port to bind to (18083).";
-            break;
+                break;
 
             case 't':
                 pcszDescr = "Session timeout in seconds; 0 = disable timeouts (" DEFAULT_TIMEOUT_SECS_STRING ").";
-            break;
+                break;
 
             case 'T':
                 pcszDescr = "Maximum number of worker threads to run in parallel (100).";
-            break;
+                break;
+                
+            case 'k':
+                pcszDescr = "Maximum number of requests before a socket will be closed (100).";
+                break;
 
             case 'i':
                 pcszDescr = "Frequency of timeout checks in seconds (5).";
-            break;
+                break;
 
             case 'v':
                 pcszDescr = "Be verbose.";
-            break;
+                break;
 
             case 'F':
                 pcszDescr = "Name of file to write log to (no file).";
-            break;
+                break;
         }
 
@@ -637,17 +641,17 @@
             case 'H':
                 g_pcszBindToHost = ValueUnion.psz;
-            break;
+                break;
 
             case 'p':
                 g_uBindToPort = ValueUnion.u32;
-            break;
+                break;
 
             case 't':
                 g_iWatchdogTimeoutSecs = ValueUnion.u32;
-            break;
+                break;
 
             case 'i':
                 g_iWatchdogCheckInterval = ValueUnion.u32;
-            break;
+                break;
 
             case 'F':
@@ -662,35 +666,35 @@
                 WebLog("Sun VirtualBox Webservice Version %s\n"
                        "Opened log file \"%s\"\n", VBOX_VERSION_STRING, ValueUnion.psz);
+                break;
             }
-            break;
 
             case 'T':
                 g_cMaxWorkerThreads = ValueUnion.u32;
-            break;
+                break;
 
             case 'k':
                 g_cMaxKeepAlive = ValueUnion.u32;
-            break;
+                break;
 
             case 'h':
                 DisplayHelp();
-            return 0;
+                return 0;
 
             case 'v':
                 g_fVerbose = true;
-            break;
+                break;
 
 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
             case 'b':
                 g_fDaemonize = true;
-            break;
+                break;
 #endif
             case 'V':
                 RTPrintf("%sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr());
-            return 0;
+                return 0;
 
             default:
                 rc = RTGetOptPrintError(c, &ValueUnion);
-            return rc;
+                return rc;
         }
     }
@@ -1535,5 +1539,6 @@
     WEBDEBUG(("-- entering %s\n", __FUNCTION__));
 
-    do {
+    do
+    {
         // findRefFromId require the lock
         util::AutoWriteLock lock(g_pSessionsLockHandle COMMA_LOCKVAL_SRC_POS);
@@ -1569,5 +1574,6 @@
     WEBDEBUG(("-- entering %s\n", __FUNCTION__));
 
-    do {
+    do
+    {
         // findRefFromId and the delete call below require the lock
         util::AutoWriteLock lock(g_pSessionsLockHandle COMMA_LOCKVAL_SRC_POS);
@@ -1581,9 +1587,9 @@
 
         WEBDEBUG(("   found reference; deleting!\n"));
+        // this removes the object from all stacks; since
+        // there's a ComPtr<> hidden inside the reference,
+        // this should also invoke Release() on the COM
+        // object
         delete pRef;
-            // this removes the object from all stacks; since
-            // there's a ComPtr<> hidden inside the reference,
-            // this should also invoke Release() on the COM
-            // object
     } while (0);
 
@@ -1639,5 +1645,6 @@
     WEBDEBUG(("-- entering %s\n", __FUNCTION__));
 
-    do {
+    do 
+    {
         // WebServiceSession constructor tinkers with global MOR map and requires a write lock
         util::AutoWriteLock lock(g_pSessionsLockHandle COMMA_LOCKVAL_SRC_POS);
@@ -1684,5 +1691,6 @@
     WEBDEBUG(("-- entering %s\n", __FUNCTION__));
 
-    do {
+    do
+    {
         // findSessionFromRef needs lock
         util::AutoWriteLock lock(g_pSessionsLockHandle COMMA_LOCKVAL_SRC_POS);
@@ -1716,5 +1724,6 @@
     WEBDEBUG(("-- entering %s\n", __FUNCTION__));
 
-    do {
+    do
+    {
         // findSessionFromRef and the session destructor require the lock
         util::AutoWriteLock lock(g_pSessionsLockHandle COMMA_LOCKVAL_SRC_POS);
Index: /trunk/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp
===================================================================
--- /trunk/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp	(revision 31230)
+++ /trunk/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp	(revision 31231)
@@ -43,5 +43,5 @@
     RTTestISub("Basics");
     char *psz;
-    int rc;
+    int rc = VINF_SUCCESS;
 
     /* RTStrAlloc */