7.6.1 commit

unconditioanlly!

CHANGES

@@ -6,6 +6,31 @@
 
                                History of Changes
 
+Version 7.6.1
+
+Daniel (9 February 2001)
+- Frank Reid and Cain Hopwood provided information and research around a HTTPS
+  PUT/upload problem we seem to have. No solution found yet.
+
+Daniel (8 February 2001)
+- An interesting discussion is how to specify an empty password without having
+  curl ask for it interactively? The current implmentation takes an empty
+  password as a request for a password prompt. However, I still want to
+  support a blank user field. Thus, today if you enter "-u :" (without user
+  and password) curl will prompt for the password. Tricky. How would you
+  specify you want the prompt otherwise?
+
+- Made the netrc parse result possible to use for other protocols than FTP and
+  HTTP (such as the upcoming TELNET fixes).
+
+- The previously mentioned "MSVC++ problems" turned out to be a non-issue.
+
+- Added a HTTP file upload code example in the docs/examples/ section on
+  request.
+
+- Adjusted the FTP response fix slightly.
+
+Version 7.6.1-pre3
 
 Daniel (7 February 2001)
 - SM found a flaw in the response reading function for FTP that could make

docs/FAQ

@@ -1,4 +1,4 @@
-Updated: February 2, 2001 (http://curl.haxx.se/docs/faq.shtml)
+Updated: February 12, 2001 (http://curl.haxx.se/docs/faq.shtml)
                                   _   _ ____  _     
                               ___| | | |  _ \| |    
                              / __| | | | |_) | |    
@@ -31,6 +31,7 @@ FAQ
   3.7 Can I use curl to delete/rename a file through FTP?
   3.8 How do I tell curl to follow HTTP redirects?
   3.9 How do I use curl in PHP?
+  3.10 What about SOAP, WEBDAV, XML-RPC or similar protocols over HTTP?
 
  4. Running Problems
   4.1 Problems connecting to SSL servers.
@@ -106,8 +107,8 @@ FAQ
   or with PHP.
 
   Curl is not a single-OS program. Curl exists, compiles, builds and runs
-  under a wide range of operating systems, including all modern Unixes,
-  Windows, Amiga, BeOS, OS/2, OS X, QNX etc.
+  under a wide range of operating systems, including all modern Unixes (and a
+  bunch of older ones too), Windows, Amiga, BeOS, OS/2, OS X, QNX etc.
 
   1.4 When will you make curl do XXXX ?
 
@@ -230,7 +231,7 @@ FAQ
 
   You can't simply use -F or -d at your choice. The web server that will
   receive your post assumes one of the formats. If the form you're trying to
-  "fake" sets the type to 'multipart/form-data', than and only then you must
+  "fake" sets the type to 'multipart/form-data', then and only then you must
   use the -F type. In all the most common cases, you should use -d which then
   causes a posting with the type 'application/x-www-form-urlencoded'.
 
@@ -294,6 +295,16 @@ FAQ
   invoke the curl tool using a command line. This is the way to use curl if
   you're using PHP3 or PHP4 built without curl module support.
 
+  3.10 What about SOAP, WEBDAV, XML-RPC or similar protocols over HTTP?
+
+  Curl adheres to the HTTP spec, which basically means you can play with *any*
+  protocol that is built ontop of HTTP. Protocols such as SOAP, WEBDAV and
+  XML-RPC are all such ones. You can use -X to set custom requests and -H to
+  set custom headers (or replace internally generated ones).
+
+  Using libcurl or PHP's curl modules is just as fine and you'd just use the
+  proper library options to do the same.
+
 4. Running Problems
 
   4.1. Problems connecting to SSL servers.
@@ -426,7 +437,8 @@ FAQ
   4.9. Curl can't authenticate to the server that requires NTLM?
 
   NTLM is a Microsoft proprietary protocol. Unfortunately, curl does not
-  currently support that.
+  currently support that. Proprietary formats are evil. You should not use
+  such ones.
 
 5. libcurl Issues
 
@@ -512,7 +524,7 @@ FAQ
 
 6. License Issues
 
-  NOTE: This section is now updated to concern curl 7.5.2 or later!
+  NOTE: This section concerns curl 7.5.2 or later!
 
   Curl and libcurl are released under a MIT/X derivate license *or* the MPL,
   the Mozilla Public License. To get a really good answer to your license
@@ -530,27 +542,25 @@ FAQ
 
   6.2. I have a closed-source program, can I use the libcurl library?
 
-  Yes.
+  Yes!
 
-  libcurl does not put any restrictions on the program that uses the
-  library.
+  libcurl does not put any restrictions on the program that uses the library.
 
   6.3. I have a BSD licensed program, can I use the libcurl library?
 
-  Yes.
+  Yes!
 
-  libcurl does not put any restrictions on the program that uses the
-  library.
+  libcurl does not put any restrictions on the program that uses the library.
 
   6.4. I have a program that uses LGPL libraries, can I use libcurl?
 
-  Yes.
+  Yes!
 
-  The LGPL license don't clash with other licenses.
+  The LGPL license doesn't clash with other licenses.
 
   6.5. Can I modify curl/libcurl for my program and keep the changes secret?
 
-  Yes.
+  Yes!
 
   The MIT/X derivate license practically allows you to do almost anything with
   the sources, on the condition that the copyright texts in the sources are
@@ -558,9 +568,11 @@ FAQ
 
   6.6. Can you please change the curl/libcurl license to XXXX?
 
-  No. We carefully picked this license years ago and a large amount of people
-  have contributed with source code knowing that this is the license we
-  use. This license puts the restrictions we want on curl/libcurl and it does
-  not spread to other programs or libraries that use it. The recent dual
-  license modification should make it possible for everyone to use libcurl or
-  curl in their projects, no matter what license they already have in use.
+  No.
+
+  We carefully picked this license years ago and a large amount of people have
+  contributed with source code knowing that this is the license we use. This
+  license puts the restrictions we want on curl/libcurl and it does not spread
+  to other programs or libraries that use it. The recent dual license
+  modification should make it possible for everyone to use libcurl or curl in
+  their projects, no matter what license they already have in use.

docs/curl_formparse.3

@@ -2,13 +2,13 @@
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
-.TH curl_formparse 3 "6 June 2000" "Curl 7.0" "libcurl Manual"
+.TH curl_formparse 3 "8 February 2001" "Curl 7.0" "libcurl Manual"
 .SH NAME
 curl_formparse - add a section to a multipart/formdata HTTP POST
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "CURLcode *curl_formparse(char *" string, "struct HttpPost **" firstitem,
+.BI "CURLcode curl_formparse(char *" string, "struct HttpPost **" firstitem,
 .BI "struct HttpPost ** "lastitem ");"
 .ad
 .SH DESCRIPTION

docs/examples/Makefile.am

@@ -5,7 +5,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
 EXTRA_DIST = 
-	README curlgtk.c sepheaders.c simple.c
+	README curlgtk.c sepheaders.c simple.c postit.c
 
 all:
 	@echo "done"

docs/examples/postit.c

@@ -0,0 +1,68 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ *
+ * Example code that uploads a file name 'foo' to a remote script that accepts
+ * "HTML form based" (as described in RFC1738) uploads using HTTP POST.
+ *
+ * The imaginary form we'll fill in looks like:
+ *
+ * <form method="post" enctype="multipart/form-data" action="examplepost.cgi">
+ * Enter file: <input type="file" name="sendfile" size="40">
+ * Enter file name: <input type="text" name="filename" size="30">
+ * <input type="submit" value="send" name="submit">
+ * </form>
+ *
+ * This exact source code has not been verified to work.
+ */
+
+#include <stdio.h>
+
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+int main(int argc, char **argv)
+{
+  CURL *curl;
+  CURLcode res;
+
+  struct HttpPost *formpost=NULL;
+  struct HttpPost *lastptr=NULL;
+
+  /* Fill in the file upload field */
+  curl_formparse("sendfile=@foo",
+                 &formpost,
+                 &lastptr);
+
+  /* Fill in the filename field */
+  curl_formparse("filename=foo",
+                 &formpost,
+                 &lastptr);
+  
+
+  /* Fill in the submit field too, even if this is rarely needed */
+  curl_formparse("submit=send",
+                 &formpost,
+                 &lastptr);
+
+  curl = curl_easy_init();
+  if(curl) {
+    /* what URL that receives this POST */
+    curl_easy_setopt(curl, CURLOPT_URL, "http://curl.haxx.se/examplepost.cgi");
+    curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+
+    /* then cleanup the formpost chain */
+    curl_formfree(formpost);
+  }
+  return 0;
+}

include/curl/curl.h

@@ -452,7 +452,7 @@ char *curl_getenv(char *variable);
 char *curl_version(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "7.6.1-pre3"
+#define LIBCURL_VERSION "7.6.1"
 #define LIBCURL_VERSION_NUM 0x070601
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */

lib/Makefile.am

@@ -55,7 +55,7 @@ dict.c         ftp.h          if2ip.c        speedcheck.c   url.h \
 dict.h         getdate.c      if2ip.h        speedcheck.h   urldata.h \
 getdate.h      ldap.c         ssluse.c       version.c \
 getenv.c       ldap.h         ssluse.h       \
-escape.c       getenv.h       mprintf.c      telnet.c       \
+escape.c       mprintf.c      telnet.c       \
 escape.h       getpass.c      netrc.c        telnet.h       \
 getinfo.c transfer.c strequal.c strequal.h easy.c \
 security.h security.c krb4.c krb4.h memdebug.c memdebug.h inet_ntoa_r.h

lib/ftp.c

@@ -282,8 +282,10 @@ int Curl_GetFTPResponse(int sockfd, char *buf,
          */
         if(CURLE_OK != Curl_read(conn, sockfd, ptr, 1, &keepon))
           keepon = FALSE;
-        else if(keepon < 0)
+        else if(keepon <= 0) {
           error = SELECT_ERROR;
+          failf(data, "Connection aborted");
+        }
         else if ((*ptr == '\n') || (*ptr == '\r'))
           keepon = FALSE;
       }
@@ -543,9 +545,6 @@ CURLcode Curl_ftp_done(struct connectdata *conn)
     }
   }
 
-  free(ftp);
-  data->proto.ftp=NULL; /* it is gone */
-
   return CURLE_OK;
 }
 

lib/getenv.h

@@ -1,28 +0,0 @@
-#ifndef __GETENV_H
-#define __GETENV_H
-/*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * In order to be useful for every potential user, curl and libcurl are
- * dual-licensed under the MPL and the MIT/X-derivate licenses.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the MPL or the MIT/X-derivate
- * licenses. You may pick one of these licenses.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id$
- *****************************************************************************/
-
-#include <curl/curl.h>
-
-#endif

lib/http.c

@@ -375,9 +375,6 @@ CURLcode Curl_http_done(struct connectdata *conn)
     *bytecount = http->readbytecount + http->writebytecount;
   }
 
-  free(http);
-  data->proto.http=NULL; /* it is gone */
-
   return CURLE_OK;
 }
 

lib/url.c

@@ -561,6 +561,10 @@ CURLcode curl_disconnect(CURLconnect *c_connect)
 
   struct UrlData *data = conn->data;
 
+  if(data->proto.generic)
+    free(data->proto.generic);
+  data->proto.generic=NULL; /* it is gone */
+
 #ifdef ENABLE_IPV6
   if(conn->res) /* host name info */
     freeaddrinfo(conn->res);
@@ -748,7 +752,7 @@ static CURLcode _connect(CURL *curl, CURLconnect **in_connect)
       /* the name is given, get user+password */
       sscanf(data->userpwd, "%127[^:]:%127[^\n]",
              data->user, data->passwd);
-      }
+    }
     else
       /* no name given, get the password only */
       sscanf(data->userpwd+1, "%127[^\n]", data->passwd);
@@ -1086,15 +1090,15 @@ static CURLcode _connect(CURL *curl, CURLconnect **in_connect)
       infof(data, "Couldn't find host %s in the .netrc file, using defaults",
             data->hostname);
     }
+    else
+      data->bits.user_passwd = 1; /* enable user+password */
+
     /* weather we failed or not, we don't know which fields that were filled
        in anyway */
     if(!data->user[0])
       strcpy(data->user, CURL_DEFAULT_USER);
     if(!data->passwd[0])
       strcpy(data->passwd, CURL_DEFAULT_PASSWORD);
-    if(conn->protocol&PROT_HTTP) {
-      data->bits.user_passwd = 1; /* enable user+password */
-    }
   }
   else if(!(data->bits.user_passwd) &&
 	  (conn->protocol & (PROT_FTP|PROT_HTTP)) ) {
@@ -1644,7 +1648,13 @@ CURLcode curl_do(CURLconnect *in_conn)
   if(!conn || (conn->handle!= STRUCT_CONNECT)) {
     return CURLE_BAD_FUNCTION_ARGUMENT;
   }
-  if(conn->state != CONN_INIT) {
+  switch(conn->state) {
+  case CONN_INIT:
+  case CONN_DONE:
+    /* these two states are OK */
+    break;
+  default:
+    /* anything else is bad */
     return CURLE_BAD_CALLING_ORDER;
   }
 

src/version.h

@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.6.1-pre3"
+#define CURL_VERSION "7.6.1"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "