Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3752 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 2f4e4e3ee908188955de44919898b10e9f63ec3e..31234288f7f47570376c51250bb8c1aec81aedf2 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,9 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19
 
+       - The GNU TLS code incorrectly used
+         gnutls_check_pending() instead of
+         gnutls_record_check_pending() (STR #128)
        - The ppdEmit() functions output "PageSize Custom"
          instead of "CustomPageSize True" in the DSC comments.
          Also, the custom page size code did not use the

diff --git a/cups/http.c b/cups/http.c
index ee2c0d318ab6bb5ba774e6481571df3d8a94d7c8..32c48eed13afd8454e3ad2d5e0c0fc5cda64ec11 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c,v 1.82.2.34 2003/05/12 20:39:21 mike Exp $"
+ * "$Id: http.c,v 1.82.2.35 2003/05/27 14:03:47 mike Exp $"
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS).
  *
@@ -1100,7 +1100,7 @@ httpWait(http_t *http,                    /* I - HTTP data */
     if (SSL_pending((SSL *)(http->tls)))
       return (1);
 #  elif defined(HAVE_GNUTLS)
-    if (gnutls_check_pending(((http_tls_t *)(http->tls))->session))
+    if (gnutls_record_check_pending(((http_tls_t *)(http->tls))->session))
       return (1);
 #  elif defined(HAVE_CDSASSL)
     size_t bytes;                      /* Bytes that are available */
@@ -2427,5 +2427,5 @@ CDSAWriteFunc(SSLConnectionRef connection,        /* I  - SSL/TLS connection */
 
 
 /*
- * End of "$Id: http.c,v 1.82.2.34 2003/05/12 20:39:21 mike Exp $".
+ * End of "$Id: http.c,v 1.82.2.35 2003/05/27 14:03:47 mike Exp $".
  */