Commit 3baf36ed authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

mime: tests and examples. 

Additional mime-specific tests.
Existing tests updated to reflect small differences (Expect: 100-continue,
data size change due to empty lines, etc).
Option -F headers= keyword added to tests.
test1135 disabled until the entry point order change is resolved.
New example smtp-mime.
Examples postit2 and multi-post converted from form API to mime API.
parent fec7a858

docs/examples/Makefile.inc

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,8 +26,8 @@ check_PROGRAMS = 10-at-a-time anyauthput cookie_interface debug fileupload \ 
  https multi-app multi-debugcallback multi-double multi-post multi-single \

  https multi-app multi-debugcallback multi-double multi-post multi-single \

  persistant post-callback postit2 sepheaders simple simplepost simplessl  \

  persistant post-callback postit2 sepheaders simple simplepost simplessl  \

  sendrecv httpcustomheader certinfo chkspeed ftpgetinfo ftp-wildcard      \

  sendrecv httpcustomheader certinfo chkspeed ftpgetinfo ftp-wildcard      \

  smtp-mail smtp-multi smtp-ssl smtp-tls smtp-vrfy smtp-expn rtsp          \

  smtp-mail smtp-mime smtp-multi smtp-ssl smtp-tls smtp-vrfy smtp-expn     \

  externalsocket resolve progressfunc pop3-retr pop3-list pop3-uidl        \

  rtsp externalsocket resolve progressfunc pop3-retr pop3-list pop3-uidl   \

  pop3-dele pop3-top pop3-stat pop3-noop pop3-ssl pop3-tls pop3-multi      \

  pop3-dele pop3-top pop3-stat pop3-noop pop3-ssl pop3-tls pop3-multi      \

  imap-list imap-lsub imap-fetch imap-store imap-append imap-examine       \

  imap-list imap-lsub imap-fetch imap-store imap-append imap-examine       \

  imap-search imap-create imap-delete imap-copy imap-noop imap-ssl         \

  imap-search imap-create imap-delete imap-copy imap-noop imap-ssl         \

docs/examples/multi-post.c

+28 −32
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

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

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

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

 *

 *

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

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

 *

 *

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

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

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

 * you should have received as part of this distribution. The terms
@@ -37,47 +37,43 @@ int main(void) 
  CURLM *multi_handle;

  CURLM *multi_handle;

  int still_running;

  int still_running;





  struct curl_httppost *formpost=NULL;

  curl_mime *form = NULL;

  struct curl_httppost *lastptr=NULL;

  curl_mimepart *field = NULL;

  struct curl_slist *headerlist = NULL;

  struct curl_slist *headerlist = NULL;

  static const char buf[] = "Expect:";

  static const char buf[] = "Expect:";





  /* Fill in the file upload field. This makes libcurl load data from

  curl = curl_easy_init();

     the given file name when curl_easy_perform() is called. */

  multi_handle = curl_multi_init();

  curl_formadd(&formpost,



               &lastptr,

  if(curl && multi_handle) {

               CURLFORM_COPYNAME, "sendfile",

    /* Create the form */

               CURLFORM_FILE, "postit2.c",

    form = curl_mime_init(curl);

               CURLFORM_END);



    /* Fill in the file upload field */

    field = curl_mime_addpart(form);

    curl_mime_name(field, "sendfile", -1);

    curl_mime_filedata(field, "multi-post.c");





    /* Fill in the filename field */

    /* Fill in the filename field */

  curl_formadd(&formpost,

    field = curl_mime_addpart(form);

               &lastptr,

    curl_mime_name(field, "filename", -1);

               CURLFORM_COPYNAME, "filename",

    curl_mime_data(field, "multi-post.c", -1);

               CURLFORM_COPYCONTENTS, "postit2.c",

               CURLFORM_END);





    /* Fill in the submit field too, even if this is rarely needed */

    /* Fill in the submit field too, even if this is rarely needed */

  curl_formadd(&formpost,

    field = curl_mime_addpart(form);

               &lastptr,

    curl_mime_name(field, "submit", -1);

               CURLFORM_COPYNAME, "submit",

    curl_mime_data(field, "send", -1);

               CURLFORM_COPYCONTENTS, "send",

               CURLFORM_END);



  curl = curl_easy_init();

  multi_handle = curl_multi_init();





    /* initialize custom header list (stating that Expect: 100-continue is not

    /* initialize custom header list (stating that Expect: 100-continue is not

       wanted */

       wanted */

    headerlist = curl_slist_append(headerlist, buf);

    headerlist = curl_slist_append(headerlist, buf);

  if(curl && multi_handle) {





    /* what URL that receives this POST */

    /* what URL that receives this POST */

    curl_easy_setopt(curl, CURLOPT_URL, "http://www.example.com/upload.cgi");

    curl_easy_setopt(curl, CURLOPT_URL, "http://www.example.com/upload.cgi");

    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);

    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);





    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);

    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);

    curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);

    curl_easy_setopt(curl, CURLOPT_MIMEPOST, form);





    curl_multi_add_handle(multi_handle, curl);

    curl_multi_add_handle(multi_handle, curl);
@@ -161,8 +157,8 @@ int main(void) 
    /* always cleanup */

    /* always cleanup */

    curl_easy_cleanup(curl);

    curl_easy_cleanup(curl);





    /* then cleanup the formpost chain */

    /* then cleanup the form */

    curl_formfree(formpost);

    curl_mime_free(form);





    /* free slist */

    /* free slist */

    curl_slist_free_all(headerlist);

    curl_slist_free_all(headerlist);

docs/examples/postit2.c

+26 −30
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

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

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

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

 *

 *

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

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

 *

 *

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

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

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

 * you should have received as part of this distribution. The terms
@@ -47,46 +47,42 @@ int main(int argc, char *argv[]) 
  CURL *curl;

  CURL *curl;

  CURLcode res;

  CURLcode res;





  struct curl_httppost *formpost=NULL;

  curl_mime *form = NULL;

  struct curl_httppost *lastptr=NULL;

  curl_mimepart *field = NULL;

  struct curl_slist *headerlist = NULL;

  struct curl_slist *headerlist = NULL;

  static const char buf[] = "Expect:";

  static const char buf[] = "Expect:";





  curl_global_init(CURL_GLOBAL_ALL);

  curl_global_init(CURL_GLOBAL_ALL);





  curl = curl_easy_init();

  if(curl) {

    /* Create the form */

    form = curl_mime_init(curl);



    /* Fill in the file upload field */

    /* Fill in the file upload field */

  curl_formadd(&formpost,

    field = curl_mime_addpart(form);

               &lastptr,

    curl_mime_name(field, "sendfile", -1);

               CURLFORM_COPYNAME, "sendfile",

    curl_mime_filedata(field, "postit2.c");

               CURLFORM_FILE, "postit2.c",

               CURLFORM_END);





    /* Fill in the filename field */

    /* Fill in the filename field */

  curl_formadd(&formpost,

    field = curl_mime_addpart(form);

               &lastptr,

    curl_mime_name(field, "filename", -1);

               CURLFORM_COPYNAME, "filename",

    curl_mime_data(field, "postit2.c", -1);

               CURLFORM_COPYCONTENTS, "postit2.c",

               CURLFORM_END);







    /* Fill in the submit field too, even if this is rarely needed */

    /* Fill in the submit field too, even if this is rarely needed */

  curl_formadd(&formpost,

    field = curl_mime_addpart(form);

               &lastptr,

    curl_mime_name(field, "submit", -1);

               CURLFORM_COPYNAME, "submit",

    curl_mime_data(field, "send", -1);

               CURLFORM_COPYCONTENTS, "send",

               CURLFORM_END);





  curl = curl_easy_init();

    /* initialize custom header list (stating that Expect: 100-continue is not

    /* initialize custom header list (stating that Expect: 100-continue is not

       wanted */

       wanted */

    headerlist = curl_slist_append(headerlist, buf);

    headerlist = curl_slist_append(headerlist, buf);

  if(curl) {

    /* what URL that receives this POST */

    /* what URL that receives this POST */

    curl_easy_setopt(curl, CURLOPT_URL, "http://example.com/examplepost.cgi");

    curl_easy_setopt(curl, CURLOPT_URL, "http://example.com/examplepost.cgi");

    if((argc == 2) && (!strcmp(argv[1], "noexpectheader")))

    if((argc == 2) && (!strcmp(argv[1], "noexpectheader")))

      /* only disable 100-continue header if explicitly requested */

      /* only disable 100-continue header if explicitly requested */

      curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);

      curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);

    curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);

    curl_easy_setopt(curl, CURLOPT_MIMEPOST, form);





    /* Perform the request, res will get the return code */

    /* Perform the request, res will get the return code */

    res = curl_easy_perform(curl);

    res = curl_easy_perform(curl);
@@ -98,8 +94,8 @@ int main(int argc, char *argv[]) 
    /* always cleanup */

    /* always cleanup */

    curl_easy_cleanup(curl);

    curl_easy_cleanup(curl);





    /* then cleanup the formpost chain */

    /* then cleanup the form */

    curl_formfree(formpost);

    curl_mime_free(form);

    /* free slist */

    /* free slist */

    curl_slist_free_all(headerlist);

    curl_slist_free_all(headerlist);

  }

  }

docs/examples/smtp-mime.c

0 → 100644
+159 −0
Original line number Original line Diff line number Diff line 
/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |

 *                             / __| | | | |_) | |

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

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

 *

 * Copyright (C) 1998 - 2017, 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

 * are also available at https://curl.haxx.se/docs/copyright.html.

 *

 * 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 COPYING file.

 *

 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

 * KIND, either express or implied.

 *

 ***************************************************************************/



/* <DESC>

 * SMTP example showing how to send mime e-mails

 * </DESC>

 */



#include <stdio.h>

#include <string.h>

#include <curl/curl.h>



/* This is a simple example showing how to send mime mail using libcurl's SMTP

 * capabilities. For an example of using the multi interface please see

 * smtp-multi.c.

 *

 * Note that this example requires libcurl 7.56.0 or above.

 */



#define FROM    "<sender@example.org>"

#define TO      "<addressee@example.net>"

#define CC      "<info@example.org>"



static const char *headers_text[] = {

  "Date: Tue, 22 Aug 2017 14:08:43 +0100",

  "To: " TO,

  "From: " FROM "(Example User)",

  "Cc: " CC "(Another example User)",

  "Message-ID: <dcd7cb36-11db-487a-9f3a-e652a9458efd@"

    "rfcpedant.example.org>",

  "Subject: example sending a MIME-formatted message",

  NULL

};



static const char inline_text[] =

  "This is the inline text message of the e-mail.\r\n"

  "\r\n"

  "  It could be a lot of lines that would be displayed in an e-mail\r\n"

  "viewer that is not able to handle HTML.\r\n";



static const char inline_html[] =

  "<html><body>\r\n"

  "<p>This is the inline <b>HTML</b> message of the e-mail.</p>"

  "<br />\r\n"

  "<p>It could be a lot of HTML data that would be displayed by "

  "e-mail viewers able to handle HTML.</p>"

  "</body></html>\r\n";





int main(void)

{

  CURL *curl;

  CURLcode res = CURLE_OK;

  struct curl_slist *headers = NULL;

  struct curl_slist *recipients = NULL;

  struct curl_slist *slist = NULL;

  curl_mime *mime;

  curl_mime *alt;

  curl_mimepart *part;

  const char **cpp;



  curl = curl_easy_init();

  if(curl) {

    /* This is the URL for your mailserver */

    curl_easy_setopt(curl, CURLOPT_URL, "smtp://mail.example.com");



    /* Note that this option isn't strictly required, omitting it will result

     * in libcurl sending the MAIL FROM command with empty sender data. All

     * autoresponses should have an empty reverse-path, and should be directed

     * to the address in the reverse-path which triggered them. Otherwise,

     * they could cause an endless loop. See RFC 5321 Section 4.5.5 for more

     * details.

     */

    curl_easy_setopt(curl, CURLOPT_MAIL_FROM, FROM);



    /* Add two recipients, in this particular case they correspond to the

     * To: and Cc: addressees in the header, but they could be any kind of

     * recipient. */

    recipients = curl_slist_append(recipients, TO);

    recipients = curl_slist_append(recipients, CC);

    curl_easy_setopt(curl, CURLOPT_MAIL_RCPT, recipients);



    /* Build and set the message header list. */

    for(cpp = headers_text; *cpp; cpp++)

      headers = curl_slist_append(headers, *cpp);

    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);



    /* Build the mime message. */

    mime = curl_mime_init(curl);



    /* The inline part is an alterative proposing the html and the text

       versions of the e-mail. */

    alt = curl_mime_init(curl);



    /* HTML message. */

    part = curl_mime_addpart(alt);

    curl_mime_data(part, inline_html, -1);

    curl_mime_type(part, "text/html");



    /* Text message. */

    part = curl_mime_addpart(alt);

    curl_mime_data(part, inline_text, -1);



    /* Create the inline part. */

    part = curl_mime_addpart(mime);

    curl_mime_subparts(part, alt);

    curl_mime_type(part, "multipart/alternative");

    slist = curl_slist_append(NULL, "Content-Disposition: inline");

    curl_mime_headers(part, slist, 1);



    /* Add the current source program as an attachment. */

    part = curl_mime_addpart(mime);

    curl_mime_filedata(part, "smtp-mime.c");

    curl_easy_setopt(curl, CURLOPT_MIMEPOST, mime);



    /* Send the message */

    res = curl_easy_perform(curl);



    /* Check for errors */

    if(res != CURLE_OK)

      fprintf(stderr, "curl_easy_perform() failed: %s\n",

              curl_easy_strerror(res));



    /* Free lists. */

    curl_slist_free_all(recipients);

    curl_slist_free_all(headers);



    /* curl won't send the QUIT command until you call cleanup, so you should

     * be able to re-use this connection for additional messages (setting

     * CURLOPT_MAIL_FROM and CURLOPT_MAIL_RCPT as required, and calling

     * curl_easy_perform() again. It may not be a good idea to keep the

     * connection open for a very long time though (more than a few minutes

     * may result in the server timing out the connection), and you do want to

     * clean up in the end.

     */

    curl_easy_cleanup(curl);

  }



  return (int)res;

}

tests/data/DISABLED

+3 −0
Original line number Original line Diff line number Diff line
@@ -18,3 +18,6 @@ 
1510

1510

# Pipelining test that is causing false positives a little too often

# Pipelining test that is causing false positives a little too often

1903

1903

# Entry point order should currently not be checked: mime API requires a

# SONAME change.

1135