Fossil SCM
Remove another check for "server loop", apart from [469efd6a7ce8ba44]: If the server-code is going to be removed ever in the future, this useless check will stand in the way. Then [14b8475598268f3a] could re-appear, but now with "server-code" in stead of with "project-code".
Commit
a0cd8d35ee90f357f297ccc88fbb4e1e9cac8533
Parent
f93184125d0c38e…
1 file changed
-4
-4
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -1735,16 +1735,12 @@ | ||
| 1735 | 1735 | ** the client what product to use for the new database. |
| 1736 | 1736 | */ |
| 1737 | 1737 | if( blob_eq(&xfer.aToken[0],"push") |
| 1738 | 1738 | && xfer.nToken==3 |
| 1739 | 1739 | && (syncFlags & SYNC_CLONE)!=0 |
| 1740 | - && blob_is_uuid(&xfer.aToken[1]) | |
| 1741 | 1740 | && blob_is_uuid(&xfer.aToken[2]) |
| 1742 | 1741 | ){ |
| 1743 | - if( blob_eq_str(&xfer.aToken[1], zSCode, -1) ){ | |
| 1744 | - fossil_fatal("server loop"); | |
| 1745 | - } | |
| 1746 | 1742 | if( zPCode==0 ){ |
| 1747 | 1743 | zPCode = mprintf("%b", &xfer.aToken[2]); |
| 1748 | 1744 | db_set("project-code", zPCode, 0); |
| 1749 | 1745 | } |
| 1750 | 1746 | if( cloneSeqno>0 ) blob_appendf(&send, "clone 3 %d\n", cloneSeqno); |
| 1751 | 1747 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1735,16 +1735,12 @@ | |
| 1735 | ** the client what product to use for the new database. |
| 1736 | */ |
| 1737 | if( blob_eq(&xfer.aToken[0],"push") |
| 1738 | && xfer.nToken==3 |
| 1739 | && (syncFlags & SYNC_CLONE)!=0 |
| 1740 | && blob_is_uuid(&xfer.aToken[1]) |
| 1741 | && blob_is_uuid(&xfer.aToken[2]) |
| 1742 | ){ |
| 1743 | if( blob_eq_str(&xfer.aToken[1], zSCode, -1) ){ |
| 1744 | fossil_fatal("server loop"); |
| 1745 | } |
| 1746 | if( zPCode==0 ){ |
| 1747 | zPCode = mprintf("%b", &xfer.aToken[2]); |
| 1748 | db_set("project-code", zPCode, 0); |
| 1749 | } |
| 1750 | if( cloneSeqno>0 ) blob_appendf(&send, "clone 3 %d\n", cloneSeqno); |
| 1751 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1735,16 +1735,12 @@ | |
| 1735 | ** the client what product to use for the new database. |
| 1736 | */ |
| 1737 | if( blob_eq(&xfer.aToken[0],"push") |
| 1738 | && xfer.nToken==3 |
| 1739 | && (syncFlags & SYNC_CLONE)!=0 |
| 1740 | && blob_is_uuid(&xfer.aToken[2]) |
| 1741 | ){ |
| 1742 | if( zPCode==0 ){ |
| 1743 | zPCode = mprintf("%b", &xfer.aToken[2]); |
| 1744 | db_set("project-code", zPCode, 0); |
| 1745 | } |
| 1746 | if( cloneSeqno>0 ) blob_appendf(&send, "clone 3 %d\n", cloneSeqno); |
| 1747 |