From bba20018bc989a9eb2d2bb588ce710db8fefd52e Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Fri, 4 Jul 2008 22:42:57 +1200 Subject: [PATCH] Rollback: Windows port: cachemgr.cgi should use closesocket not close Squid-3 OS-specific portability code makes these obsolete. --- tools/cachemgr.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc index b969930048..04e226e58f 100644 --- a/tools/cachemgr.cc +++ b/tools/cachemgr.cc @@ -631,11 +631,12 @@ read_reply(int s, cachemgr_request * req) #ifdef _SQUID_MSWIN_ perror(tmpfile); xfree(tmpfile); - closesocket(s); #else + perror("fdopen"); - close(s); #endif + + close(s); return 1; } @@ -777,13 +778,13 @@ read_reply(int s, cachemgr_request * req) } } -#ifdef _SQUID_MSWIN_ fclose(fp); +#ifdef _SQUID_MSWIN_ + remove(tmpfile); xfree(tmpfile); - closesocket(s); -#else close(s); + #endif return 0; @@ -874,11 +875,7 @@ process_request(cachemgr_request * req) req->hostname, req->action, make_auth_header(req)); -#ifdef _SQUID_MSWIN_ - send(s, buf, l, 0); -#else write(s, buf, l); -#endif debug(1) fprintf(stderr, "wrote request: '%s'\n", buf); return read_reply(s, req); } -- 2.47.3