Yves Lejeune fixed so that replacing Content-Type: when doing multipart

                                  Changelog

Daniel (28 July 2006)

- Yves Lejeune fixed so that replacing Content-Type: when doing multipart

  formposts work exactly the way you want it (and the way you'd assume it

  works).

Daniel (27 July 2006)

- David McCreedy added --ftp-ssl-reqd which makes curl *require* SSL for both

  control and data connection, as the existing --ftp-ssl option only requests

This release includes the following bugfixes:

 o changing Content-Type when doing formposts

 o added CURL_EXTERN to a few recent multi functions that lacked them

 o splay-tree related problems for internal expire time handling

 o FTP ASCII CRLF counter reset

 Dan Fandrich, Peter Silva, Arve Knudsen, Michael Wallner, Toshiyuki Maezawa,

 Ingmar Runge, Ates Goral, David McCreedy, Jari Sundell, Georg Horn,

 Gisle Vanem, Yang Tse, Michael Jerris, Dan Nelson

 Gisle Vanem, Yang Tse, Michael Jerris, Dan Nelson, Yves Lejeune

        Thanks! (and sorry if I forgot to mention someone)

  curl_off_t size;

  struct FormData *data, *ptr;

  if ((rc = Curl_getFormData(&data, form, &size)) != CURLE_OK) {

  rc = Curl_getFormData(&data, form, NULL, &size);

  if (rc != CURLE_OK)

    return (int)rc;

  }

  for (ptr = data; ptr; ptr = ptr->next) {

    if (ptr->type == FORM_FILE) {

 * (possibly huge) multipart formdata. The input list is in 'post', while the

 * output resulting linked lists gets stored in '*finalform'. *sizep will get

 * the total size of the whole POST.

 * A multipart/form_data content-type is built, unless a custom content-type

 * is passed in 'custom_content_type'.

 */

CURLcode Curl_getFormData(struct FormData **finalform,

                          struct curl_httppost *post,

                          const char *custom_content_type,

                          curl_off_t *sizep)

{

  struct FormData *form = NULL;

  /* Make the first line of the output */

  result = AddFormDataf(&form, NULL,

                        "Content-Type: multipart/form-data;"

                        " boundary=%s\r\n",

                        "%s; boundary=%s\r\n",

                        custom_content_type?custom_content_type:

                        "Content-Type: multipart/form-data",

                        boundary);

  if (result) {

    free(boundary);

    return result;

    if (result)

      break;

    /* Maybe later this should be disabled when a custom_content_type is

       passed, since Content-Disposition is not meaningful for all multipart

       types.

    */

    result = AddFormDataf(&form, &size,

                          "Content-Disposition: form-data; name=\"");

    if (result)

 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

CURLcode

Curl_getFormData(struct FormData **,

                 struct curl_httppost *post,

                 const char *custom_contenttype,

                 curl_off_t *size);

/* fread() emulation */

              header as that will produce *two* in the same request! */

           curl_strnequal("Host:", headers->data, 5))

          ;

        else if(conn->data->set.httpreq == HTTPREQ_POST_FORM &&

                /* this header (extended by formdata.c) is sent later */

                curl_strnequal("Content-Type:", headers->data,

                               strlen("Content-Type:")))

          ;

        else {

          result = add_bufferf(req_buffer, "%s\r\n", headers->data);

          if(result)

            return result;

    /* we must build the whole darned post sequence first, so that we have

       a size of the whole shebang before we start to send it */

     result = Curl_getFormData(&http->sendit, data->set.httppost,

                               checkheaders(data, "Content-Type:"),

                               &http->postsize);

     if(CURLE_OK != result) {

       /* Curl_getFormData() doesn't use failf() */

      if(result)

        return result;

      if(!checkheaders(data, "Content-Type:")) {

        /* Get Content-Type: line from Curl_formpostheader.

      {

           The Content-Type header line also contains the MIME boundary

           string etc why disabling this header is likely to not make things

           work, but we support disabling it anyway.

        /* Get Content-Type: line from Curl_formpostheader.

        */

        char *contentType;

        size_t linelength=0;

          failf(data, "Could not get Content-Type header line!");

          return CURLE_HTTP_POST_ERROR;

        }

        result = add_buffer(req_buffer, contentType, linelength);

        if(result)

          return result;