Fossil SCM

Remove some xfer login process debug output.

stephan 2025-07-23 23:31 xfer-login-card
Commit 815a84cbcc6872c802b846d59546f9af28a6e2343ef53d107973a10d6de3c81c
Parent 439af9348b5c1d0…
3 files changed +1 -4 -1 +3 -4
~ src/cgi.c ~ src/http.c ~ src/xfer.c
M src/cgi.c
+1 -4
--- src/cgi.c
+++ src/cgi.c
@@ -1319,13 +1319,11 @@
13191319
 ** to them, we'll accept that via this query argument. */
13201320
 rc |= 0x04;
13211321
 fossil_free( g.syncInfo.zLoginCard );
13221322
 g.syncInfo.zLoginCard = fossil_strdup(z);
13231323
 g.syncInfo.bLoginCardHeader = 3;
1324
- /*cgi_delete_parameter("x-f-x-l");*/
1325
- /*fprintf(stderr, "query string setup: x-f-x-l=%s\n",
1326
- g.syncInfo.zLoginCard);*/
1324
+ cgi_delete_parameter("x-f-x-l");
13271325
 }
13281326
 }
13291327
 return rc;
13301328
 }
13311329
@@ -2240,11 +2238,10 @@
22402238
 if( sscanf(zVal,"bytes=%d-%d",&x1,&x2)==2 && x1>=0 && x1<=x2 ){
22412239
 rangeStart = x1;
22422240
 rangeEnd = x2+1;
22432241
 }
22442242
 }else if( fossil_strcmp(zFieldName, "x-fossil-xfer-login:")==0 ){
2245
- /*cgi_setenv("FOSSIL_LCH_cgi_handle_http_request", zVal);*/
22462243
 fossil_free( g.syncInfo.zLoginCard );
22472244
 g.syncInfo.zLoginCard = fossil_strdup(zVal);
22482245
 g.syncInfo.bLoginCardHeader = 1;
22492246
 }
22502247
 }
22512248
--- src/cgi.c
+++ src/cgi.c
@@ -1319,13 +1319,11 @@
1319 ** to them, we'll accept that via this query argument. */
1320 rc |= 0x04;
1321 fossil_free( g.syncInfo.zLoginCard );
1322 g.syncInfo.zLoginCard = fossil_strdup(z);
1323 g.syncInfo.bLoginCardHeader = 3;
1324 /*cgi_delete_parameter("x-f-x-l");*/
1325 /*fprintf(stderr, "query string setup: x-f-x-l=%s\n",
1326 g.syncInfo.zLoginCard);*/
1327 }
1328 }
1329 return rc;
1330 }
1331
@@ -2240,11 +2238,10 @@
2240 if( sscanf(zVal,"bytes=%d-%d",&x1,&x2)==2 && x1>=0 && x1<=x2 ){
2241 rangeStart = x1;
2242 rangeEnd = x2+1;
2243 }
2244 }else if( fossil_strcmp(zFieldName, "x-fossil-xfer-login:")==0 ){
2245 /*cgi_setenv("FOSSIL_LCH_cgi_handle_http_request", zVal);*/
2246 fossil_free( g.syncInfo.zLoginCard );
2247 g.syncInfo.zLoginCard = fossil_strdup(zVal);
2248 g.syncInfo.bLoginCardHeader = 1;
2249 }
2250 }
2251
--- src/cgi.c
+++ src/cgi.c
@@ -1319,13 +1319,11 @@
1319 ** to them, we'll accept that via this query argument. */
1320 rc |= 0x04;
1321 fossil_free( g.syncInfo.zLoginCard );
1322 g.syncInfo.zLoginCard = fossil_strdup(z);
1323 g.syncInfo.bLoginCardHeader = 3;
1324 cgi_delete_parameter("x-f-x-l");
 
 
1325 }
1326 }
1327 return rc;
1328 }
1329
@@ -2240,11 +2238,10 @@
2238 if( sscanf(zVal,"bytes=%d-%d",&x1,&x2)==2 && x1>=0 && x1<=x2 ){
2239 rangeStart = x1;
2240 rangeEnd = x2+1;
2241 }
2242 }else if( fossil_strcmp(zFieldName, "x-fossil-xfer-login:")==0 ){
 
2243 fossil_free( g.syncInfo.zLoginCard );
2244 g.syncInfo.zLoginCard = fossil_strdup(zVal);
2245 g.syncInfo.bLoginCardHeader = 1;
2246 }
2247 }
2248
M src/http.c
-1
--- src/http.c
+++ src/http.c
@@ -561,11 +561,10 @@
561561
 /*
562562
 ** Send the request to the server.
563563
 */
564564
 if( mHttpFlags & HTTP_VERBOSE ){
565565
 fossil_print("URL: %s\n", g.url.canonical);
566
- fossil_print("URL path: %s\n", g.url.path);
567566
 fossil_print("Sending %d byte header and %d byte payload\n",
568567
 blob_size(&hdr), blob_size(&payload));
569568
 }
570569
 transport_send(&g.url, &hdr);
571570
 transport_send(&g.url, &payload);
572571
--- src/http.c
+++ src/http.c
@@ -561,11 +561,10 @@
561 /*
562 ** Send the request to the server.
563 */
564 if( mHttpFlags & HTTP_VERBOSE ){
565 fossil_print("URL: %s\n", g.url.canonical);
566 fossil_print("URL path: %s\n", g.url.path);
567 fossil_print("Sending %d byte header and %d byte payload\n",
568 blob_size(&hdr), blob_size(&payload));
569 }
570 transport_send(&g.url, &hdr);
571 transport_send(&g.url, &payload);
572
--- src/http.c
+++ src/http.c
@@ -561,11 +561,10 @@
561 /*
562 ** Send the request to the server.
563 */
564 if( mHttpFlags & HTTP_VERBOSE ){
565 fossil_print("URL: %s\n", g.url.canonical);
 
566 fossil_print("Sending %d byte header and %d byte payload\n",
567 blob_size(&hdr), blob_size(&payload));
568 }
569 transport_send(&g.url, &hdr);
570 transport_send(&g.url, &payload);
571
M src/xfer.c
+3 -4
--- src/xfer.c
+++ src/xfer.c
@@ -881,11 +881,11 @@
881881
 g.userUid = db_column_int(&q, 2);
882882
 g.zLogin = mprintf("%b", pLogin);
883883
 g.zNonce = mprintf("%b", pNonce);
884884
 }
885885
 }
886
- @ message login\src=%d(rc)\sas\s%F(g.zLogin)
886
+ /* @ message login\src=%d(rc)\sas\s%F(g.zLogin) */
887887
 db_finalize(&q);
888888
 return rc;
889889
 }
890890
891891
 /*
@@ -1577,13 +1577,12 @@
15771577
 */
15781578
 if( blob_eq(&xfer.aToken[0], "login")
15791579
 && xfer.nToken==4
15801580
 ){
15811581
 handle_login_card:
1582
- //fprintf(stderr, "%s:%d trying to log in: %s\n", __FILE__, __LINE__, blob_str(&xfer.line));
1583
- if( 1 || g.perm.Debug ){
1584
- @message inbound\slogin\scard:\s%F(blob_str(&xfer.line))
1582
+ if( 0 && g.perm.Debug ){
1583
+ @message login\scard:\s%F(blob_str(&xfer.line))
15851584
 }
15861585
 nLogin++;
15871586
 if( disableLogin ){
15881587
 g.perm.Read = g.perm.Write = g.perm.Private = g.perm.Admin = 1;
15891588
 }else if( nLogin > 1 ){
15901589
--- src/xfer.c
+++ src/xfer.c
@@ -881,11 +881,11 @@
881 g.userUid = db_column_int(&q, 2);
882 g.zLogin = mprintf("%b", pLogin);
883 g.zNonce = mprintf("%b", pNonce);
884 }
885 }
886 @ message login\src=%d(rc)\sas\s%F(g.zLogin)
887 db_finalize(&q);
888 return rc;
889 }
890
891 /*
@@ -1577,13 +1577,12 @@
1577 */
1578 if( blob_eq(&xfer.aToken[0], "login")
1579 && xfer.nToken==4
1580 ){
1581 handle_login_card:
1582 //fprintf(stderr, "%s:%d trying to log in: %s\n", __FILE__, __LINE__, blob_str(&xfer.line));
1583 if( 1 || g.perm.Debug ){
1584 @message inbound\slogin\scard:\s%F(blob_str(&xfer.line))
1585 }
1586 nLogin++;
1587 if( disableLogin ){
1588 g.perm.Read = g.perm.Write = g.perm.Private = g.perm.Admin = 1;
1589 }else if( nLogin > 1 ){
1590
--- src/xfer.c
+++ src/xfer.c
@@ -881,11 +881,11 @@
881 g.userUid = db_column_int(&q, 2);
882 g.zLogin = mprintf("%b", pLogin);
883 g.zNonce = mprintf("%b", pNonce);
884 }
885 }
886 /* @ message login\src=%d(rc)\sas\s%F(g.zLogin) */
887 db_finalize(&q);
888 return rc;
889 }
890
891 /*
@@ -1577,13 +1577,12 @@
1577 */
1578 if( blob_eq(&xfer.aToken[0], "login")
1579 && xfer.nToken==4
1580 ){
1581 handle_login_card:
1582 if( 0 && g.perm.Debug ){
1583 @message login\scard:\s%F(blob_str(&xfer.line))
 
1584 }
1585 nLogin++;
1586 if( disableLogin ){
1587 g.perm.Read = g.perm.Write = g.perm.Private = g.perm.Admin = 1;
1588 }else if( nLogin > 1 ){
1589

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button