Fossil SCM
Fix the login mechanism on the new IPv6 code for "fossil server" on Windows. Patch from Olivier Mascia.
Commit
723dedac57d107170316f72a4732e597e7c889feaaad7973d09c44898045b6e5
Parent
21d5038fd097cc5…
1 file changed
+2
+2
| --- src/winhttp.c | ||
| +++ src/winhttp.c | ||
| @@ -190,10 +190,11 @@ | ||
| 190 | 190 | /* |
| 191 | 191 | ** The repository name is only needed if there was no open checkout. This |
| 192 | 192 | ** is designed to allow the open checkout for the interactive user to work |
| 193 | 193 | ** with the local Fossil server started via the "ui" command. |
| 194 | 194 | */ |
| 195 | + p->addr.sin6_port = 0; | |
| 195 | 196 | if( WSAAddressToStringA((SOCKADDR*)&p->addr, sizeof(p->addr), |
| 196 | 197 | NULL, zIp, &nIp)!=0 ){ |
| 197 | 198 | zIp[0] = 0; |
| 198 | 199 | } |
| 199 | 200 | if( (p->flags & HTTP_SERVER_HAD_CHECKOUT)==0 ){ |
| @@ -277,10 +278,11 @@ | ||
| 277 | 278 | if( got<=0 ) break; |
| 278 | 279 | fwrite(zHdr, 1, got, out); |
| 279 | 280 | wanted += got; |
| 280 | 281 | } |
| 281 | 282 | assert( g.zRepositoryName && g.zRepositoryName[0] ); |
| 283 | + p->addr.sin6_port = 0; | |
| 282 | 284 | if (WSAAddressToStringA((SOCKADDR*)&p->addr, sizeof(p->addr), |
| 283 | 285 | NULL, zIp, &nIp)!=0){ |
| 284 | 286 | zIp[0] = 0; |
| 285 | 287 | } |
| 286 | 288 | sqlite3_snprintf(sizeof(zCmd), zCmd, |
| 287 | 289 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -190,10 +190,11 @@ | |
| 190 | /* |
| 191 | ** The repository name is only needed if there was no open checkout. This |
| 192 | ** is designed to allow the open checkout for the interactive user to work |
| 193 | ** with the local Fossil server started via the "ui" command. |
| 194 | */ |
| 195 | if( WSAAddressToStringA((SOCKADDR*)&p->addr, sizeof(p->addr), |
| 196 | NULL, zIp, &nIp)!=0 ){ |
| 197 | zIp[0] = 0; |
| 198 | } |
| 199 | if( (p->flags & HTTP_SERVER_HAD_CHECKOUT)==0 ){ |
| @@ -277,10 +278,11 @@ | |
| 277 | if( got<=0 ) break; |
| 278 | fwrite(zHdr, 1, got, out); |
| 279 | wanted += got; |
| 280 | } |
| 281 | assert( g.zRepositoryName && g.zRepositoryName[0] ); |
| 282 | if (WSAAddressToStringA((SOCKADDR*)&p->addr, sizeof(p->addr), |
| 283 | NULL, zIp, &nIp)!=0){ |
| 284 | zIp[0] = 0; |
| 285 | } |
| 286 | sqlite3_snprintf(sizeof(zCmd), zCmd, |
| 287 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -190,10 +190,11 @@ | |
| 190 | /* |
| 191 | ** The repository name is only needed if there was no open checkout. This |
| 192 | ** is designed to allow the open checkout for the interactive user to work |
| 193 | ** with the local Fossil server started via the "ui" command. |
| 194 | */ |
| 195 | p->addr.sin6_port = 0; |
| 196 | if( WSAAddressToStringA((SOCKADDR*)&p->addr, sizeof(p->addr), |
| 197 | NULL, zIp, &nIp)!=0 ){ |
| 198 | zIp[0] = 0; |
| 199 | } |
| 200 | if( (p->flags & HTTP_SERVER_HAD_CHECKOUT)==0 ){ |
| @@ -277,10 +278,11 @@ | |
| 278 | if( got<=0 ) break; |
| 279 | fwrite(zHdr, 1, got, out); |
| 280 | wanted += got; |
| 281 | } |
| 282 | assert( g.zRepositoryName && g.zRepositoryName[0] ); |
| 283 | p->addr.sin6_port = 0; |
| 284 | if (WSAAddressToStringA((SOCKADDR*)&p->addr, sizeof(p->addr), |
| 285 | NULL, zIp, &nIp)!=0){ |
| 286 | zIp[0] = 0; |
| 287 | } |
| 288 | sqlite3_snprintf(sizeof(zCmd), zCmd, |
| 289 |