From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 4 Jul 2008 10:42:57 +0000 (+1200)
Subject: Rollback: Windows port: cachemgr.cgi should use closesocket not close
X-Git-Tag: SQUID_3_1_0_1~49^2~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bba20018bc989a9eb2d2bb588ce710db8fefd52e;p=thirdparty%2Fsquid.git

Rollback: Windows port: cachemgr.cgi should use closesocket not close

Squid-3 OS-specific portability code makes these obsolete.
---

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);
 }