Merge 2012-04-09 GnuTLS fix from trunk

diff --cc src/ChangeLog
index 441a4c00be85cca988b59140bec8013faae6d125,441a4c00be85cca988b59140bec8013faae6d125..fc4f31028eae20f0e5d95d62aea2d243ec58fc65
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,3 +1,18 @@@
++2012-04-10  Teodor Zlatanov  <tzz@lifelogs.com>
++
++      * process.c (make_process):
++      * process.h: Add integer `gnutls_handshakes_tried' member to
++      process struct.
++
++      * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit.  Add
++      convenience `GNUTLS_LOG2i' macro.
++
++      * gnutls.c (gnutls_log_function2i): Convenience log function.
++      (emacs_gnutls_read): Use new log functions,
++      `gnutls_handshakes_tried' process member, and
++      `GNUTLS_EMACS_HANDSHAKES_LIMIT' to limit the number of handshake
++      attempts per process (connection).
++
  2012-04-09  Eli Zaretskii  <eliz@gnu.org>
  
        * xdisp.c (find_last_unchanged_at_beg_row): Don't consider a row

diff --cc src/gnutls.c
index 6b5cb47001b24793c32fc98c41747fdbf0750199,6b5cb47001b24793c32fc98c41747fdbf0750199..70eea3b0b8925964ffede9896d666f4c7f450126
--- 1/src/gnutls.c
--- 2/src/gnutls.c
+++ b/src/gnutls.c
@@@ -247,18 -247,18 +247,27 @@@ init_gnutls_functions (Lisp_Object libr
  #endif /* !WINDOWSNT */
  
  \f
++/* Function to log a simple message.  */
  static void
  gnutls_log_function (int level, const char* string)
  {
    message ("gnutls.c: [%d] %s", level, string);
  }
  
++/* Function to log a message and a string.  */
  static void
  gnutls_log_function2 (int level, const char* string, const char* extra)
  {
    message ("gnutls.c: [%d] %s %s", level, string, extra);
  }
  
++/* Function to log a message and an integer.  */
++static void
++gnutls_log_function2i (int level, const char* string, int extra)
++{
++  message ("gnutls.c: [%d] %s %d", level, string, extra);
++}
++
  static int
  emacs_gnutls_handshake (struct Lisp_Process *proc)
  {
@@@ -399,10 -399,10 +408,25 @@@ emacs_gnutls_read (struct Lisp_Process 
    ssize_t rtnval;
    gnutls_session_t state = proc->gnutls_state;
  
++  int log_level = proc->gnutls_log_level;
++
    if (proc->gnutls_initstage != GNUTLS_STAGE_READY)
      {
--      emacs_gnutls_handshake (proc);
--      return -1;
++      /* If the handshake count is under the limit, try the handshake
++         again and increment the handshake count.  This count is kept
++         per process (connection), not globally.  */
++      if (proc->gnutls_handshakes_tried < GNUTLS_EMACS_HANDSHAKES_LIMIT)
++        {
++          proc->gnutls_handshakes_tried++;
++          emacs_gnutls_handshake (proc);
++          GNUTLS_LOG2i (5, log_level, "Retried handshake", 
++                        proc->gnutls_handshakes_tried);
++          return -1;
++        }
++
++      GNUTLS_LOG (2, log_level, "Giving up on handshake; resetting retries");
++      proc->gnutls_handshakes_tried = 0;
++      return 0;
      }
    rtnval = fn_gnutls_record_recv (state, buf, nbyte);
    if (rtnval >= 0)

diff --cc src/gnutls.h
index 474da77aec51f393d1bdb2d5fe7877400593339a,474da77aec51f393d1bdb2d5fe7877400593339a..37b9a2eb4df194e51eef061462f33ce7fe8d7fca
--- 1/src/gnutls.h
--- 2/src/gnutls.h
+++ b/src/gnutls.h
@@@ -23,6 -23,6 +23,9 @@@ along with GNU Emacs.  If not, see <htt
  #include <gnutls/gnutls.h>
  #include <gnutls/x509.h>
  
++/* This limits the attempts to handshake per process (connection).  */
++#define GNUTLS_EMACS_HANDSHAKES_LIMIT 100
++
  typedef enum
  {
    /* Initialization stages.  */
@@@ -53,6 -53,6 +56,8 @@@
  
  #define GNUTLS_LOG2(level, max, string, extra) do { if (level <= max) { gnutls_log_function2 (level, "(Emacs) " string, extra); } } while (0)
  
++#define GNUTLS_LOG2i(level, max, string, extra) do { if (level <= max) { gnutls_log_function2i (level, "(Emacs) " string, extra); } } while (0)
++
  extern EMACS_INT
  emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, EMACS_INT nbyte);
  extern EMACS_INT

diff --cc src/process.c
index f2f33a9eafcfe45395372fd4f10a8a806d3c5a03,f2f33a9eafcfe45395372fd4f10a8a806d3c5a03..dc43191ebef55d1d0e51167f74c7b2a947c41b86
--- 1/src/process.c
--- 2/src/process.c
+++ b/src/process.c
@@@ -640,7 -640,7 +640,10 @@@ make_process (Lisp_Object name
  
  #ifdef HAVE_GNUTLS
    p->gnutls_initstage = GNUTLS_STAGE_EMPTY;
++  /* Default log level.  */
    p->gnutls_log_level = 0;
++  /* GnuTLS handshakes attempted for this connection.  */
++  p->gnutls_handshakes_tried = 0;
    p->gnutls_p = 0;
    p->gnutls_state = NULL;
    p->gnutls_x509_cred = NULL;

diff --cc src/process.h
index 9efde26138616d978b7ade4b7088a26d3d3ddefb,9efde26138616d978b7ade4b7088a26d3d3ddefb..3eb94cb196b0f44db9d5d48e4d87204f4d17d6f2
--- 1/src/process.h
--- 2/src/process.h
+++ b/src/process.h
@@@ -134,6 -134,6 +134,7 @@@ struct Lisp_Proces
      gnutls_certificate_client_credentials gnutls_x509_cred;
      gnutls_anon_client_credentials_t gnutls_anon_cred;
      int gnutls_log_level;
++    int gnutls_handshakes_tried;
      int gnutls_p;
  #endif
  };