Differences From:

File src/xfer.c part of check-in [7a39dde24b] - Clean up and merge updates from trunk by robert on 2009-09-26 08:17:33. Also file src/xfer.c part of check-in [43481115ed] - Add a "logo" image to the local server state. Return this image on all requests to the "/logo" URL. All the administrator to setup that image. Include the image in the default header. by drh on 2009-09-21 19:10:35. [view]

To:

File src/xfer.c part of check-in [651c75c5b7] - merge trunk into creole by robert on 2009-10-05 10:08:05. Also file src/xfer.c part of check-in [469efd6a7c] - Disable the check of the "server-code" on a sync. This means that two repositories with the same "server-code" can sync with each other, which allows a repository to be copied using an ordinary file copy, and without having to run clone. by drh on 2009-10-01 14:47:54. [view]

@@ -659,11 +659,19 @@
      && (blob_eq(&xfer.aToken[0], "pull") || blob_eq(&xfer.aToken[0], "push"))
      && blob_is_uuid(&xfer.aToken[1])
      && blob_is_uuid(&xfer.aToken[2])
     ){
-      const char *zSCode;
       const char *zPCode;
 
+#if 0
+      /* This block checks to see if a server is trying to sync with itself.
+      ** This used to be disallowed, but I cannot think of any significant
+      ** harm, so I have disabled the check.
+      **
+      ** With this check disabled, it is sufficient to copy the repository
+      ** database.  No need to run clone.
+      */
+      const char *zSCode;
       zSCode = db_get("server-code", 0);
       if( zSCode==0 ){
         fossil_panic("missing server code");
       }
@@ -672,8 +680,10 @@
         @ error server\sloop
         nErr++;
         break;
       }
+#endif
+
       zPCode = db_get("project-code", 0);
       if( zPCode==0 ){
         fossil_panic("missing project code");
       }