Check-in [a0cd8d35ee]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment: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".
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a0cd8d35ee90f357f297ccc88fbb4e1e9cac8533
User & Date: jan.nijtmans 2015-03-30 09:24:30.456
Context
2015-03-30
17:51
Simplify and improve the skin-editing capability. Add the new "details.txt" skin file that contains skin settings used on the server-side. Add detail values for selecting white-background, rounded nodes, color graph lines, and for omitting arrowheads on verticle graph lines. check-in: 106c0909e4 user: drh tags: trunk
14:08
Add the "skins/details.txt" file to the skins. Change the skin editors so that they can show a diff of the current configuration against any built-in. check-in: 31a337f0c2 user: drh tags: improved-skin-edit
09:24
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". check-in: a0cd8d35ee user: jan.nijtmans tags: trunk
2015-03-26
13:35
Fix http_socket.c so that it builds on Solaris. check-in: f93184125d user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/xfer.c.
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
      **
      ** Should only happen in response to a clone.  This message tells
      ** the client what product to use for the new database.
      */
      if( blob_eq(&xfer.aToken[0],"push")
       && xfer.nToken==3
       && (syncFlags & SYNC_CLONE)!=0
       && blob_is_uuid(&xfer.aToken[1])
       && blob_is_uuid(&xfer.aToken[2])
      ){
        if( blob_eq_str(&xfer.aToken[1], zSCode, -1) ){
          fossil_fatal("server loop");
        }
        if( zPCode==0 ){
          zPCode = mprintf("%b", &xfer.aToken[2]);
          db_set("project-code", zPCode, 0);
        }
        if( cloneSeqno>0 ) blob_appendf(&send, "clone 3 %d\n", cloneSeqno);
        nCardSent++;
      }else







<


<
<
<







1733
1734
1735
1736
1737
1738
1739

1740
1741



1742
1743
1744
1745
1746
1747
1748
      **
      ** Should only happen in response to a clone.  This message tells
      ** the client what product to use for the new database.
      */
      if( blob_eq(&xfer.aToken[0],"push")
       && xfer.nToken==3
       && (syncFlags & SYNC_CLONE)!=0

       && blob_is_uuid(&xfer.aToken[2])
      ){



        if( zPCode==0 ){
          zPCode = mprintf("%b", &xfer.aToken[2]);
          db_set("project-code", zPCode, 0);
        }
        if( cloneSeqno>0 ) blob_appendf(&send, "clone 3 %d\n", cloneSeqno);
        nCardSent++;
      }else