[SCM] GNU Mailutils branch, master, updated. release-2.2-153-gd9cd888

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=d9cd8883ffbad01eb69cda7ae8332038b467aaf5

The branch, master has been updated
       via  d9cd8883ffbad01eb69cda7ae8332038b467aaf5 (commit)
      from  1e409dd4c3369bc70cf2353935a610314228fa65 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d9cd8883ffbad01eb69cda7ae8332038b467aaf5
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Oct 21 14:16:58 2010 +0300

    Allow for `notls' parameter in pop URLs.
    
    * libproto/pop/folder.c (_pop_record): Accept URL parameters.
    * libproto/pop/mbox.c (pop_open): Don't start TLS if
    the `notls' parameter is present in the URL.

-----------------------------------------------------------------------

Summary of changes:
 libproto/pop/folder.c |    2 +-
 libproto/pop/mbox.c   |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libproto/pop/folder.c b/libproto/pop/folder.c
index ec945f9..59ad1cc 100644
--- a/libproto/pop/folder.c
+++ b/libproto/pop/folder.c
@@ -48,7 +48,7 @@ static struct _mu_record _pop_record =
   MU_POP_PRIO,
   MU_POP_SCHEME,
   MU_RECORD_DEFAULT,
-  MU_URL_CRED | MU_URL_INET,
+  MU_URL_CRED | MU_URL_INET | MU_URL_PARAM,
   MU_URL_HOST,
   _url_pop_init, /* Url init.  */
   _mailbox_pop_init, /* Mailbox init.  */
diff --git a/libproto/pop/mbox.c b/libproto/pop/mbox.c
index 2c406de..6865f6f 100644
--- a/libproto/pop/mbox.c
+++ b/libproto/pop/mbox.c
@@ -169,6 +169,7 @@ pop_open (mu_mailbox_t mbox, int flags)
        break;
 
       if (WITH_TLS && !mpd->pops &&
+         mu_url_sget_param (mbox->url, "notls", NULL) == MU_ERR_NOENT &&
          mu_pop3_capa_test (mpd->pop3, "STLS", NULL) == 0)
        {
          status = mu_pop3_stls (mpd->pop3);


hooks/post-receive
-- 
GNU Mailutils