Fossil

Check-in [80457ec7]
Login

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

Overview
Comment:When the sync protocol receives an HTML error message, print the entire text of the message verbatim. Fix for ticket [8a7a49c47d7f200126402c10803e40dbad595c52].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:80457ec79be10b32f372c69e0093c8fea7f0471b
User & Date: drh 2009-08-01 13:42:22
References
2009-08-01
13:44 Fixed ticket [8a7a49c4]: Error reported for missing/non-readable repo during sync is not good plus 2 other changes artifact: ee2853a6 user: drh
Context
2009-08-01
14:23
Add the new remote-url command for managing the default server URL. Ticket [c24e486b05]. check-in: a2cbedcb user: drh tags: trunk
13:42
When the sync protocol receives an HTML error message, print the entire text of the message verbatim. Fix for ticket [8a7a49c47d7f200126402c10803e40dbad595c52]. check-in: 80457ec7 user: drh tags: trunk
12:59
Always store g.urlCanonical as the last-sync-url value. Fix for ticket [045f23be750d93c0bd91f179f39c5c829ed01bc6]. check-in: 47d8fc49 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/xfer.c.

1132
1133
1134
1135
1136
1137
1138






1139
1140
1141
1142
1143
1144
1145
        char *zMsg = blob_terminate(&xfer.aToken[1]);
        defossilize(zMsg);
        blob_appendf(&xfer.err, "server says: %s", zMsg);
      }else

      /* Unknown message */
      {






        blob_appendf(&xfer.err, "unknown command: %b", &xfer.aToken[0]);
      }

      if( blob_size(&xfer.err) ){
        fossil_fatal("%b", &xfer.err);
      }
      blobarray_reset(xfer.aToken, xfer.nToken);







>
>
>
>
>
>







1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
        char *zMsg = blob_terminate(&xfer.aToken[1]);
        defossilize(zMsg);
        blob_appendf(&xfer.err, "server says: %s", zMsg);
      }else

      /* Unknown message */
      {
        if( blob_str(&xfer.aToken[0])[0]=='<' ){
          fossil_fatal(
            "server replies with HTML instead of fossil sync protocol:\n%b",
            &recv
          );
        }
        blob_appendf(&xfer.err, "unknown command: %b", &xfer.aToken[0]);
      }

      if( blob_size(&xfer.err) ){
        fossil_fatal("%b", &xfer.err);
      }
      blobarray_reset(xfer.aToken, xfer.nToken);