]>
Commit | Line | Data |
---|---|---|
36aa8c36 JR |
1 | Index: squid3/src/main.cc |
2 | diff -c squid3/src/main.cc:1.386 squid3/src/main.cc:1.387 | |
3 | *** squid3/src/main.cc:1.386 Sun Aug 17 07:22:30 2003 | |
4 | --- squid3/src/main.cc Sat Aug 30 19:22:05 2003 | |
5 | *************** | |
6 | *** 1093,1098 **** | |
7 | --- 1093,1105 ---- | |
8 | if (do_reconfigure) { | |
9 | mainReconfigure(); | |
10 | do_reconfigure = 0; | |
11 | + #if defined(_SQUID_MSWIN_) && defined(_DEBUG) | |
12 | + | |
13 | + } else if (do_debug) { | |
14 | + do_debug = 0; | |
15 | + __asm int 3; | |
16 | + #endif | |
17 | + | |
18 | } else if (do_rotate) { | |
19 | mainRotate(); | |
20 | do_rotate = 0; | |
21 | Index: squid3/src/comm.cc | |
22 | diff -c squid3/src/comm.cc:1.387 squid3/src/comm.cc:1.388 | |
23 | *** squid3/src/comm.cc:1.387 Fri Aug 15 07:06:34 2003 | |
24 | --- squid3/src/comm.cc Sat Aug 30 19:22:05 2003 | |
25 | *************** | |
26 | *** 1407,1412 **** | |
27 | --- 1407,1420 ---- | |
28 | return 0; | |
29 | } | |
30 | ||
31 | + #ifdef _SQUID_MSWIN_ | |
32 | + | |
33 | + /* On Windows dup2() can't work correctly on Sockets, the */ | |
34 | + /* workaround is to close the destination Socket before call them. */ | |
35 | + close(cs->fd); | |
36 | + | |
37 | + #endif | |
38 | + | |
39 | if (dup2(fd2, cs->fd) < 0) { | |
40 | debug(5, 0) ("commResetFD: dup2: %s\n", xstrerror()); | |
41 |