fixup commit for branch 'CAMINO_1_0_3_MINIBRANCH'XULRUNNER_1_8_0_5_RELEASEXULRUNNER_1_8_0_5_RC5XULRUNNER_1_8_0_5_RC4XULRUNNER_1_8_0_5_RC2THUNDERBIRD_1_5_0_9_RELEASETHUNDERBIRD_1_5_0_9_RC1THUNDERBIRD_1_5_0_8_RELEASETHUNDERBIRD_1_5_0_8_RC1THUNDERBIRD_1_5_0_7_RELEASETHUNDERBIRD_1_5_0_7_RC6THUNDERBIRD_1_5_0_7_RC5THUNDERBIRD_1_5_0_7_RC4THUNDERBIRD_1_5_0_7_RC3THUNDERBIRD_1_5_0_7_RC2THUNDERBIRD_1_5_0_7_RC1THUNDERBIRD_1_5_0_5_RELEASETHUNDERBIRD_1_5_0_5_RC4THUNDERBIRD_1_5_0_5_RC3THUNDERBIRD_1_5_0_5_RC2THUNDERBIRD_1_5_0_5_RC1SEAMONKEY_1_0_7_RELEASESEAMONKEY_1_0_6_RELEASESEAMONKEY_1_0_5_RELEASESEAMONKEY_1_0_4_RELEASESEAMONKEY_1_0_3_RELEASEMOZILLA_1_8_0_7_RELEASEMOZILLA_1_8_0_5_RELEASEMOZILLA_1_8_0_5_RC5MOZILLA_1_8_0_5_RC4MOZILLA_1_8_0_5_RC2FIREFOX_1_5_0_9_RELEASEFIREFOX_1_5_0_9_RC1FIREFOX_1_5_0_8_RELEASEFIREFOX_1_5_0_8_RC2FIREFOX_1_5_0_8_RC1FIREFOX_1_5_0_7_RELEASEFIREFOX_1_5_0_7_RC6FIREFOX_1_5_0_7_RC5FIREFOX_1_5_0_7_RC4FIREFOX_1_5_0_7_RC3FIREFOX_1_5_0_7_RC2FIREFOX_1_5_0_7_RC1FIREFOX_1_5_0_6_RELEASEFIREFOX_1_5_0_6_RC1FIREFOX_1_5_0_5_RELEASEFIREFOX_1_5_0_5_RC5FIREFOX_1_5_0_5_RC4FIREFOX_1_5_0_5_RC3FIREFOX_1_5_0_5_RC2FIREFOX_1_5_0_5_RC1CAMINO_1_0_3_RELEASECAMINO_1_0_3_MINIBRANCH

6 files changed, 29 insertions, 24 deletions

diff --git a/pr/tests/server_test.c b/pr/tests/server_test.c
index ffe37a5e..8bb6d99b 100644
--- a/pr/tests/server_test.c
+++ b/pr/tests/server_test.c
@@ -230,9 +230,9 @@ WorkerThreadFunc(void *_listenSock)
                                   PR_UNJOINABLE_THREAD,
                                   THREAD_STACKSIZE);
 
-                if (!WorkerThread)
+                if (!WorkerThread) {
                     if (debug_mode) printf("Error creating client thread %d\n", workerThreads);
-                else {
+                } else {
                     PR_AtomicIncrement(&workerThreads);
                     if (debug_mode) DPRINTF("\tServer creates worker (%d)\n", workerThreads);
                 }
@@ -259,11 +259,12 @@ WorkerThreadFunc(void *_listenSock)
                                bytesToWrite, 
                                0, 
                                PR_INTERVAL_NO_TIMEOUT);
-        if (bytesWritten != _server_data)
+        if (bytesWritten != _server_data) {
             if (debug_mode) printf("\tError sending data to client (%d, %d)\n", 
                 bytesWritten, PR_GetOSError());
-        else
+        } else {
             if (debug_mode) DPRINTF("\tServer sent %d bytes\n", bytesWritten);
+        }	
 
         PR_Close(newSock);
         PR_AtomicDecrement(&workerThreadsBusy);
diff --git a/pr/tests/servr_kk.c b/pr/tests/servr_kk.c
index a8fdf1df..9fbb9b00 100644
--- a/pr/tests/servr_kk.c
+++ b/pr/tests/servr_kk.c
@@ -196,9 +196,9 @@ WorkerThreadFunc(void *_listenSock)
                                   PR_UNJOINABLE_THREAD,
                                   THREAD_STACKSIZE);
 
-                if (!WorkerThread)
+                if (!WorkerThread) {
                     if (debug_mode) printf("Error creating client thread %d\n", workerThreads);
-                else {
+                } else {
                     PR_AtomicIncrement(&workerThreads);
                     if (debug_mode) DPRINTF("\tServer creates worker (%d)\n", workerThreads);
                 }
@@ -225,11 +225,12 @@ WorkerThreadFunc(void *_listenSock)
                                bytesToWrite, 
                                0, 
                                PR_INTERVAL_NO_TIMEOUT);
-        if (bytesWritten != _server_data)
+        if (bytesWritten != _server_data) {
             if (debug_mode) printf("\tError sending data to client (%d, %d)\n", 
                 bytesWritten, PR_GetOSError());
-        else
+        } else {
             if (debug_mode) DPRINTF("\tServer sent %d bytes\n", bytesWritten);
+        }
 
         PR_Close(newSock);
         PR_AtomicDecrement(&workerThreadsBusy);
diff --git a/pr/tests/servr_ku.c b/pr/tests/servr_ku.c
index fa0a168e..ab2083d0 100644
--- a/pr/tests/servr_ku.c
+++ b/pr/tests/servr_ku.c
@@ -197,9 +197,9 @@ WorkerThreadFunc(void *_listenSock)
                                   PR_UNJOINABLE_THREAD,
                                   THREAD_STACKSIZE);
 
-                if (!WorkerThread)
+                if (!WorkerThread) {
                     if (debug_mode) printf("Error creating client thread %d\n", workerThreads);
-                else {
+                } else {
                     PR_AtomicIncrement(&workerThreads);
                     if (debug_mode) DPRINTF("\tServer creates worker (%d)\n", workerThreads);
                 }
@@ -226,11 +226,12 @@ WorkerThreadFunc(void *_listenSock)
                                bytesToWrite, 
                                0, 
                                PR_INTERVAL_NO_TIMEOUT);
-        if (bytesWritten != _server_data)
+        if (bytesWritten != _server_data) {
             if (debug_mode) printf("\tError sending data to client (%d, %d)\n", 
                 bytesWritten, PR_GetOSError());
-        else
+        } else {
             if (debug_mode) DPRINTF("\tServer sent %d bytes\n", bytesWritten);
+        }
 
         PR_Close(newSock);
         PR_AtomicDecrement(&workerThreadsBusy);
diff --git a/pr/tests/servr_uk.c b/pr/tests/servr_uk.c
index 139081af..727b7b47 100644
--- a/pr/tests/servr_uk.c
+++ b/pr/tests/servr_uk.c
@@ -199,9 +199,9 @@ WorkerThreadFunc(void *_listenSock)
                                   PR_UNJOINABLE_THREAD,
                                   THREAD_STACKSIZE);
 
-                if (!WorkerThread)
+                if (!WorkerThread) {
                     if (debug_mode) printf("Error creating client thread %d\n", workerThreads);
-                else {
+                } else {
                     PR_AtomicIncrement(&workerThreads);
                     if (debug_mode) DPRINTF("\tServer creates worker (%d)\n", workerThreads);
                 }
@@ -228,11 +228,12 @@ WorkerThreadFunc(void *_listenSock)
                                bytesToWrite, 
                                0, 
                                PR_INTERVAL_NO_TIMEOUT);
-        if (bytesWritten != _server_data)
+        if (bytesWritten != _server_data) {
             if (debug_mode) printf("\tError sending data to client (%d, %d)\n", 
                 bytesWritten, PR_GetOSError());
-        else
+        } else {
             if (debug_mode) DPRINTF("\tServer sent %d bytes\n", bytesWritten);
+        }
 
         PR_Close(newSock);
         PR_AtomicDecrement(&workerThreadsBusy);
diff --git a/pr/tests/servr_uu.c b/pr/tests/servr_uu.c
index 3bd1d574..020fadf6 100644
--- a/pr/tests/servr_uu.c
+++ b/pr/tests/servr_uu.c
@@ -197,9 +197,9 @@ WorkerThreadFunc(void *_listenSock)
                                   PR_UNJOINABLE_THREAD,
                                   THREAD_STACKSIZE);
 
-                if (!WorkerThread)
+                if (!WorkerThread) {
                     if (debug_mode) printf("Error creating client thread %d\n", workerThreads);
-                else {
+                } else {
                     PR_AtomicIncrement(&workerThreads);
                     if (debug_mode) DPRINTF("\tServer creates worker (%d)\n", workerThreads);
                 }
@@ -226,11 +226,12 @@ WorkerThreadFunc(void *_listenSock)
                                bytesToWrite, 
                                0, 
                                PR_INTERVAL_NO_TIMEOUT);
-        if (bytesWritten != _server_data)
+        if (bytesWritten != _server_data) {
             if (debug_mode) printf("\tError sending data to client (%d, %d)\n", 
                 bytesWritten, PR_GetOSError());
-        else
+        } else {
             if (debug_mode) DPRINTF("\tServer sent %d bytes\n", bytesWritten);
+        } 
 
         PR_Close(newSock);
         PR_AtomicDecrement(&workerThreadsBusy);
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index d1fdb96e..5174c0b3 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -52,14 +52,14 @@
 #include <stdlib.h>
 
 /*
- * This release (4.6) is backward compatible with the
- * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, and 4.5.x releases.  It, of course,
- * is compatible with itself.
+ * This release (4.6.1) is backward compatible with the
+ * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, and 4.6 releases.
+ * It, of course, is compatible with itself.
  */
 static char *compatible_version[] = {
     "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3",
     "4.2", "4.2.1", "4.2.2", "4.3", "4.4", "4.4.1",
-    "4.5", "4.5.1", PR_VERSION
+    "4.5", "4.5.1", "4.6", PR_VERSION
 };
 
 /*