Fossil SCM
When the sync protocol receives an HTML error message, print the entire text of the message verbatim. Fix for ticket [8a7a49c47d7f200126402c10803e40dbad595c52].
Commit
80457ec79be10b32f372c69e0093c8fea7f0471b
Parent
47d8fc4944c2f2b…
1 file changed
+6
+6
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -1134,10 +1134,16 @@ | ||
| 1134 | 1134 | blob_appendf(&xfer.err, "server says: %s", zMsg); |
| 1135 | 1135 | }else |
| 1136 | 1136 | |
| 1137 | 1137 | /* Unknown message */ |
| 1138 | 1138 | { |
| 1139 | + if( blob_str(&xfer.aToken[0])[0]=='<' ){ | |
| 1140 | + fossil_fatal( | |
| 1141 | + "server replies with HTML instead of fossil sync protocol:\n%b", | |
| 1142 | + &recv | |
| 1143 | + ); | |
| 1144 | + } | |
| 1139 | 1145 | blob_appendf(&xfer.err, "unknown command: %b", &xfer.aToken[0]); |
| 1140 | 1146 | } |
| 1141 | 1147 | |
| 1142 | 1148 | if( blob_size(&xfer.err) ){ |
| 1143 | 1149 | fossil_fatal("%b", &xfer.err); |
| 1144 | 1150 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1134,10 +1134,16 @@ | |
| 1134 | blob_appendf(&xfer.err, "server says: %s", zMsg); |
| 1135 | }else |
| 1136 | |
| 1137 | /* Unknown message */ |
| 1138 | { |
| 1139 | blob_appendf(&xfer.err, "unknown command: %b", &xfer.aToken[0]); |
| 1140 | } |
| 1141 | |
| 1142 | if( blob_size(&xfer.err) ){ |
| 1143 | fossil_fatal("%b", &xfer.err); |
| 1144 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1134,10 +1134,16 @@ | |
| 1134 | blob_appendf(&xfer.err, "server says: %s", zMsg); |
| 1135 | }else |
| 1136 | |
| 1137 | /* Unknown message */ |
| 1138 | { |
| 1139 | if( blob_str(&xfer.aToken[0])[0]=='<' ){ |
| 1140 | fossil_fatal( |
| 1141 | "server replies with HTML instead of fossil sync protocol:\n%b", |
| 1142 | &recv |
| 1143 | ); |
| 1144 | } |
| 1145 | blob_appendf(&xfer.err, "unknown command: %b", &xfer.aToken[0]); |
| 1146 | } |
| 1147 | |
| 1148 | if( blob_size(&xfer.err) ){ |
| 1149 | fossil_fatal("%b", &xfer.err); |
| 1150 |