packages: cups/cups-auth.patch, cups/cups-ssl-segfault.patch - from cups svn
baggins
baggins at pld-linux.org
Wed Nov 23 13:29:09 CET 2011
Author: baggins Date: Wed Nov 23 12:29:09 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- from cups svn
---- Files affected:
packages/cups:
cups-auth.patch (1.1 -> 1.2) , cups-ssl-segfault.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/cups/cups-auth.patch
diff -u packages/cups/cups-auth.patch:1.1 packages/cups/cups-auth.patch:1.2
--- packages/cups/cups-auth.patch:1.1 Fri Aug 5 21:59:04 2011
+++ packages/cups/cups-auth.patch Wed Nov 23 13:29:04 2011
@@ -1,43 +1,72 @@
-diff -ur cups-1.5.0/cups/auth.c cups-1.5.0-auth/cups/auth.c
---- cups-1.5.0/cups/auth.c 2011-05-20 20:22:33.000000000 +0200
-+++ cups-1.5.0-auth/cups/auth.c 2011-08-05 19:39:19.587496832 +0200
-@@ -276,8 +278,7 @@
- {
- DEBUG_printf(("1cupsDoAuthentication: Unknown auth type: \"%s\"",
- http->fields[HTTP_FIELD_WWW_AUTHENTICATE]));
-- http->status = HTTP_AUTHORIZATION_CANCELED;
-- return (-1);
-+ return (1);
- }
-
- DEBUG_printf(("1cupsDoAuthentication: authstring=\"%s\"", http->authstring));
-diff -ur cups-1.5.0/cups/request.c cups-1.5.0-auth/cups/request.c
---- cups-1.5.0/cups/request.c 2011-05-20 05:49:49.000000000 +0200
-+++ cups-1.5.0-auth/cups/request.c 2011-08-05 19:40:37.981496819 +0200
-@@ -396,7 +396,7 @@
- {
- status = httpUpdate(http);
- }
-- while (status != HTTP_ERROR && http->state == HTTP_POST_RECV);
-+ while (http->state == HTTP_POST_RECV);
-
- DEBUG_printf(("2cupsGetResponse: status=%d", status));
-
-@@ -448,7 +449,7 @@
-
- DEBUG_puts("2cupsGetResponse: Need authorization...");
-
-- if (!cupsDoAuthentication(http, "POST", resource))
-+ if (cupsDoAuthentication(http, "POST", resource) >= 0)
- httpReconnect(http);
- else
- status = HTTP_AUTHORIZATION_CANCELED;
-@@ -780,7 +781,7 @@
- return (status);
-
- case HTTP_UNAUTHORIZED :
-- if (cupsDoAuthentication(http, "POST", resource))
-+ if (cupsDoAuthentication(http, "POST", resource) < 0)
- return (HTTP_AUTHORIZATION_CANCELED);
+Index: cups/request.c
+===================================================================
+--- cups/request.c (revision 9973)
++++ cups/request.c (revision 9974)
+@@ -248,16 +248,9 @@
+
+ while ((bytes = (int)read(infile, buffer, sizeof(buffer))) > 0)
+ {
+- if (httpCheck(http))
+- {
+- _httpUpdate(http, &status);
+-
+- if (status >= HTTP_MULTIPLE_CHOICES)
+- break;
+- }
+-
+- if (httpWrite2(http, buffer, bytes) < bytes)
+- break;
++ if ((status = cupsWriteRequestData(http, buffer, bytes))
++ != HTTP_CONTINUE)
++ break;
+ }
+ }
+
+@@ -265,13 +258,11 @@
+ * Get the server's response...
+ */
+
+- if (status == HTTP_CONTINUE || status == HTTP_OK)
++ if (status != HTTP_ERROR)
+ {
+ response = cupsGetResponse(http, resource);
+- status = http->status;
++ status = httpGetStatus(http);
+ }
+- else
+- httpFlush(http);
+
+ DEBUG_printf(("2cupsDoIORequest: status=%d", status));
+
+@@ -785,7 +776,17 @@
+ */
+
+ if (status >= HTTP_MULTIPLE_CHOICES)
++ {
++ _cupsSetHTTPError(status);
++
++ do
++ {
++ status = httpUpdate(http);
++ }
++ while (status != HTTP_ERROR && http->state == HTTP_POST_RECV);
++
+ httpFlush(http);
++ }
+
+ switch (status)
+ {
+@@ -922,6 +923,13 @@
+ if (status >= HTTP_MULTIPLE_CHOICES)
+ {
+ _cupsSetHTTPError(status);
++
++ do
++ {
++ status = httpUpdate(http);
++ }
++ while (status != HTTP_ERROR && http->state == HTTP_POST_RECV);
++
+ httpFlush(http);
+ }
- if (httpReconnect(http))
================================================================
Index: packages/cups/cups-ssl-segfault.patch
diff -u packages/cups/cups-ssl-segfault.patch:1.1 packages/cups/cups-ssl-segfault.patch:1.2
--- packages/cups/cups-ssl-segfault.patch:1.1 Tue Aug 2 14:21:12 2011
+++ packages/cups/cups-ssl-segfault.patch Wed Nov 23 13:29:04 2011
@@ -1,6 +1,17 @@
---- cups-1.5.0/cups/http.c~ 2011-06-16 22:12:16.000000000 +0200
-+++ cups-1.5.0/cups/http.c 2011-08-02 14:06:25.143633360 +0200
-@@ -3814,7 +3814,7 @@
+Index: cups/http.c
+===================================================================
+--- cups/http.c (revision 9908)
++++ cups/http.c (revision 9909)
+@@ -3807,6 +3807,8 @@
+ any_root = cg->any_root;
+
+ # ifdef HAVE_LIBSSL
++ (void)any_root;
++
+ context = SSL_CTX_new(SSLv23_client_method());
+
+ SSL_CTX_set_options(context, SSL_OP_NO_SSLv2); /* Only use SSLv3 or TLS */
+@@ -3815,7 +3817,7 @@
BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)http);
http->tls = SSL_new(context);
@@ -9,7 +20,7 @@
if (SSL_connect(http->tls) != 1)
{
-@@ -4173,11 +4173,11 @@
+@@ -4200,11 +4202,11 @@
# ifdef HAVE_LIBSSL
SSL_CTX *context; /* Context for encryption */
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups-auth.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups-ssl-segfault.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list