From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 11 Dec 2006 09:31:08 +0000 (+0000)
Subject: PROT_CLOSEACTION doesn't have to be its own bit but can just as well just
X-Git-Tag: curl-7_16_1~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf99fed17a99d11a7c4e93855a97402b669afb7d;p=thirdparty%2Fcurl.git

PROT_CLOSEACTION doesn't have to be its own bit but can just as well just
include the protocol bits of such actions, which currently only means FTP
---

diff --git a/lib/urldata.h b/lib/urldata.h
index 6baf3dba7f..7f2279e96f 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -699,7 +699,6 @@ struct connectdata {
                         particular struct has */
   long protocol; /* PROT_* flags concerning the protocol set */
 #define PROT_MISSING (1<<0)
-#define PROT_CLOSEACTION (1<<1) /* needs action before socket close */
 #define PROT_HTTP    (1<<2)
 #define PROT_HTTPS   (1<<3)
 #define PROT_FTP     (1<<4)
@@ -713,6 +712,9 @@ struct connectdata {
 #define PROT_SCP     (1<<12)
 #define PROT_SFTP    (1<<13)
 
+#define PROT_CLOSEACTION PROT_FTP /* these ones need action before socket
+                                     close */
+
   /* 'dns_entry' is the particular host we use. This points to an entry in the
      DNS cache and it will not get pruned while locked. It gets unlocked in
      Curl_done(). This entry will be NULL if the connection is re-used as then